diff options
| author | Tomas Sedovic <tomas@sedovic.cz> | 2017-11-02 11:03:39 +0100 |
|---|---|---|
| committer | Tomas Sedovic <tomas@sedovic.cz> | 2017-11-07 14:35:47 +1100 |
| commit | b95170503613bb97c00175324b31ed91f6f41ea1 (patch) | |
| tree | 6021e692645f1233379909b3cb3f7b5795685f47 /roles/openshift_openstack/templates/heat_stack_server.yaml.j2 | |
| parent | ad84935b5021da5ab0d21ffdf630079c1a59083d (diff) | |
| download | openshift-b95170503613bb97c00175324b31ed91f6f41ea1.tar.gz openshift-b95170503613bb97c00175324b31ed91f6f41ea1.tar.bz2 openshift-b95170503613bb97c00175324b31ed91f6f41ea1.tar.xz openshift-b95170503613bb97c00175324b31ed91f6f41ea1.zip | |
Namespace the OpenStack vars
This makes sure that all the variables used in the `openshift_openstack`
role are prefixed with `openshift_openstack_` as is the convention.
Diffstat (limited to 'roles/openshift_openstack/templates/heat_stack_server.yaml.j2')
| -rw-r--r-- | roles/openshift_openstack/templates/heat_stack_server.yaml.j2 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 b/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 index 160345baf..a829da34f 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 openstack_provider_network_name %} +{% if not openshift_openstack_provider_network_name %} subnet: type: string label: Subnet ID @@ -81,7 +81,7 @@ parameters: label: Net ID description: Net resource -{% if not openstack_provider_network_name %} +{% if not openshift_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 openstack_provider_network_name %} +{% if not openshift_openstack_provider_network_name %} floating_network: type: string default: '' @@ -156,7 +156,7 @@ outputs: - server - addresses - { get_param: net_name } -{% if openstack_provider_network_name %} +{% if openshift_openstack_provider_network_name %} - 0 {% else %} - 1 @@ -226,7 +226,7 @@ resources: type: OS::Neutron::Port properties: network: { get_param: net } -{% if not openstack_provider_network_name %} +{% if not openshift_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 openstack_provider_network_name %} +{% if not openshift_openstack_provider_network_name %} fixed_ips: - subnet: { get_param: data_subnet } {% endif %} {% endif %} -{% if not openstack_provider_network_name %} +{% if not openshift_openstack_provider_network_name %} floating-ip: condition: { not: no_floating } type: OS::Neutron::FloatingIP @@ -254,7 +254,7 @@ resources: port_id: { get_resource: port } {% endif %} -{% if not ephemeral_volumes|default(false)|bool %} +{% if not openshift_openstack_ephemeral_volumes|default(false)|bool %} cinder_volume: type: OS::Cinder::Volume properties: |