Removing dependencies for openshift_repos and setting them up early i…

…n the cluster build.
openshift · Aug 8, 2017 · 6a46233 · 6a46233
1 parent 0569c50
commit 6a46233
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 11 deletions.
diff --git a/playbooks/common/openshift-cluster/std_include.yml b/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
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 +1,4 @@
 ---
+dependencies:
+  - role: openshift_facts
+  - 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,10 @@ @@
       tags:
       - node
+    - include: initialize_openshift_repos.yml
+      tags:
+      - always
     - include: initialize_openshift_version.yml
       tags:
       - always