diff options
author | Tomas Sedovic <tomas@sedovic.cz> | 2017-11-01 16:43:13 +0100 |
---|---|---|
committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-11-07 14:35:47 +1100 |
commit | 79f29bc825286c4f69073827a5b6d71f71f47c91 (patch) | |
tree | db91c04c153aef1419871a7843e8d415c49e0a60 /roles/openshift_openstack/templates/heat_stack_server.yaml.j2 | |
parent | 23674d565f2801d88060bd0443ec384fbdcdad59 (diff) | |
download | openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.tar.gz openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.tar.bz2 openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.tar.xz openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.zip |
Add the DNS updates and rename the openstack vars
Most of the vars in `roles/openshift_openstack/defaults/main.yml` are
now prefixed with `openstack_`.
Diffstat (limited to 'roles/openshift_openstack/templates/heat_stack_server.yaml.j2')
-rw-r--r-- | roles/openshift_openstack/templates/heat_stack_server.yaml.j2 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 b/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 index 9ffe721a5..160345baf 100644 --- a/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 +++ b/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 @@ -61,7 +61,7 @@ parameters: label: Net name description: Net name -{% if not provider_network %} +{% if not openstack_provider_network_name %} subnet: type: string label: Subnet ID @@ -81,7 +81,7 @@ parameters: label: Net ID description: Net resource -{% if not provider_network %} +{% if not openstack_provider_network_name %} data_subnet: type: string default: '' @@ -102,7 +102,7 @@ parameters: label: Attach-float-net description: A switch for floating network port connection -{% if not provider_network %} +{% if not openstack_provider_network_name %} floating_network: type: string default: '' @@ -156,7 +156,7 @@ outputs: - server - addresses - { get_param: net_name } -{% if provider_network %} +{% if openstack_provider_network_name %} - 0 {% else %} - 1 @@ -226,7 +226,7 @@ resources: type: OS::Neutron::Port properties: network: { get_param: net } -{% if not provider_network %} +{% if not openstack_provider_network_name %} fixed_ips: - subnet: { get_param: subnet } {% endif %} @@ -239,13 +239,13 @@ resources: properties: network: { get_param: data_net } port_security_enabled: false -{% if not provider_network %} +{% if not openstack_provider_network_name %} fixed_ips: - subnet: { get_param: data_subnet } {% endif %} {% endif %} -{% if not provider_network %} +{% if not openstack_provider_network_name %} floating-ip: condition: { not: no_floating } type: OS::Neutron::FloatingIP |