summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-03-09 14:46:25 -0500
committerSteve Milner <smilner@redhat.com>2017-03-10 12:20:18 -0500
commit3702b861bb498b4992d63bb146fc53bd072b07fb (patch)
tree9bfe581f7fe674c1a4193a34b607a8f0a7e8ec09
parent32d20e7e52d843a51b4de2f576cc05a89d37c767 (diff)
downloadopenshift-3702b861bb498b4992d63bb146fc53bd072b07fb.tar.gz
openshift-3702b861bb498b4992d63bb146fc53bd072b07fb.tar.bz2
openshift-3702b861bb498b4992d63bb146fc53bd072b07fb.tar.xz
openshift-3702b861bb498b4992d63bb146fc53bd072b07fb.zip
nuage: Move role back to config
d113f03 moved role dependencies out of playbooks. However, this ended up causing the masters to not be configured before the nuage steps required configured masters. This change moves the nuage specific change in d113f03 back to the config. Resolves #3583
-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