Fix Ironic multinode model virtual-mcp11-ovs-ironic
* The model have been adjusted to use IP addresses
obtained dynamically through reactor.
* Baremetal role has been enabled
Change-Id: Id0dca7d51e97b6bdad96c3eb66a3813e7667088e
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
index 09d4de3..c583761 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
@@ -20,7 +20,6 @@
- system.keystone.client.service.nova-placement
- system.mysql.client.single
- system.reclass.storage.system.openstack_control_cluster
-- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_baremetal_single
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.stacklight_server_cluster
@@ -31,10 +30,10 @@
_param:
reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
reclass_data_revision: master
+ reclass_config_master: ${_param:infra_config_deploy_address}
+ single_address: ${_param:infra_config_address}
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
- reclass_config_master: 192.168.10.100
- single_address: 172.16.10.100
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
salt_minion_ca_host: ${linux:network:fqdn}
@@ -61,6 +60,12 @@
reactor:
reclass/minion/classify:
- salt://reclass/reactor/node_register.sls
+ environment:
+ prd:
+ formula:
+ baremetal_simulator:
+ name: salt-formula-baremetal-simulator
+ source: pkg
reclass:
storage:
class_mapping:
@@ -118,6 +123,8 @@
cluster_param:
openstack_baremetal_node01_address:
value_template: <<node_control_ip>>
+ openstack_baremetal_node01_baremetal_address:
+ value_template: <<node_baremetal_ip>>
node:
openstack_control_node01:
classes:
@@ -162,4 +169,4 @@
keepalived_openstack_baremetal_vip_priority: 100
ironic_api_type: 'deploy'
tenant_address: 10.1.0.110
- external_address: 10.16.0.110
\ No newline at end of file
+ external_address: 10.16.0.110