From 8e7c5c970b8adc83fd6d5cad115f4edb06b36d98 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Mon, 5 Oct 2015 12:53:10 -0400
Subject: Containerization work by @sdodson
---
playbooks/common/openshift-etcd/config.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'playbooks/common/openshift-etcd')
diff --git a/playbooks/common/openshift-etcd/config.yml b/playbooks/common/openshift-etcd/config.yml
index a0dd330e7..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 }}"
@@ -87,7 +88,8 @@
when: etcd_server_certs_missing
roles:
- etcd
- - { role: nickhammond.logrotate, when: not is_atomic }
+ - role: nickhammond.logrotate
+ when: not openshift.common.is_containerized | bool
- name: Delete temporary directory on localhost
hosts: localhost
--
cgit v1.2.3