Remove share02 and share03 nodes
Change-Id: I21aa67bb191671b6f446f5869fa969ce2ed24fcd
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml
index 28fe394..8c55d51 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml
@@ -211,12 +211,6 @@
manila_lvm_devices: '/dev/vdc'
openstack_share_address: 172.16.10.203
openstack_share_node01_address: 172.16.10.204
- openstack_share_node02_address: 172.16.10.205
- openstack_share_node03_address: 172.16.10.206
openstack_share_node01_deploy_address: 192.168.10.204
- openstack_share_node02_deploy_address: 192.168.10.205
- openstack_share_node03_deploy_address: 192.168.10.206
openstack_share_hostname: share
- openstack_share_node01_hostname: share01
- openstack_share_node02_hostname: share02
- openstack_share_node03_hostname: share03
+ openstack_share_node01_hostname: share01
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay.yaml
index 2ebccd5..f39e2a3 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/underlay.yaml
@@ -32,8 +32,6 @@
{% set HOSTNAME_GTW01 = os_env('HOSTNAME_GTW01', 'gtw01.' + DOMAIN_NAME) %}
{% set HOSTNAME_PRX01 = os_env('HOSTNAME_PRX01', 'prx01.' + DOMAIN_NAME) %}
{% set HOSTNAME_SHARE01 = os_env('HOSTNAME_SHARE01', 'share01.' + DOMAIN_NAME) %}
-{% set HOSTNAME_SHARE02 = os_env('HOSTNAME_SHARE02', 'share02.' + DOMAIN_NAME) %}
-{% set HOSTNAME_SHARE03 = os_env('HOSTNAME_SHARE03', 'share03.' + DOMAIN_NAME) %}
template:
devops_settings:
@@ -64,8 +62,6 @@
default_{{ HOSTNAME_GTW01 }}: +110
default_{{ HOSTNAME_PRX01 }}: +121
default_{{ HOSTNAME_SHARE01 }}: +204
- default_{{ HOSTNAME_SHARE02 }}: +205
- default_{{ HOSTNAME_SHARE03 }}: +206
ip_ranges:
dhcp: [+90, -10]
@@ -93,8 +89,6 @@
default_{{ HOSTNAME_GTW01 }}: +110
default_{{ HOSTNAME_PRX01 }}: +121
default_{{ HOSTNAME_SHARE01 }}: +204
- default_{{ HOSTNAME_SHARE02 }}: +205
- default_{{ HOSTNAME_SHARE03 }}: +206
ip_ranges:
dhcp: [+90, -10]
@@ -122,8 +116,6 @@
default_{{ HOSTNAME_GTW01 }}: +110
default_{{ HOSTNAME_PRX01 }}: +121
default_{{ HOSTNAME_SHARE01 }}: +204
- default_{{ HOSTNAME_SHARE02 }}: +205
- default_{{ HOSTNAME_SHARE03 }}: +206
ip_ranges:
dhcp: [+10, -10]
@@ -151,8 +143,6 @@
default_{{ HOSTNAME_GTW01 }}: +110
default_{{ HOSTNAME_PRX01 }}: +121
default_{{ HOSTNAME_SHARE01 }}: +204
- default_{{ HOSTNAME_SHARE02 }}: +205
- default_{{ HOSTNAME_SHARE03 }}: +206
ip_ranges:
dhcp: [+130, +220]
@@ -741,55 +731,3 @@
interfaces: *all_interfaces
network_config: *all_network_config
-
- - name: {{ HOSTNAME_SHARE02 }}
- role: salt_minion
- params:
- vcpu: !os_env SLAVE_NODE_CPU, 2
- memory: !os_env SLAVE_NODE_MEMORY, 4096
- boot:
- - hd
- cloud_init_volume_name: iso
- cloud_init_iface_up: ens3
- volumes:
- - name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
- backing_store: mcp_ubuntu_1604_image
- format: qcow2
- - name: iso # Volume with name 'iso' will be used
- # for store image with cloud-init metadata.
- capacity: 1
- format: raw
- device: cdrom
- bus: ide
- cloudinit_meta_data: *cloudinit_meta_data
- cloudinit_user_data: *cloudinit_user_data_1604
-
- interfaces: *all_interfaces
- network_config: *all_network_config
-
- - name: {{ HOSTNAME_SHARE03 }}
- role: salt_minion
- params:
- vcpu: !os_env SLAVE_NODE_CPU, 2
- memory: !os_env SLAVE_NODE_MEMORY, 4096
- boot:
- - hd
- cloud_init_volume_name: iso
- cloud_init_iface_up: ens3
- volumes:
- - name: system
- capacity: !os_env NODE_VOLUME_SIZE, 150
- backing_store: mcp_ubuntu_1604_image
- format: qcow2
- - name: iso # Volume with name 'iso' will be used
- # for store image with cloud-init metadata.
- capacity: 1
- format: raw
- device: cdrom
- bus: ide
- cloudinit_meta_data: *cloudinit_meta_data
- cloudinit_user_data: *cloudinit_user_data_1604
-
- interfaces: *all_interfaces
- network_config: *all_network_config