diff options
author | Davis Phillips <davis.phillips@gmail.com> | 2017-09-07 10:14:56 -0500 |
---|---|---|
committer | Davis Phillips <davis.phillips@gmail.com> | 2017-09-07 10:14:56 -0500 |
commit | 4ec2795d2978a602087d677799ddd8b9f941ee28 (patch) | |
tree | f23cb4c061741d85bd2b1a0bf0c77e04d7378c52 /roles/openstack-stack/templates/heat_stack_server.yaml.j2 | |
parent | 90889d6be26eab6d6873d9063c3d8e2384ff9464 (diff) | |
parent | 1013e6ceefc83a182f231ab7d178676e4d996ceb (diff) | |
download | openshift-4ec2795d2978a602087d677799ddd8b9f941ee28.tar.gz openshift-4ec2795d2978a602087d677799ddd8b9f941ee28.tar.bz2 openshift-4ec2795d2978a602087d677799ddd8b9f941ee28.tar.xz openshift-4ec2795d2978a602087d677799ddd8b9f941ee28.zip |
updating rhsm-sub and rhsm-repos
Diffstat (limited to 'roles/openstack-stack/templates/heat_stack_server.yaml.j2')
-rw-r--r-- | roles/openstack-stack/templates/heat_stack_server.yaml.j2 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/roles/openstack-stack/templates/heat_stack_server.yaml.j2 b/roles/openstack-stack/templates/heat_stack_server.yaml.j2 index 5851d3b9b..a520a8fe2 100644 --- a/roles/openstack-stack/templates/heat_stack_server.yaml.j2 +++ b/roles/openstack-stack/templates/heat_stack_server.yaml.j2 @@ -61,20 +61,24 @@ parameters: label: Net name description: Net name +{% if not provider_network %} subnet: type: string label: Subnet ID description: Subnet resource +{% endif %} secgrp: type: comma_delimited_list label: Security groups description: Security group resources +{% if not provider_network %} floating_network: type: string label: Floating network description: Network to allocate floating IP from +{% endif %} availability_zone: type: string @@ -117,7 +121,11 @@ outputs: - server - addresses - { get_param: net_name } +{% if provider_network %} + - 0 +{% else %} - 1 +{% endif %} - addr resources: @@ -134,6 +142,7 @@ resources: user_data: get_file: user-data user_data_format: RAW + user_data_update_policy: IGNORE metadata: group: { get_param: group } environment: { get_param: cluster_env } @@ -146,16 +155,21 @@ resources: type: OS::Neutron::Port properties: network: { get_param: net } +{% if not provider_network %} fixed_ips: - subnet: { get_param: subnet } +{% endif %} security_groups: { get_param: secgrp } +{% if not provider_network %} floating-ip: type: OS::Neutron::FloatingIP properties: floating_network: { get_param: floating_network } port_id: { get_resource: port } +{% endif %} +{% if not ephemeral_volumes|default(false)|bool %} cinder_volume: type: OS::Cinder::Volume properties: @@ -168,3 +182,4 @@ resources: volume_id: { get_resource: cinder_volume } instance_uuid: { get_resource: server } mountpoint: /dev/sdb +{% endif %} |