summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <dmcphers+openshiftbot@redhat.com>2017-03-10 15:28:31 -0500
committerGitHub <noreply@github.com>2017-03-10 15:28:31 -0500
commite534d56073d29e4482b336ccac6c7c8b67548b62 (patch)
tree439522aef9281f05175ca51cb699120dbd7e2121
parent2da06f456dfcf43c00bbb74f253c3bbd85cc2b53 (diff)
parent3702b861bb498b4992d63bb146fc53bd072b07fb (diff)
downloadopenshift-e534d56073d29e4482b336ccac6c7c8b67548b62.tar.gz
openshift-e534d56073d29e4482b336ccac6c7c8b67548b62.tar.bz2
openshift-e534d56073d29e4482b336ccac6c7c8b67548b62.tar.xz
openshift-e534d56073d29e4482b336ccac6c7c8b67548b62.zip
Merge pull request #3615 from ashcrow/nuage-3583
Merged by openshift-bot
-rw-r--r--playbooks/common/openshift-master/config.yml2
-rw-r--r--roles/openshift_master/meta/main.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 7a334e771..68b9db03a 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -127,6 +127,8 @@
etcd_cert_subdir: "openshift-master-{{ openshift.common.hostname }}"
etcd_cert_config_dir: "{{ openshift.common.config_base }}/master"
etcd_cert_prefix: "master.etcd-"
+ - role: nuage_master
+ when: openshift.common.use_nuage | bool
post_tasks:
- name: Create group for deployment type
diff --git a/roles/openshift_master/meta/main.yml b/roles/openshift_master/meta/main.yml
index af3e7eeec..18e1b3a54 100644
--- a/roles/openshift_master/meta/main.yml
+++ b/roles/openshift_master/meta/main.yml
@@ -40,8 +40,6 @@ dependencies:
port: 4001/tcp
when: groups.oo_etcd_to_config | default([]) | length == 0
- role: nickhammond.logrotate
-- role: nuage_master
- when: openshift.common.use_nuage | bool
- role: contiv
contiv_role: netmaster
when: openshift.common.use_contiv | bool