diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_hosted/meta/main.yml | 25 | ||||
| -rw-r--r-- | roles/openshift_master/meta/main.yml | 31 | ||||
| -rw-r--r-- | roles/openshift_node/meta/main.yml | 24 | 
3 files changed, 4 insertions, 76 deletions
| diff --git a/roles/openshift_hosted/meta/main.yml b/roles/openshift_hosted/meta/main.yml index c7d20f88b..74c50ae1d 100644 --- a/roles/openshift_hosted/meta/main.yml +++ b/roles/openshift_hosted/meta/main.yml @@ -11,27 +11,4 @@ galaxy_info:      - 7    categories:    - cloud -dependencies: -- role: openshift_cli -- role: openshift_hosted_facts -- role: openshift_projects -  # TODO: Move standard project definitions to openshift_hosted/vars/main.yml -  # Vars are not accessible in meta/main.yml in ansible-1.9.x -  openshift_projects: "{{ openshift_additional_projects | default({}) | oo_merge_dicts({'default':{'default_node_selector':''},'openshift-infra':{'default_node_selector':''},'logging':{'default_node_selector':''}}) }}" -- role: openshift_serviceaccounts -  openshift_serviceaccounts_names: -  - router -  openshift_serviceaccounts_namespace: default -  openshift_serviceaccounts_sccs: -  - hostnetwork -  when: openshift.common.version_gte_3_2_or_1_2 -- role: openshift_serviceaccounts -  openshift_serviceaccounts_names: -  - router -  - registry -  openshift_serviceaccounts_namespace: default -  openshift_serviceaccounts_sccs: -  - privileged -  when: not openshift.common.version_gte_3_2_or_1_2 -- role: openshift_metrics -  when: openshift.hosted.metrics.deploy | bool +dependencies: [] diff --git a/roles/openshift_master/meta/main.yml b/roles/openshift_master/meta/main.yml index be70d9102..e391acfaa 100644 --- a/roles/openshift_master/meta/main.yml +++ b/roles/openshift_master/meta/main.yml @@ -11,32 +11,5 @@ galaxy_info:      - 7    categories:    - cloud -dependencies: -- role: openshift_clock -- role: openshift_master_certificates -- role: openshift_cloud_provider -- role: openshift_builddefaults -- role: openshift_master_facts -- role: openshift_hosted_facts -- role: os_firewall -  os_firewall_allow: -  - service: etcd embedded -    port: 4001/tcp -  - service: api server https -    port: "{{ openshift.master.api_port }}/tcp" -  - service: api controllers https -    port: "{{ openshift.master.controllers_port }}/tcp" -  - service: skydns tcp -    port: "{{ openshift.master.dns_port }}/tcp" -  - service: skydns udp -    port: "{{ openshift.master.dns_port }}/udp" -  - service: Fluentd td-agent tcp -    port: 24224/tcp -  - service: Fluentd td-agent udp -    port: 24224/udp -  - service: pcsd -    port: 2224/tcp -  - service: Corosync UDP -    port: 5404/udp -  - service: Corosync UDP -    port: 5405/udp +dependencies: [] + diff --git a/roles/openshift_node/meta/main.yml b/roles/openshift_node/meta/main.yml index fd493340b..c39269f33 100644 --- a/roles/openshift_node/meta/main.yml +++ b/roles/openshift_node/meta/main.yml @@ -11,26 +11,4 @@ galaxy_info:      - 7    categories:    - cloud -dependencies: -- role: openshift_clock -- role: openshift_docker -- role: openshift_node_certificates -- role: openshift_cloud_provider -- role: openshift_common -- role: openshift_node_dnsmasq -  when: openshift.common.use_dnsmasq -- role: os_firewall -  os_firewall_allow: -  - service: Kubernetes kubelet -    port: 10250/tcp -  - service: http -    port: 80/tcp -  - service: https -    port: 443/tcp -  - service: Openshift kubelet ReadOnlyPort -    port: 10255/tcp -  - service: Openshift kubelet ReadOnlyPort udp -    port: 10255/udp -  - service: OpenShift OVS sdn -    port: 4789/udp -    when: openshift.node.use_openshift_sdn | bool +dependencies: [] | 
