Make sure share01 is generated for virtual-mcp-pike-ovs with reclass
This patch makes sure that share01 is generated when applying reclass
state as well when do dynamic node clasification (Models where changes
where made: virtual-mcp-pike-ovs, virtual-mcp-pike-dvr,
virtual-mcp-pike-dvr-ssl).
Added linux:network pillar for static share01 node inventory
Change-Id: I88e873cc53f9b92b29c6750180895d376a4d5fdc
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index ce5ab70..56e9c28 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -30,6 +30,7 @@
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_share_single
- system.reclass.storage.system.openstack_telemetry_cluster
- cluster.virtual-mcp-pike-dvr.infra.backup.client_common
- cluster.virtual-mcp-pike-dvr
@@ -135,8 +136,10 @@
node_class:
value_template:
- cluster.<<node_cluster>>.openstack.share
- node_param:
- manila_share_address:
+ cluster_param:
+ openstack_share_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_share_node01_share_address:
value_template: <<node_tenant_ip>>
openstack_telemetry01:
expression: <<node_hostname>>__equals__mdb01
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
index 5b77433..31c7a69 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
@@ -8,6 +8,7 @@
openstack_control_node01_hostname: ctl01
openstack_control_node02_hostname: ctl02
openstack_control_node03_hostname: ctl03
+ openstack_share_node01_hostname: share01
openstack_control_node01_address: 172.16.10.101
openstack_control_node02_address: 172.16.10.102
openstack_control_node03_address: 172.16.10.103
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
index 57625ca..449310b 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
@@ -10,3 +10,12 @@
manila_lvm_devices:
- /dev/loop0
loopback_device1_size: 20
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0