summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master/config.yml
diff options
context:
space:
mode:
authorAvesh Agarwal <avagarwa@redhat.com>2015-06-19 14:41:10 -0400
committerScott Dodson <sdodson@redhat.com>2015-08-26 13:22:42 -0400
commit1b3fff6248fbd6788a26ee2b6c60f7731891c0f4 (patch)
tree6e2fc801a4366bf7e8075882e90f8383a638fb74 /playbooks/common/openshift-master/config.yml
parent2595194cc34db43de2d9f139ff7ed1cd41c47ab1 (diff)
downloadopenshift-1b3fff6248fbd6788a26ee2b6c60f7731891c0f4.tar.gz
openshift-1b3fff6248fbd6788a26ee2b6c60f7731891c0f4.tar.bz2
openshift-1b3fff6248fbd6788a26ee2b6c60f7731891c0f4.tar.xz
openshift-1b3fff6248fbd6788a26ee2b6c60f7731891c0f4.zip
Atomic Enterprise related changes.
Diffstat (limited to 'playbooks/common/openshift-master/config.yml')
-rw-r--r--playbooks/common/openshift-master/config.yml17
1 files changed, 9 insertions, 8 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index acf85fc04..5a179f791 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -37,7 +37,7 @@
public_console_url: "{{ openshift_master_public_console_url | default(None) }}"
- name: Check status of external etcd certificatees
stat:
- path: "/etc/openshift/master/{{ item }}"
+ path: "{{ openshift.common.config_base }}/master/{{ item }}"
with_items:
- master.etcd-client.crt
- master.etcd-ca.crt
@@ -47,7 +47,7 @@
| map(attribute='stat.exists')
| list | intersect([false])}}"
etcd_cert_subdir: openshift-master-{{ openshift.common.hostname }}
- etcd_cert_config_dir: /etc/openshift/master
+ etcd_cert_config_dir: "{{ openshift.common.config_base }}/master"
etcd_cert_prefix: master.etcd-
when: groups.oo_etcd_to_config is defined and groups.oo_etcd_to_config
@@ -96,7 +96,7 @@
tasks:
- name: Ensure certificate directory exists
file:
- path: /etc/openshift/master
+ path: "{{ openshift.common.config_base }}/master"
state: directory
when: etcd_client_certs_missing is defined and etcd_client_certs_missing
- name: Unarchive the tarball on the master
@@ -134,7 +134,7 @@
- name: Check status of master certificates
stat:
- path: "/etc/openshift/master/{{ item }}"
+ path: "{{ openshift.common.config_base }}/master/{{ item }}"
with_items: openshift_master_certs
register: g_master_cert_stat_result
- set_fact:
@@ -142,12 +142,12 @@
| map(attribute='stat.exists')
| list | intersect([false])}}"
master_cert_subdir: master-{{ openshift.common.hostname }}
- master_cert_config_dir: /etc/openshift/master
+ master_cert_config_dir: "{{ openshift.common.config_base }}/master"
- name: Configure master certificates
hosts: oo_first_master
vars:
- master_generated_certs_dir: /etc/openshift/generated-configs
+ master_generated_certs_dir: "{{ openshift.common.config_base }}/generated-configs"
masters_needing_certs: "{{ hostvars
| oo_select_keys(groups['oo_masters_to_config'] | difference(groups['oo_first_master']))
| oo_filter_list(filter_attr='master_certs_missing') }}"
@@ -189,7 +189,7 @@
pre_tasks:
- name: Ensure certificate directory exists
file:
- path: /etc/openshift/master
+ path: "{{ openshift.common.config_base }}/master"
state: directory
when: master_certs_missing and 'oo_first_master' not in group_names
- name: Unarchive the tarball on the master
@@ -214,7 +214,8 @@
roles:
- role: openshift_master_cluster
when: openshift_master_ha | bool
- - openshift_examples
+ - role: openshift_examples
+ when: deployment_type in ['enterprise','openshift-enterprise','origin']
- role: openshift_cluster_metrics
when: openshift.common.use_cluster_metrics | bool