Fix reclass.storage interpolation for addresses in 'environment'
Change-Id: I76c9948716055f5b16ca7565504115f7cac0492a
Reviewed-on: https://review.gerrithub.io/370566
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>
diff --git a/tcp_tests/environment/lab03_ovs_dpdk/init.yml b/tcp_tests/environment/lab03_ovs_dpdk/init.yml
index 95d837e..c4514d8 100644
--- a/tcp_tests/environment/lab03_ovs_dpdk/init.yml
+++ b/tcp_tests/environment/lab03_ovs_dpdk/init.yml
@@ -1,23 +1,27 @@
parameters:
+ # Simulate escape sequence to not interpolate some values,
+ # so these values may get into the node yamls as ${_param:...}
+ _esc: $
+
reclass:
storage:
node:
stacklight_telemetry_node03:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_telemetry_node03:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_message_queue_node02:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_gateway_node03:
@@ -46,7 +50,7 @@
enabled: true
type: ovs_bridge
br_ctl:
- address: 10.167.4.226
+ address: ${_esc}{_param:single_address}
bridge: br-floating
enabled: true
netmask: 255.255.255.0
@@ -78,7 +82,7 @@
openstack_database_node02:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_gateway_node02:
@@ -107,7 +111,7 @@
enabled: true
type: ovs_bridge
br_ctl:
- address: 10.167.4.225
+ address: ${_esc}{_param:single_address}
bridge: br-floating
enabled: true
netmask: 255.255.255.0
@@ -139,25 +143,25 @@
openstack_control_node02:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
stacklight_monitor_node02:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
stacklight_telemetry_node01:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_message_queue_node03:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
infra_kvm_node01:
@@ -184,7 +188,7 @@
use_interfaces:
- bond0
br_ctl:
- address: 10.167.4.241
+ address: ${_esc}{_param:single_address}
enabled: true
netmask: 255.255.255.0
proto: static
@@ -192,7 +196,7 @@
use_interfaces:
- bond0.2416
br_mgm:
- address: 172.16.49.11
+ address: ${_esc}{_param:deploy_address}
enabled: true
gateway: 172.16.49.1
name_servers:
@@ -222,13 +226,13 @@
openstack_proxy_node02:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_telemetry_node01:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
infra_kvm_node02:
@@ -255,7 +259,7 @@
use_interfaces:
- bond0
br_ctl:
- address: 10.167.4.242
+ address: ${_esc}{_param:single_address}
enabled: true
netmask: 255.255.255.0
proto: static
@@ -263,7 +267,7 @@
use_interfaces:
- bond0.2416
br_mgm:
- address: 172.16.49.12
+ address: ${_esc}{_param:deploy_address}
enabled: true
gateway: 172.16.49.1
name_servers:
@@ -293,49 +297,49 @@
stacklight_monitor_node03:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_telemetry_node02:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
stacklight_log_node02:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_proxy_node01:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_message_queue_node01:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
stacklight_log_node01:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_database_node01:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_control_node03:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_compute_node02:
@@ -354,12 +358,12 @@
use_interfaces:
- bond0
br-prv:
- address: 10.167.6.102
+ address: ${_esc}{_param:tenant_address}
enabled: true
netmask: 255.255.255.0
type: dpdk_ovs_bridge
br_ctl:
- address: 10.167.4.102
+ address: ${_esc}{_param:control_address}
enabled: true
netmask: 255.255.255.0
proto: static
@@ -416,7 +420,7 @@
enabled: true
type: ovs_bridge
br_ctl:
- address: 10.167.4.224
+ address: ${_esc}{_param:single_address}
bridge: br-floating
enabled: true
netmask: 255.255.255.0
@@ -448,7 +452,7 @@
stacklight_log_node03:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_compute_node01:
@@ -467,12 +471,12 @@
use_interfaces:
- bond0
br-prv:
- address: 10.167.6.101
+ address: ${_esc}{_param:tenant_address}
enabled: true
netmask: 255.255.255.0
type: dpdk_ovs_bridge
br_ctl:
- address: 10.167.4.101
+ address: ${_esc}{_param:control_address}
enabled: true
netmask: 255.255.255.0
proto: static
@@ -506,7 +510,7 @@
openstack_database_node03:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
infra_kvm_node03:
@@ -533,7 +537,7 @@
use_interfaces:
- bond0
br_ctl:
- address: 10.167.4.243
+ address: ${_esc}{_param:single_address}
enabled: true
netmask: 255.255.255.0
proto: static
@@ -541,7 +545,7 @@
use_interfaces:
- bond0.2416
br_mgm:
- address: 172.16.49.13
+ address: ${_esc}{_param:deploy_address}
enabled: true
gateway: 172.16.49.1
name_servers:
@@ -571,18 +575,18 @@
stacklight_monitor_node01:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
openstack_control_node01:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common
stacklight_telemetry_node02:
params:
linux_network_interfaces:
- ens3: ${_param:linux_single_interface}
+ ens3: ${_esc}{_param:linux_single_interface}
classes:
- environment.lab03_ovs_dpdk.common