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
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/init.yml b/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
index 531d59a..654b013 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
@@ -14,14 +14,11 @@
cluster_domain: virtual-mcp11-ovs-ironic.local
cluster_name: virtual-mcp11-ovs-ironic
# infra service addresses
- infra_config_address: 172.16.10.100
+ infra_config_address: 172.16.10.90
# openstack service addresses
openstack_proxy_address: 172.16.10.121
openstack_proxy_node01_address: 172.16.10.121
openstack_control_address: 172.16.10.254
- openstack_control_node01_address: 172.16.10.101
- openstack_control_node02_address: 172.16.10.102
- openstack_control_node03_address: 172.16.10.103
openstack_database_address: ${_param:openstack_control_address}
openstack_message_queue_address: ${_param:openstack_control_address}
openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
@@ -37,9 +34,7 @@
openstack_gateway_address: 172.16.10.110
stacklight_telemetry_address: ${_param:stacklight_monitor_address}
- openstack_baremetal_node01_address: 172.16.10.110
openstack_baremetal_address: 192.168.90.10
- openstack_baremetal_node01_baremetal_address: 192.168.90.11
openstack_baremeta_neutron_subnet_cidr: 192.168.90.0/24
openstack_baremeta_neutron_subnet_allocation_start: 192.168.90.100
openstack_baremeta_neutron_subnet_allocation_end: 192.168.90.150
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
index c614b3e..c2b5b99 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
@@ -39,6 +39,9 @@
_param:
keepalived_vip_interface: ens4
keepalived_openstack_telemetry_vip_interface: ens4
+ cluster_vip_address: ${_param:openstack_control_address}
+ cluster_local_address: ${_param:single_address}
+ keepalived_openstack_telemetry_vip_interface: ens4
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml
index 45b8a3c..55d9230 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/init.yml
@@ -23,12 +23,15 @@
galera_server_admin_password: workshop
cluster_vip_address: 172.16.10.254
cluster_local_address: ${_param:single_address}
+ openstack_control_node01_address: 172.16.10.101
+ openstack_control_node02_address: 172.16.10.102
+ openstack_control_node03_address: 172.16.10.103
cluster_node01_hostname: ctl01
- cluster_node01_address: 172.16.10.101
+ cluster_node01_address: ${_param:openstack_control_node01_address}
cluster_node02_hostname: ctl02
- cluster_node02_address: 172.16.10.102
+ cluster_node02_address: ${_param:openstack_control_node02_address}
cluster_node03_hostname: ctl03
- cluster_node03_address: 172.16.10.103
+ cluster_node03_address: ${_param:openstack_control_node03_address}
rabbitmq_secret_key: workshop
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
@@ -56,6 +59,8 @@
ironic_api_type: 'public'
ironic_service_host: ${_param:cluster_vip_address}
cluster_baremetal_local_address: ${_param:cluster_local_address}
+ openstack_baremetal_node01_baremetal_address: 192.168.90.11
+ openstack_baremetal_node01_address: 172.16.10.110
metadata_password: password
mysql_admin_user: root
mysql_admin_password: workshop