summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2677 from ↵Scott Dodson2016-11-141-11/+11
|\ | | | | | | | | EricMountain-1A/fix_docker_fatal_selinux_4upstream-github Docker daemon is started prematurely.
| * Docker daemon is started prematurely.Eric Mountain2016-11-141-11/+11
| | | | | | | | | | | | | | | | | | Docker service is started prior to configuration changes being applied. The service is then not restarted by the handlers, so configuration changes are not applied. We now start the docker service only once all config changes have been made.
* | Merge pull request #2802 from sdodson/image-stream-syncScott Dodson2016-11-144-3/+40
|\ \ | |/ |/| Sync latest image stream and templates
| * Sync logging deployer changes from origin to enterpriseScott Dodson2016-11-141-0/+20
| | | | | | | | | | | | Pulls in https://github.com/openshift/origin-aggregated-logging/commit/d40fd9b83a6f6c0fb962db8869e6a35ef4f72751 https://github.com/openshift/origin-aggregated-logging/commit/f55cf03231d3ff2c7c9f2b9c8a4e1c29b4535c9c
| * Sync latest enterprise/metrics-deployer.yamlScott Dodson2016-11-142-0/+12
| |
| * Sync latest s2i contentScott Dodson2016-11-141-3/+8
|/
* Merge pull request #2562 from sdodson/etcd3Scott Dodson2016-11-1418-81/+366
|\ | | | | etcd upgrade playbooks
| * Actually upgrade host etcdctl no matter whatScott Dodson2016-11-141-2/+2
| |
| * Make etcd containerized upgrade stepwiseScott Dodson2016-11-142-18/+51
| |
| * Add updates for containerizedScott Dodson2016-11-146-14/+74
| |
| * Add etcd upgrade for RHEL and FedoraScott Dodson2016-11-149-1/+164
| | | | | | | | | | On Fedora we just blindly upgrade to the latest. On RHEL we do stepwise upgrades 2.0,2.1,2.2,2.3,3.0
| * Drop /etc/profile.d/etcdctl.shScott Dodson2016-11-144-0/+26
| | | | | | | | | | Includes bash functions for etcdctl2 and etcdctl3 which provide reasonable defaults for etcdctl functions on a host that's configured with openshift_etcd.
| * Move backups to a separate file for re-useScott Dodson2016-11-142-73/+74
| |
| * Uninstall etcd3 packageScott Dodson2016-11-121-0/+2
| |
* | Merge pull request #2794 from dgoodwin/no-fact-cacheScott Dodson2016-11-141-0/+1
|\ \ | | | | | | Fix HA upgrade when fact cache deleted.
| * | Fix HA upgrade when fact cache deleted.Devan Goodwin2016-11-141-0/+1
| |/ | | | | | | | | This variable is referenced in the systemd unit templates, this seems like the easiest and most consistent fix.
* | Merge pull request #2798 from tbielawa/BZ1389137Tim Bielawa2016-11-142-0/+26
|\ \ | | | | | | Fix commit-offsets in version detection for containerized installs
| * | Fix commit-offsets in version detection for containerized installsTim Bielawa2016-11-142-0/+26
| |/ | | | | | | | | | | * Applies the chomp_commit_offset logic to container version detection https://bugzilla.redhat.com/show_bug.cgi?id=1389137
* | Merge pull request #2797 from abutcher/metrics-versionScott Dodson2016-11-141-1/+1
|\ \ | | | | | | Fix openshift_hosted_metrics_deployer_version set_fact.
| * | Fix openshift_hosted_metrics_deployer_version set_fact.Andrew Butcher2016-11-141-1/+1
|/ /
* | Merge pull request #2793 from mtnbikenc/docker-fixScott Dodson2016-11-145-6/+6
|\ \ | |/ |/| Added dependency of os_firewall to docker role
| * Added dependency of os_firewall to docker roleRussell Teague2016-11-145-6/+6
|/ | | | | | | | | | | The docker role requires iptables-services to be installed. Added dependency on so_firewall role to ensure the iptables service is installed first. Currently this will only work with iptables and not with firewalld. * Added allow_duplicates to os_firewall role meta * Removed unused task from docker/tasks * Corrected os_firewall Defaults in README
* Merge pull request #2770 from mtnbikenc/docker-fixRussell Teague2016-11-113-1/+19
|\ | | | | Resolve docker and iptables service dependencies
| * Resolve docker and iptables service dependenciesRussell Teague2016-11-113-1/+19
| | | | | | | | | | | | | | | | | | | | The docker service adds rules to the iptables configuration to support proper network functionality for running containers. If the service is started prior to iptables, these rules are not properly created. * Ensure iptables is started prior to docker Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1390835
* | Merge pull request #2783 from tbielawa/aoioutputTim Bielawa2016-11-101-0/+8
|\ \ | | | | | | Enable quiet output for all a-o-i commands
| * | Enable quiet output for all a-o-i commandsTim Bielawa2016-11-101-0/+8
| | | | | | | | | | | | | | | | | | | | | * Update: uninstall, upgrade, scaleup wf's * Verbosity can be toggled with -v flag, as before https://bugzilla.redhat.com/show_bug.cgi?id=1384294
* | | Merge pull request #2600 from mscherer/python3_portingScott Dodson2016-11-101-8/+17
|\ \ \ | | | | | | | | Port openshift_facts to py3
| * | | Port openshift_facts to py3Michael Scherer2016-10-141-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix configparser import - convert bytes to str using to_native - replace method that did got removed in py3 with six equivalent With ansible 2.2, python 3 start to be supported enough to run non trivial playbooks, and so a test run of openshift-ansible on F24 showed that openshift_facts.py needed to be ported.
* | | | Merge pull request #2779 from smunilla/BZ1339626Scott Dodson2016-11-101-1/+3
|\ \ \ \ | | | | | | | | | | Update override cluster_hostname
| * | | | Update override cluster_hostnameSamuel Munilla2016-11-101-1/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | Update the default for the override prompt and set both openshift_master_cluster_hostname and openshift_master_cluster_public_hostname
* | | | Merge pull request #2777 from dgoodwin/jenkins-role-bindingsScott Dodson2016-11-102-2/+14
|\ \ \ \ | | | | | | | | | | Reconcile role bindings for jenkins pipeline during upgrade.
| * | | | Reconcile role bindings for jenkins pipeline during upgrade.Devan Goodwin2016-11-102-2/+14
| | |_|/ | |/| | | | | | | | | | https://github.com/openshift/origin/issues/11170 for more info.
* | | | Merge pull request #2781 from rhcarvalho/travisScott Dodson2016-11-103-0/+18
|\ \ \ \ | | | | | | | | | | Add Travis integration
| * | | | Add Travis integrationRodolfo Carvalho2016-11-103-0/+18
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can run simple tests in every PR, while triggering our internal CI tests on manually selected PRs. This is a bit better than the all-or-nothing we have today. Running `make ci` in Travis is the same as the Jenkins 'default' job.
* | | | Merge pull request #2784 from abutcher/upgrade-embedded-etcdScott Dodson2016-11-101-1/+1
|\ \ \ \ | |/ / / |/| | | Bug 1393663 - Failed to upgrade v3.2 to v3.3
| * | | Default groups.oo_etcd_to_config when setting embedded_etcd in control plane ↵Andrew Butcher2016-11-101-1/+1
| |/ / | | | | | | | | | upgrade.
* | | Merge pull request #2766 from andrewklau/masterScott Dodson2016-11-092-19/+19
|\ \ \ | | | | | | | | Re-sync v1.4 image streams
| * | | Re-sync v1.4 image streamsAndrew Lau2016-11-092-19/+19
| | | |
* | | | Merge pull request #2776 from sdodson/BZ1390160Scott Dodson2016-11-091-2/+2
|\ \ \ \ | | | | | | | | | | Fix typos in openshift_facts gce cloud provider
| * | | | Fix typos in openshift_facts gce cloud providerScott Dodson2016-11-091-2/+2
|/ / / / | | | | | | | | | | | | | | | | Fixes Bug 1390160 Fixes BZ1390160
* | | | Merge pull request #2773 from sdodson/BZ1393187Scott Dodson2016-11-091-1/+1
|\ \ \ \ | | | | | | | | | | Don't upgrade etcd on backup operations
| * | | | Don't upgrade etcd on backup operationsScott Dodson2016-11-091-1/+1
| |/ / / | | | | | | | | | | | | | | | | Fixes Bug 1393187 Fixes BZ1393187
* | | | Merge pull request #2772 from sdodson/masterScott Dodson2016-11-091-1/+1
|\ \ \ \ | |_|/ / |/| | | Bump ansible requirement to 2.2.0.0-1 (GA)
| * | | Bump ansible requirement to 2.2.0.0-1 (GA)Scott Dodson2016-11-091-1/+1
| |/ /
* | | Merge pull request #2730 from dgoodwin/fix-ha-etcd-backupScott Dodson2016-11-091-1/+14
|\ \ \ | |/ / |/| | Fix HA etcd upgrade when facts cache has been deleted.
| * | Fix etcd backup failure due to corrupted facts.Devan Goodwin2016-11-091-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | Simplest way to reproduce this issue is to attempt to upgrade having removed /etc/ansible/facts.d/openshift.fact. Actual cause in the field is not entirely known but critically it is possible for embedded_etcd to default to true, causing the etcd fact lookup to check the wrong file and fail silently, resulting in no etcd_data_dir fact being set.
* | | Merge pull request #2764 from openshift/revert-2751-BZ1388253Scott Dodson2016-11-089-201/+66
|\ \ \ | | | | | | | | Revert "Revert openshift.node.nodename changes"
| * | | Revert "Revert openshift.node.nodename changes"Scott Dodson2016-11-089-201/+66
|/ / /
* | | Merge pull request #2762 from rhcarvalho/readme-nitsScott Dodson2016-11-081-0/+2
|\ \ \ | | | | | | | | README: fix markdown formatting
| * | | README: fix markdown formattingRodolfo Carvalho2016-11-081-0/+2
|/ / / | | | | | | | | | The old format doesn't render correctly in GitHub.