summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-09-22 14:19:56 -0400
committerMichael Gugino <mgugino@redhat.com>2017-09-22 14:19:56 -0400
commit6d322819ce4e457758a7f6fe744d7059bb9acc0e (patch)
tree8b80c28973fd47fdb898b0456c3dbbf0be60dfb7
parent9240e0d006198f910ea01d34d57f04f9ecd8e7e8 (diff)
downloadopenshift-6d322819ce4e457758a7f6fe744d7059bb9acc0e.tar.gz
openshift-6d322819ce4e457758a7f6fe744d7059bb9acc0e.tar.bz2
openshift-6d322819ce4e457758a7f6fe744d7059bb9acc0e.tar.xz
openshift-6d322819ce4e457758a7f6fe744d7059bb9acc0e.zip
Add booleans to prevent unwanted install of nuage roles.
Recently, some role dependencies were removed from meta depends into playbooks. Particularly, the nuage role requires several roles. Currently, only the nuage_master role requires openshift_use_nuage to be true. This commit requires the other nuage roles to reference the variable openshift_use_nuage before install.
-rw-r--r--playbooks/common/openshift-master/config.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index fc32bddbb..2e7646372 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -219,7 +219,9 @@
openshift_master_default_registry_value_api: "{{ hostvars[groups.oo_first_master.0].l_default_registry_value_api }}"
openshift_master_default_registry_value_controllers: "{{ hostvars[groups.oo_first_master.0].l_default_registry_value_controllers }}"
- role: nuage_ca
+ when: openshift_use_nuage | default(false) | bool
- role: nuage_common
+ when: openshift_use_nuage | default(false) | bool
- role: nuage_master
when: openshift_use_nuage | default(false) | bool
- role: calico_master