diff options
author | Scott Dodson <sdodson@redhat.com> | 2016-06-13 17:00:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-13 17:00:41 -0400 |
commit | d3a69bbf5e85ebe23fcf26fb3608ff42e68a6713 (patch) | |
tree | db1fdacd3e4bbf11fff02cf263e7a75ae4e7a37a /playbooks | |
parent | fcb22cdc7827b1733db4535ce153dae200af078e (diff) | |
parent | 0c983829f2c43a9e7078a5395f768ba965685268 (diff) | |
download | openshift-d3a69bbf5e85ebe23fcf26fb3608ff42e68a6713.tar.gz openshift-d3a69bbf5e85ebe23fcf26fb3608ff42e68a6713.tar.bz2 openshift-d3a69bbf5e85ebe23fcf26fb3608ff42e68a6713.tar.xz openshift-d3a69bbf5e85ebe23fcf26fb3608ff42e68a6713.zip |
Merge pull request #2020 from dgoodwin/docker-upgrade-services
Fix docker 1.10 upgrade on embedded etcd masters.
Diffstat (limited to 'playbooks')
-rw-r--r-- | playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml index 6c12e8245..8b1b2fb1b 100644 --- a/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml +++ b/playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml @@ -59,7 +59,7 @@ - "{{ openshift.common.service_type }}-master-api" - "{{ openshift.common.service_type }}-master-controllers" - "{{ openshift.common.service_type }}-node" - - etcd + - etcd_container - openvswitch failed_when: false when: docker_upgrade is defined and docker_upgrade | bool and openshift.common.is_containerized | bool @@ -77,7 +77,7 @@ - name: Restart containerized services service: name={{ item }} state=started with_items: - - etcd + - etcd_container - openvswitch - "{{ openshift.common.service_type }}-master" - "{{ openshift.common.service_type }}-master-api" |