diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-04-29 13:38:37 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-04-29 13:38:37 -0400 |
| commit | ada49b7eccf7fd96e5d4716ffd666987ad63be45 (patch) | |
| tree | 525deee94e5a7506dbea7ea3a6e866873dfba0dd /playbooks/aws/openshift-cluster/config.yml | |
| parent | 72f295fc7cdef47bffbdffa35b263e120ac9ad93 (diff) | |
| parent | 638aae76fe3e2ce367dbf5901169b509feb181df (diff) | |
| download | openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.tar.gz openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.tar.bz2 openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.tar.xz openshift-ada49b7eccf7fd96e5d4716ffd666987ad63be45.zip | |
Merge pull request #1843 from detiber/remove_deprecated_roles
Remove deprecated roles
Diffstat (limited to 'playbooks/aws/openshift-cluster/config.yml')
| -rw-r--r-- | playbooks/aws/openshift-cluster/config.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml index f9b367b97..8402b3579 100644 --- a/playbooks/aws/openshift-cluster/config.yml +++ b/playbooks/aws/openshift-cluster/config.yml @@ -13,7 +13,9 @@ openshift_registry_selector: 'type=infra' openshift_hosted_router_selector: 'type=infra' openshift_infra_nodes: "{{ g_infra_hosts }}" - openshift_node_labels: '{"region": "{{ ec2_region }}", "type": "{{ hostvars[inventory_hostname]["ec2_tag_sub-host-type"] if inventory_hostname in groups["tag_host-type_node"] else hostvars[inventory_hostname]["ec2_tag_host-type"] }}"}' + openshift_node_labels: + region: "{{ deployment_vars[deployment_type].region }}" + type: "{{ hostvars[inventory_hostname]['ec2_tag_sub-host-type'] if inventory_hostname in groups['tag_host-type_node'] else hostvars[inventory_hostname]['ec2_tag_host-type'] }}" openshift_master_cluster_method: 'native' openshift_use_openshift_sdn: "{{ lookup('oo_option', 'use_openshift_sdn') }}" os_sdn_network_plugin_name: "{{ lookup('oo_option', 'sdn_network_plugin_name') }}" |