summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-01-25 15:31:53 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-01-25 15:31:53 -0500
commit4a2e65e5500eced93722ae6b39c7994a270563d2 (patch)
tree18ca3afb811b695b381afbe303b0c23221fd11a4 /playbooks
parent5b188705f2e54da54ae64ac40ad133619e3e0d02 (diff)
parent93eb9ba8fc5d6d14b8ffff1b946c528233cbb1d5 (diff)
downloadopenshift-4a2e65e5500eced93722ae6b39c7994a270563d2.tar.gz
openshift-4a2e65e5500eced93722ae6b39c7994a270563d2.tar.bz2
openshift-4a2e65e5500eced93722ae6b39c7994a270563d2.tar.xz
openshift-4a2e65e5500eced93722ae6b39c7994a270563d2.zip
Merge pull request #1160 from vishpat/nuage
Nuage
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/common/openshift-master/config.yml2
-rw-r--r--playbooks/common/openshift-node/config.yml2
2 files changed, 4 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 538058416..70e6ce0b4 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -341,6 +341,8 @@
when: not openshift.common.is_containerized | bool
- role: fluentd_master
when: openshift.common.use_fluentd | bool
+ - role: nuage_master
+ when: openshift.common.use_nuage | bool
post_tasks:
- name: Create group for deployment type
group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }}
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 1d31657ed..3e7bca34e 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -211,6 +211,8 @@
roles:
- role: flannel
when: openshift.common.use_flannel | bool
+ - role: nuage_node
+ when: openshift.common.use_nuage | bool
- role: nickhammond.logrotate
when: not openshift.common.is_containerized | bool
- role: fluentd_node