diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-15 09:49:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-15 09:49:51 -0400 |
| commit | 80fee935c90165de89b698880ee3542c92b8bcb4 (patch) | |
| tree | 1705790df9e57df6e058a7c551799afb20041698 | |
| parent | 2bc68321f54ed405819d168a4930c75d9ab8fadc (diff) | |
| parent | 94c195bb55992985775c0bd8d7349843fc6b552f (diff) | |
| download | openshift-80fee935c90165de89b698880ee3542c92b8bcb4.tar.gz openshift-80fee935c90165de89b698880ee3542c92b8bcb4.tar.bz2 openshift-80fee935c90165de89b698880ee3542c92b8bcb4.tar.xz openshift-80fee935c90165de89b698880ee3542c92b8bcb4.zip | |
Merge pull request #4770 from kwoodson/openshift_repos_refactor
Removing openshift_repo dependencies. Moving to beginning of openshift_cluster.
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_openshift_repos.yml | 8 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/std_include.yml | 4 | ||||
| -rw-r--r-- | roles/etcd_common/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_ca/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_common/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_health_checker/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master_cluster/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_storage_glusterfs/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_storage_nfs/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_version/meta/main.yml | 1 |
11 files changed, 15 insertions, 12 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_openshift_repos.yml b/playbooks/common/openshift-cluster/initialize_openshift_repos.yml new file mode 100644 index 000000000..a7114fc80 --- /dev/null +++ b/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 diff --git a/playbooks/common/openshift-cluster/std_include.yml b/playbooks/common/openshift-cluster/std_include.yml index eab16aba0..5a1187ec7 100644 --- 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 index fb9280c9e..dfb1c7a2c 100644 --- 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 index 444c5b77e..dfbdf0cc7 100644 --- 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 index f1cf3e161..7cc95d8fa 100644 --- a/roles/openshift_common/meta/main.yml +++ b/roles/openshift_common/meta/main.yml @@ -13,4 +13,3 @@ galaxy_info: - cloud dependencies: - role: openshift_facts -- role: openshift_repos diff --git a/roles/openshift_health_checker/meta/main.yml b/roles/openshift_health_checker/meta/main.yml index cd9b55902..bc8e7bdcf 100644 --- a/roles/openshift_health_checker/meta/main.yml +++ b/roles/openshift_health_checker/meta/main.yml @@ -1,4 +1,3 @@ --- dependencies: - - role: openshift_facts - - role: openshift_repos +- role: openshift_facts diff --git a/roles/openshift_loadbalancer/meta/main.yml b/roles/openshift_loadbalancer/meta/main.yml index 073bdd94d..72298b599 100644 --- a/roles/openshift_loadbalancer/meta/main.yml +++ b/roles/openshift_loadbalancer/meta/main.yml @@ -12,4 +12,3 @@ galaxy_info: dependencies: - role: lib_os_firewall - role: openshift_facts -- role: openshift_repos diff --git a/roles/openshift_master_cluster/meta/main.yml b/roles/openshift_master_cluster/meta/main.yml index f2a67bc54..c452b165e 100644 --- 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 index aab9851f9..dc89c9d0c 100644 --- 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 index b360d0658..98f7c317e 100644 --- a/roles/openshift_storage_nfs/meta/main.yml +++ b/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 diff --git a/roles/openshift_version/meta/main.yml b/roles/openshift_version/meta/main.yml index ca896addd..38b398343 100644 --- 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 |