Fix CI test for the model, unused nodes have been removed.
Definitons which are not used and had been defined not comprehensevely
in this model have been removed.
Change-Id: Id740a2a39bce160eedfebcc1a27edc254463bb87
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
index c583761..66ff1f0 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
@@ -102,6 +102,16 @@
cluster_param:
openstack_control_node03_address:
value_template: <<node_control_ip>>
+ openstack_compute:
+ expression: <<node_hostname>>__startswith__cmp
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.compute
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
openstack_gateway:
expression: <<node_hostname>>__startswith__gtw
node_class:
@@ -144,25 +154,6 @@
params:
mysql_cluster_role: slave
linux_system_codename: xenial
- openstack_compute_node01:
- params:
- single_address: 172.16.10.105
- tenant_address: 10.1.0.105
- external_address: 10.16.0.105
- openstack_compute_node02:
- params:
- single_address: 172.16.10.106
- tenant_address: 10.1.0.106
- external_address: 10.16.0.106
- openstack_proxy_node01:
- classes:
- - cluster.virtual-mcp11-ovs-ironic.openstack.proxy
- params:
- linux_system_codename: xenial
- stacklight_server_node01:
- classes:
- - system.influxdb.server.single
- - system.influxdb.database.stacklight
openstack_baremetal_node01:
params:
single_baremetal_address: ${_param:openstack_baremetal_node01_baremetal_address}
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/init.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/init.yml
index 9140bd0..01a9a5d 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/init.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ infra_config_deploy_address: 192.168.10.90
+ infra_config_address: 172.16.10.90
linux:
network:
host: