From 1cf6275b983a108a02b6ef178fe35e610162b963 Mon Sep 17 00:00:00 2001 From: Antoni Segura Puimedon Date: Tue, 12 Sep 2017 10:57:38 +0200 Subject: openstack: make server ports be trunk ports (#713) This ensures that the ports that the servers were using before this commit will be parent ports of Neutron trunk ports. Thanks to this, there can be nested Neutron ports inside the OS::NOva::Server resources created either in the heat stack or dynamically inside the Instances. Signed-off-by: Antoni Segura Puimedon --- roles/openstack-stack/templates/heat_stack_server.yaml.j2 | 12 ++++++++++++ .../templates/heat_stack_server_nofloating.yaml.j2 | 12 ++++++++++++ 2 files changed, 24 insertions(+) (limited to 'roles') diff --git a/roles/openstack-stack/templates/heat_stack_server.yaml.j2 b/roles/openstack-stack/templates/heat_stack_server.yaml.j2 index a520a8fe2..fc797941e 100644 --- a/roles/openstack-stack/templates/heat_stack_server.yaml.j2 +++ b/roles/openstack-stack/templates/heat_stack_server.yaml.j2 @@ -138,7 +138,11 @@ resources: image: { get_param: image } flavor: { get_param: flavor } networks: +{% if use_trunk_ports|default(false)|bool %} + - port: { get_attr: [trunk-port, port_id] } +{% else %} - port: { get_resource: port } +{% endif %} user_data: get_file: user-data user_data_format: RAW @@ -151,6 +155,14 @@ resources: sub-host-type: { get_param: subtype } node_labels: { get_param: node_labels } +{% if use_trunk_ports|default(false)|bool %} + trunk-port: + type: OS::Neutron::Trunk + properties: + name: { get_param: name } + port: { get_resource: port } +{% endif %} + port: type: OS::Neutron::Port properties: diff --git a/roles/openstack-stack/templates/heat_stack_server_nofloating.yaml.j2 b/roles/openstack-stack/templates/heat_stack_server_nofloating.yaml.j2 index 638fc8b45..2c16ad778 100644 --- a/roles/openstack-stack/templates/heat_stack_server_nofloating.yaml.j2 +++ b/roles/openstack-stack/templates/heat_stack_server_nofloating.yaml.j2 @@ -115,7 +115,11 @@ resources: image: { get_param: image } flavor: { get_param: flavor } networks: +{% if use_trunk_ports|default(false)|bool %} + - port: { get_attr: [trunk-port, port_id] } +{% else %} - port: { get_resource: port } +{% endif %} user_data: get_file: user-data user_data_format: RAW @@ -128,6 +132,14 @@ resources: sub-host-type: { get_param: subtype } node_labels: { get_param: node_labels } +{% if use_trunk_ports|default(false)|bool %} + trunk-port: + type: OS::Neutron::Trunk + properties: + name: { get_param: name } + port: { get_resource: port } +{% endif %} + port: type: OS::Neutron::Port properties: -- cgit v1.2.3