summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-18 09:26:05 -0700
committerGitHub <noreply@github.com>2017-09-18 09:26:05 -0700
commit74d245fbab25d91a989fc7263ae3e8827267510c (patch)
treede196d41e8491a4db4f7f021e424c3644256156e /roles/openshift_master
parenta77a7e1570cdc335e961dce3ba72fdc2febabc9c (diff)
parentc91d1b02c8206d2b96e7915ef225197167022ff5 (diff)
downloadopenshift-74d245fbab25d91a989fc7263ae3e8827267510c.tar.gz
openshift-74d245fbab25d91a989fc7263ae3e8827267510c.tar.bz2
openshift-74d245fbab25d91a989fc7263ae3e8827267510c.tar.xz
openshift-74d245fbab25d91a989fc7263ae3e8827267510c.zip
Merge pull request #5392 from ingvagabund/pull-openshift_master-deps-out-into-a-play
Automatic merge from submit-queue Pull openshift_master deps out into a play The `openshift_master` role is called only in a single play. Thus, we can pull out all its dependencies without duplicating all dependency role invocations. Both `lib_openshift` and `lib_os_firewall` are required deps as they defined ansible modules used inside the `openshift_master` role. I have also rearranged definition of variables so variable used only inside a single role are part of the `include_role` statement. Atm, we can't use `include_role` due to https://github.com/ansible/ansible/issues/21890
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/meta/main.yml16
1 files changed, 0 insertions, 16 deletions
diff --git a/roles/openshift_master/meta/main.yml b/roles/openshift_master/meta/main.yml
index b0237141b..a657668a9 100644
--- a/roles/openshift_master/meta/main.yml
+++ b/roles/openshift_master/meta/main.yml
@@ -14,19 +14,3 @@ galaxy_info:
dependencies:
- role: lib_openshift
- role: lib_os_firewall
-- role: openshift_master_facts
-- role: openshift_hosted_facts
-- role: openshift_master_certificates
-- role: openshift_etcd_client_certificates
- etcd_cert_subdir: "openshift-master-{{ openshift.common.hostname }}"
- etcd_cert_config_dir: "{{ openshift.common.config_base }}/master"
- etcd_cert_prefix: "master.etcd-"
- when: groups.oo_etcd_to_config | default([]) | length != 0
-- role: openshift_clock
-- role: openshift_cloud_provider
-- role: openshift_builddefaults
-- role: openshift_buildoverrides
-- role: nickhammond.logrotate
-- role: contiv
- contiv_role: netmaster
- when: openshift_use_contiv | default(False) | bool