Extended system_codename and Interface name
Change-Id: I0d837ac0cecd136d25e6120f32e8f34b802d68cd
diff --git a/classes/cluster/os_ha_contrail_40/infra/config.yml b/classes/cluster/os_ha_contrail_40/infra/config.yml
index d636900..377bb15 100644
--- a/classes/cluster/os_ha_contrail_40/infra/config.yml
+++ b/classes/cluster/os_ha_contrail_40/infra/config.yml
@@ -103,6 +103,13 @@
cluster_param:
openstack_control_node03_address:
value_template: <<node_control_ip>>
+ opencontrail_control:
+ expression: <<node_hostname>>__startswith__ntw
+ cluster_param:
+ opencontrail_control_system_codename:
+ value_template: <<node_os>>
+ opencontrail_control_interface_name:
+ value_template: <<node_control_iface>>
opencontrail_control01:
expression: <<node_hostname>>__equals__ntw01
cluster_param:
@@ -153,9 +160,3 @@
mysql_cluster_role: slave
linux_system_codename: xenial
horizon_identity_host: ${_param:openstack_control_address}
- opencontrail_control_node01:
- linux_system_codename: xenial
- opencontrail_control_node02:
- linux_system_codename: xenial
- opencontrail_control_node03:
- linux_system_codename: xenial
diff --git a/classes/cluster/os_ha_contrail_40/opencontrail/control.yml b/classes/cluster/os_ha_contrail_40/opencontrail/control.yml
index 16da70c..6b10371 100644
--- a/classes/cluster/os_ha_contrail_40/opencontrail/control.yml
+++ b/classes/cluster/os_ha_contrail_40/opencontrail/control.yml
@@ -30,8 +30,9 @@
linux:
network:
interface:
- ens4:
+ iface:
enabled: true
+ name: ${_param:opencontrail_control_interface_name}
type: eth
proto: static
address: ${_param:single_address}
diff --git a/classes/cluster/os_ha_contrail_40/opencontrail/init.yml b/classes/cluster/os_ha_contrail_40/opencontrail/init.yml
index cee0b50..7e1e78c 100644
--- a/classes/cluster/os_ha_contrail_40/opencontrail/init.yml
+++ b/classes/cluster/os_ha_contrail_40/opencontrail/init.yml
@@ -34,4 +34,4 @@
address: ${_param:opencontrail_control_node03_address}
names:
- ${_param:opencontrail_control_node03_hostname}
- - ${_param:opencontrail_control_node03_hostname}.${_param:cluster_domain}
\ No newline at end of file
+ - ${_param:opencontrail_control_node03_hostname}.${_param:cluster_domain}