Removing dependencies for openshift_repos and setting them up early i…

…n the cluster build.
openshift · Jul 17, 2017 · 2464804 · 2464804
1 parent a82f0c2
commit 2464804
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 12 deletions.
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
@@ -1,4 +1,12 @@
 ---
+# Setup openshift repositories
+- name: Setup openshift repositories before we start
+  hosts: oo_all_hosts
+  tasks:
+  - name: Lay down openshift repositories
+    include_role:
+      name: openshift_repos
+
 # TODO: refactor this into its own include
 # and pass a variable for ctx
 - name: Verify Requirements

diff --git a/roles/etcd_common/meta/main.yml b/roles/etcd_common/meta/main.yml
@@ -12,5 +12,4 @@ galaxy_info:
   categories:
   - cloud
   - system
-dependencies:
-- { role: openshift_repos }
+dependencies: []
diff --git a/roles/openshift_ca/meta/main.yml b/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
diff --git a/roles/openshift_common/meta/main.yml b/roles/openshift_common/meta/main.yml
@@ -12,6 +12,4 @@ galaxy_info:
   categories:
   - cloud
 dependencies:
-- role: openshift_facts
-- role: openshift_repos
 - role: openshift_version
diff --git a/roles/openshift_health_checker/meta/main.yml b/roles/openshift_health_checker/meta/main.yml
@@ -1,5 +1,4 @@
 ---
 dependencies:
   - role: openshift_facts
-  - role: openshift_repos
   - role: openshift_version
diff --git a/roles/openshift_loadbalancer/meta/main.yml b/roles/openshift_loadbalancer/meta/main.yml
@@ -22,4 +22,3 @@ dependencies:
   - service: nuage mon
     port: "{{ nuage_mon_rest_server_port | default(9443) }}/tcp"
   when: openshift_use_nuage | default(false) | bool
-- role: openshift_repos
diff --git a/roles/openshift_master_cluster/meta/main.yml b/roles/openshift_master_cluster/meta/main.yml
@@ -12,5 +12,4 @@ galaxy_info:
   categories:
   - cloud
   - system
-dependencies:
-- { role: openshift_repos }
+dependencies: []
diff --git a/roles/openshift_storage_glusterfs/meta/main.yml b/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
diff --git a/roles/openshift_storage_nfs/meta/main.yml b/roles/openshift_storage_nfs/meta/main.yml
@@ -15,4 +15,3 @@ dependencies:
   - service: nfs
     port: "2049/tcp"
 - role: openshift_hosted_facts
-- role: openshift_repos
diff --git a/roles/openshift_version/meta/main.yml b/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