summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-02-03 17:16:20 -0500
committerJason DeTiberus <jdetiber@redhat.com>2016-02-09 15:53:35 -0500
commit2ce5997322acd407bc4c2d6af3bf361ca3cc50c8 (patch)
treecdc41f02bc2eeeb78fa21f724740e01f2bf3352b /playbooks/common
parentd30acfb23637525cf79cd05c94d0d3c900cc4b88 (diff)
downloadopenshift-2ce5997322acd407bc4c2d6af3bf361ca3cc50c8.tar.gz
openshift-2ce5997322acd407bc4c2d6af3bf361ca3cc50c8.tar.bz2
openshift-2ce5997322acd407bc4c2d6af3bf361ca3cc50c8.tar.xz
openshift-2ce5997322acd407bc4c2d6af3bf361ca3cc50c8.zip
consolidate oo_first_master post-config a bit, fix some roles that use openshift_facts without declaring a dependency
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-master/config.yml42
1 files changed, 10 insertions, 32 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index a4da68573..aa1a8b34f 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -360,6 +360,8 @@
- name: Additional master configuration
hosts: oo_first_master
vars:
+ cockpit_plugins: "{{ osm_cockpit_plugins | default(['cockpit-kubernetes']) }}"
+ etcd_urls: "{{ openshift.master.etcd_urls }}"
openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}"
omc_cluster_hosts: "{{ groups.oo_masters_to_config | join(' ')}}"
roles:
@@ -371,30 +373,16 @@
when: openshift.common.use_cluster_metrics | bool
- role: openshift_manageiq
when: openshift.common.use_manageiq | bool
-
-- name: Enable cockpit
- hosts: oo_first_master
- vars:
- cockpit_plugins: "{{ osm_cockpit_plugins | default(['cockpit-kubernetes']) }}"
- roles:
- role: cockpit
when: not openshift.common.is_atomic and ( deployment_type in ['atomic-enterprise','openshift-enterprise'] ) and
(osm_use_cockpit | bool or osm_use_cockpit is undefined )
-
-- name: Configure flannel
- hosts: oo_first_master
- vars:
- etcd_urls: "{{ openshift.master.etcd_urls }}"
- roles:
- role: flannel_register
when: openshift.common.use_flannel | bool
+ - role: pods
+ when: openshift.common.deployment_type == 'online'
+ - role: os_env_extras
+ when: openshift.common.deployment_type == 'online'
-# Additional instance config for online deployments
-- name: Additional instance config
- hosts: oo_masters_deployment_type_online
- roles:
- - pods
- - os_env_extras
- name: Delete temporary directory on localhost
hosts: localhost
@@ -405,27 +393,16 @@
- file: name={{ g_master_mktemp.stdout }} state=absent
changed_when: False
-- name: Create persistent volumes
+- name: Create persistent volumes and create hosted services
hosts: oo_first_master
vars:
+ attach_registry_volume: "{{ openshift.hosted.registry.storage.kind != None }}"
+ deploy_infra: "{{ openshift.master.infra_nodes | default(0) | length > 0 }}"
persistent_volumes: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volumes(groups) }}"
persistent_volume_claims: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volume_claims }}"
- pre_tasks:
- - set_fact:
- nfs_host: "{{ groups.oo_nfs_to_config.0 }}"
- registry_volume_path: "{{ hostvars[groups.oo_nfs_to_config.0].openshift.nfs.exports_dir + '/' + hostvars[groups.oo_nfs_to_config.0].openshift.nfs.registry_volume }}"
- when: attach_registry_volume | bool
roles:
- role: openshift_persistent_volumes
when: persistent_volumes | length > 0 or persistent_volume_claims | length > 0
-
-- name: Create hosted infrastructure services
- hosts: oo_first_master
- vars:
- accounts: ["router", "registry"]
- attach_registry_volume: "{{ openshift.hosted.registry.storage.kind != None }}"
- deploy_infra: "{{ openshift.master.infra_nodes | default(0) | length > 0 }}"
- roles:
- role: openshift_serviceaccounts
openshift_serviceaccounts_names:
- router
@@ -437,3 +414,4 @@
when: deploy_infra | bool
- role: openshift_registry
when: deploy_infra | bool and attach_registry_volume | bool
+