瀏覽代碼

Move etcd cert playbooks into etcd config path

Russell Teague 7 年之前
父節點
當前提交
158bc58ed9
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 0 4
      playbooks/common/openshift-cluster/config.yml
  2. 4 0
      playbooks/common/openshift-etcd/config.yml

+ 0 - 4
playbooks/common/openshift-cluster/config.yml

@@ -18,10 +18,6 @@
       - docker_image_availability
       - docker_storage
 
-- include: ../openshift-etcd/ca.yml
-
-- include: ../openshift-etcd/certificates.yml
-
 - include: ../openshift-etcd/config.yml
 
 - include: ../openshift-nfs/config.yml

+ 4 - 0
playbooks/common/openshift-etcd/config.yml

@@ -10,6 +10,10 @@
         installer_phase_etcd: "In Progress"
       aggregate: false
 
+- include: ca.yml
+
+- include: certificates.yml
+
 - name: Configure etcd
   hosts: oo_etcd_to_config
   any_errors_fatal: true