summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-etcd
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-12-19 18:46:48 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-12-19 18:46:48 -0500
commitc473a90f4abe887a1a94819e2feac8dcd29dc839 (patch)
tree9c736326cf4b76e119174d3374c0c63f62d72176 /playbooks/common/openshift-etcd
parentfabc75ca725c6a561bc5e70a63c4dbb2d37bc396 (diff)
parent48778f29f265380a3e6fa2e882621ebc3781736b (diff)
downloadopenshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.tar.gz
openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.tar.bz2
openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.tar.xz
openshift-c473a90f4abe887a1a94819e2feac8dcd29dc839.zip
Merge pull request #808 from sdodson/containers
Containerized install with SDN support
Diffstat (limited to 'playbooks/common/openshift-etcd')
-rw-r--r--playbooks/common/openshift-etcd/config.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/common/openshift-etcd/config.yml b/playbooks/common/openshift-etcd/config.yml
index 6dee196e3..9a5ae0e6b 100644
--- a/playbooks/common/openshift-etcd/config.yml
+++ b/playbooks/common/openshift-etcd/config.yml
@@ -14,7 +14,8 @@
public_hostname: "{{ openshift_public_hostname | default(None) }}"
deployment_type: "{{ openshift_deployment_type }}"
- role: etcd
- local_facts: {}
+ local_facts:
+ etcd_image: "{{ osm_etcd_image | default(None) }}"
- name: Check status of etcd certificates
stat:
path: "{{ item }}"
@@ -88,6 +89,7 @@
roles:
- etcd
- role: nickhammond.logrotate
+ when: not openshift.common.is_containerized | bool
- name: Delete temporary directory on localhost
hosts: localhost