Swawn each instance with 4 interfaces by default
Change-Id: Icdab268ef71a8c00d13e4c70db4bdcf7bcf579aa
diff --git a/tcp_tests/templates/_heat_environments/fragments/Compute.yaml b/tcp_tests/templates/_heat_environments/fragments/Compute.yaml
index 6b4c0c7..898f7c6 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Compute.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Compute.yaml
@@ -44,6 +44,11 @@
properties:
port_security_enabled: false
network_id: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
+ instance_port04:
+ type: OS::Neutron::Port
+ properties:
+ port_security_enabled: false
+ network_id: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
instance_instance:
type: OS::Nova::Server
@@ -60,6 +65,7 @@
- port: { get_resource: instance_port01 }
- port: { get_resource: instance_port02 }
- port: { get_resource: instance_port03 }
+ - port: { get_resource: instance_port04 }
block_device_mapping_v2:
- device_name: /dev/vdb
device_type: disk
diff --git a/tcp_tests/templates/_heat_environments/fragments/Instance.yaml b/tcp_tests/templates/_heat_environments/fragments/Instance.yaml
index 1c9be45..29659ac 100644
--- a/tcp_tests/templates/_heat_environments/fragments/Instance.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/Instance.yaml
@@ -45,6 +45,12 @@
port_security_enabled: false
network_id: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
+ instance_port04:
+ type: OS::Neutron::Port
+ properties:
+ port_security_enabled: false
+ network_id: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
+
instance_instance:
type: OS::Nova::Server
properties:
@@ -60,6 +66,7 @@
- port: { get_resource: instance_port01 }
- port: { get_resource: instance_port02 }
- port: { get_resource: instance_port03 }
+ - port: { get_resource: instance_port04 }
user_data_format: RAW
user_data:
str_replace:
diff --git a/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml b/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml
index 410deb6..885cace 100644
--- a/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml
+++ b/tcp_tests/templates/_heat_environments/fragments/MasterNode.yaml
@@ -41,6 +41,18 @@
fixed_ips:
- ip_address: { get_param: salt_master_control_ip }
+ instance_port03:
+ type: OS::Neutron::Port
+ properties:
+ port_security_enabled: false
+ network_id: { list_join: ['-', [ 'tenant_net', { get_param: env_name } ]] }
+
+ instance_port04:
+ type: OS::Neutron::Port
+ properties:
+ port_security_enabled: false
+ network_id: { list_join: ['-', [ 'external_net', { get_param: env_name } ]] }
+
instance_instance:
type: OS::Nova::Server
properties:
@@ -55,6 +67,8 @@
networks:
- port: { get_resource: instance_port01 }
- port: { get_resource: instance_port02 }
+ - port: { get_resource: instance_port03 }
+ - port: { get_resource: instance_port04 }
block_device_mapping_v2:
- device_name: /dev/cdrom
device_type: cdrom