summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2017-01-30 10:59:45 -0600
committerewolinetz <ewolinet@redhat.com>2017-01-30 10:59:45 -0600
commitc9afeb9e86ff5389d68e2fe25b9e6baaf56b72c6 (patch)
tree2b95686c0a79537ac7b024b2874e81e889930918
parentd44fe7d0120e1851399b20809aad9b7c17a6add9 (diff)
downloadopenshift-c9afeb9e86ff5389d68e2fe25b9e6baaf56b72c6.tar.gz
openshift-c9afeb9e86ff5389d68e2fe25b9e6baaf56b72c6.tar.bz2
openshift-c9afeb9e86ff5389d68e2fe25b9e6baaf56b72c6.tar.xz
openshift-c9afeb9e86ff5389d68e2fe25b9e6baaf56b72c6.zip
Breaking out master-config changing and updated playbook to apply change to other masters
-rw-r--r--playbooks/common/openshift-cluster/openshift_logging.yml7
-rw-r--r--roles/openshift_logging/tasks/install_logging.yaml7
-rw-r--r--roles/openshift_logging/tasks/update_master_config.yaml7
3 files changed, 15 insertions, 6 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_logging.yml b/playbooks/common/openshift-cluster/openshift_logging.yml
index 6347cbc26..3257018a0 100644
--- a/playbooks/common/openshift-cluster/openshift_logging.yml
+++ b/playbooks/common/openshift-cluster/openshift_logging.yml
@@ -3,3 +3,10 @@
hosts: oo_first_master
roles:
- openshift_logging
+
+- name: Update Master configs
+ hosts: masters:!oo_first_master
+ tasks:
+ - include_role:
+ name: openshift_logging
+ tasks_from: update_master_config
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml
index f0bc709df..32007e8f2 100644
--- a/roles/openshift_logging/tasks/install_logging.yaml
+++ b/roles/openshift_logging/tasks/install_logging.yaml
@@ -44,12 +44,7 @@
loop_var: file
when: not ansible_check_mode
-- name: Adding Kibana route information to loggingPublicURL
- modify_yaml:
- dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
- yaml_key: assetConfig.loggingPublicURL
- yaml_value: "https://{{ openshift_logging_kibana_hostname }}"
- notify: restart master
+- include: update_master_config.yaml
- name: Printing out objects to create
debug: msg={{file.content | b64decode }}
diff --git a/roles/openshift_logging/tasks/update_master_config.yaml b/roles/openshift_logging/tasks/update_master_config.yaml
new file mode 100644
index 000000000..af303c47c
--- /dev/null
+++ b/roles/openshift_logging/tasks/update_master_config.yaml
@@ -0,0 +1,7 @@
+---
+- name: Adding Kibana route information to loggingPublicURL
+ modify_yaml:
+ dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
+ yaml_key: assetConfig.loggingPublicURL
+ yaml_value: "https://{{ openshift_logging_kibana_hostname }}"
+ notify: restart master