summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-09-22 16:06:00 -0400
committerGitHub <noreply@github.com>2017-09-22 16:06:00 -0400
commit6ece6ac67ab2d0dc87ca7a2385d284546ceb3c8e (patch)
tree8b80c28973fd47fdb898b0456c3dbbf0be60dfb7 /playbooks
parent9240e0d006198f910ea01d34d57f04f9ecd8e7e8 (diff)
parent6d322819ce4e457758a7f6fe744d7059bb9acc0e (diff)
downloadopenshift-6ece6ac67ab2d0dc87ca7a2385d284546ceb3c8e.tar.gz
openshift-6ece6ac67ab2d0dc87ca7a2385d284546ceb3c8e.tar.bz2
openshift-6ece6ac67ab2d0dc87ca7a2385d284546ceb3c8e.tar.xz
openshift-6ece6ac67ab2d0dc87ca7a2385d284546ceb3c8e.zip
Merge pull request #5509 from mgugino-upstream-stage/fix-nuage-install
Add booleans to prevent unwanted install of nuage roles.
Diffstat (limited to 'playbooks')
-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