diff options
| author | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-01 15:33:32 +0200 |
|---|---|---|
| committer | Chengcheng Mu <chengcheng.mu@amadeus.com> | 2015-10-01 15:33:32 +0200 |
| commit | 9229927a98389f0dae2abb51e1df971f9457afb3 (patch) | |
| tree | 0879f45639ba2d70813d177e78316f07e99017a3 /playbooks | |
| parent | 79f1aaeea1e3adc8021f2de0b3c7cc2fcb33ef79 (diff) | |
| download | openshift-9229927a98389f0dae2abb51e1df971f9457afb3.tar.gz openshift-9229927a98389f0dae2abb51e1df971f9457afb3.tar.bz2 openshift-9229927a98389f0dae2abb51e1df971f9457afb3.tar.xz openshift-9229927a98389f0dae2abb51e1df971f9457afb3.zip | |
oo_option fixed, some clean up
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/gce/openshift-cluster/join_node.yml | 17 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/files/heat_stack.yaml | 8 |
2 files changed, 1 insertions, 24 deletions
diff --git a/playbooks/gce/openshift-cluster/join_node.yml b/playbooks/gce/openshift-cluster/join_node.yml index 613bbb34f..0dfa3e9d7 100644 --- a/playbooks/gce/openshift-cluster/join_node.yml +++ b/playbooks/gce/openshift-cluster/join_node.yml @@ -27,22 +27,6 @@ ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" groups: oo_nodes_to_config - - name: Add to preemptible group if needed - add_host: - name: "{{ node_ip }}" - ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" - ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" - groups: oo_preemptible_nodes - when: preemptible is defined and preemptible == "true" - - - name: Add to not preemptible group if needed - add_host: - name: "{{ node_ip }}" - ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" - ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" - groups: oo_non_preemptible_nodes - when: preemptible is defined and preemptible == "false" - - name: Evaluate oo_first_master add_host: name: "{{ groups['tag_env-host-type-' ~ cluster_id ~ '-openshift-master'][0] }}" @@ -59,6 +43,7 @@ openshift_deployment_type: "{{ deployment_type }}" openshift_hostname: "{{ ansible_default_ipv4.address }}" openshift_use_openshift_sdn: true + openshift_node_labels: "{{ lookup('oo_option', 'openshift_node_labels') }} " os_sdn_network_plugin_name: "redhat/openshift-ovs-subnet" osn_cluster_dns_domain: "{{ hostvars[groups.oo_first_master.0].openshift.dns.domain }}" osn_cluster_dns_ip: "{{ hostvars[groups.oo_first_master.0].openshift.dns.ip }}" diff --git a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml index e3e2b6872..cd2636c9c 100644 --- a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml +++ b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml @@ -256,14 +256,6 @@ resources: port_range_max: 10250 remote_mode: remote_group_id remote_group_id: { get_resource: master-secgrp } - - direction: ingress - protocol: tcp - port_range_min: 30001 - port_range_max: 30001 - - direction: ingress - protocol: tcp - port_range_min: 30850 - port_range_max: 30850 infra-secgrp: type: OS::Neutron::SecurityGroup |