浏览代码

Merge pull request #3615 from ashcrow/nuage-3583

Merged by openshift-bot
OpenShift Bot 8 年之前
父节点
当前提交
e534d56073
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 2 0
      playbooks/common/openshift-master/config.yml
  2. 0 2
      roles/openshift_master/meta/main.yml

+ 2 - 0
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

+ 0 - 2
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