Prechádzať zdrojové kódy

Removing dependencies for openshift_repos and setting them up early in the cluster build.

Kenny Woodson 7 rokov pred
rodič
commit
94c195bb55

+ 8 - 0
playbooks/common/openshift-cluster/initialize_openshift_repos.yml

@@ -0,0 +1,8 @@
+---
+- name: Setup yum repositories for all hosts
+  hosts: oo_all_hosts
+  gather_facts: no
+  tasks:
+  - name: initialize openshift repos
+    include_role:
+      name: openshift_repos

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

@@ -11,6 +11,10 @@
   tags:
   - node
 
+- include: initialize_openshift_repos.yml
+  tags:
+  - always
+
 - include: initialize_openshift_version.yml
   tags:
   - always

+ 1 - 2
roles/etcd_common/meta/main.yml

@@ -12,5 +12,4 @@ galaxy_info:
   categories:
   - cloud
   - system
-dependencies:
-- { role: openshift_repos }
+dependencies: []

+ 0 - 1
roles/openshift_ca/meta/main.yml

@@ -13,6 +13,5 @@ galaxy_info:
   - cloud
   - system
 dependencies:
-- role: openshift_repos
 - role: openshift_cli
 - role: openshift_named_certificates

+ 0 - 1
roles/openshift_common/meta/main.yml

@@ -13,4 +13,3 @@ galaxy_info:
   - cloud
 dependencies:
 - role: openshift_facts
-- role: openshift_repos

+ 1 - 2
roles/openshift_health_checker/meta/main.yml

@@ -1,4 +1,3 @@
 ---
 dependencies:
-  - role: openshift_facts
-  - role: openshift_repos
+- role: openshift_facts

+ 0 - 1
roles/openshift_loadbalancer/meta/main.yml

@@ -12,4 +12,3 @@ galaxy_info:
 dependencies:
 - role: lib_os_firewall
 - role: openshift_facts
-- role: openshift_repos

+ 1 - 2
roles/openshift_master_cluster/meta/main.yml

@@ -12,5 +12,4 @@ galaxy_info:
   categories:
   - cloud
   - system
-dependencies:
-- { role: openshift_repos }
+dependencies: []

+ 0 - 1
roles/openshift_storage_glusterfs/meta/main.yml

@@ -11,5 +11,4 @@ galaxy_info:
     - 7
 dependencies:
 - role: openshift_hosted_facts
-- role: openshift_repos
 - role: lib_openshift

+ 0 - 1
roles/openshift_storage_nfs/meta/main.yml

@@ -12,4 +12,3 @@ galaxy_info:
 dependencies:
 - role: lib_os_firewall
 - role: openshift_hosted_facts
-- role: openshift_repos

+ 0 - 1
roles/openshift_version/meta/main.yml

@@ -12,7 +12,6 @@ galaxy_info:
   categories:
   - cloud
 dependencies:
-- role: openshift_repos
 - role: openshift_docker_facts
 - role: docker
   when: openshift.common.is_containerized | default(False) | bool and not skip_docker_role | default(False) | bool