diff options
| author | Tomas Sedovic <tomas@sedovic.cz> | 2017-07-12 17:30:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-12 17:30:00 +0200 |
| commit | a3a61ab4544d97dbc76dcd278c0f17d7a17fa022 (patch) | |
| tree | 4b53d1598c1b27974780fb1a5cf6c01487dd9bdd /roles/openstack-stack/templates | |
| parent | 25a2d4f772d735bc31e7a891e16e3d7d7002cd68 (diff) | |
| download | openshift-a3a61ab4544d97dbc76dcd278c0f17d7a17fa022.tar.gz openshift-a3a61ab4544d97dbc76dcd278c0f17d7a17fa022.tar.bz2 openshift-a3a61ab4544d97dbc76dcd278c0f17d7a17fa022.tar.xz openshift-a3a61ab4544d97dbc76dcd278c0f17d7a17fa022.zip | |
Add defaults values for some openstack vars (#539)
* Add defaults values for some openstack vars
Ansible shows errors when the `rhsm_register` and
`openstack_flat_secgrp` values are not present in the inventory even
though they have sensible default values.
This makes them both default to false when they're not specified.
* Comment out the flat security group option in inv
It's no longer required to be there so let's comment it out.
Diffstat (limited to 'roles/openstack-stack/templates')
| -rw-r--r-- | roles/openstack-stack/templates/heat_stack.yaml.j2 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/roles/openstack-stack/templates/heat_stack.yaml.j2 b/roles/openstack-stack/templates/heat_stack.yaml.j2 index 8bf76b57c..566b57ef8 100644 --- a/roles/openstack-stack/templates/heat_stack.yaml.j2 +++ b/roles/openstack-stack/templates/heat_stack.yaml.j2 @@ -160,7 +160,7 @@ resources: protocol: icmp remote_ip_prefix: {{ ssh_ingress_cidr }} -{% if openstack_flat_secgrp|bool %} +{% if openstack_flat_secgrp|default(False)|bool %} flat-secgrp: type: OS::Neutron::SecurityGroup properties: @@ -481,7 +481,7 @@ resources: net: { get_resource: net } subnet: { get_resource: subnet } secgrp: - - { get_resource: {% if openstack_flat_secgrp|bool %}flat-secgrp{% else %}etcd-secgrp{% endif %} } + - { get_resource: {% if openstack_flat_secgrp|default(False)|bool %}flat-secgrp{% else %}etcd-secgrp{% endif %} } - { get_resource: common-secgrp } floating_network: {{ external_network }} net_name: @@ -563,7 +563,7 @@ resources: net: { get_resource: net } subnet: { get_resource: subnet } secgrp: -{% if openstack_flat_secgrp|bool %} +{% if openstack_flat_secgrp|default(False)|bool %} - { get_resource: flat-secgrp } {% else %} - { get_resource: master-secgrp } @@ -617,7 +617,7 @@ resources: net: { get_resource: net } subnet: { get_resource: subnet } secgrp: - - { get_resource: {% if openstack_flat_secgrp|bool %}flat-secgrp{% else %}node-secgrp{% endif %} } + - { get_resource: {% if openstack_flat_secgrp|default(False)|bool %}flat-secgrp{% else %}node-secgrp{% endif %} } - { get_resource: common-secgrp } floating_network: {{ external_network }} net_name: @@ -662,7 +662,7 @@ resources: subnet: { get_resource: subnet } secgrp: # TODO(bogdando) filter only required node rules into infra-secgrp -{% if openstack_flat_secgrp|bool %} +{% if openstack_flat_secgrp|default(False)|bool %} - { get_resource: flat-secgrp } {% else %} - { get_resource: node-secgrp } @@ -718,4 +718,3 @@ resources: volume_size: {{ dns_volume_size }} depends_on: - interface - |