summaryrefslogtreecommitdiffstats
path: root/playbooks/byo/openshift-cluster/upgrades
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-23 10:40:58 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-23 10:40:58 -0300
commitb85c47761db579b2153b08018ed74c7650b388f5 (patch)
tree63fa53d0e3f9edada1b3b5aca43ac957f5c276d9 /playbooks/byo/openshift-cluster/upgrades
parentea99abc4461f3e2edb7993b9c7961a13c727ab7c (diff)
parent7ac20f9cef4dbbf9787e757dd1938d28483a22a7 (diff)
downloadopenshift-b85c47761db579b2153b08018ed74c7650b388f5.tar.gz
openshift-b85c47761db579b2153b08018ed74c7650b388f5.tar.bz2
openshift-b85c47761db579b2153b08018ed74c7650b388f5.tar.xz
openshift-b85c47761db579b2153b08018ed74c7650b388f5.zip
Merge branch 'master' into upgrade33
Diffstat (limited to 'playbooks/byo/openshift-cluster/upgrades')
-rw-r--r--playbooks/byo/openshift-cluster/upgrades/docker/docker_upgrade.yml4
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"