Remove hardcode from virtual-mcp11-ovs/drv models
Change-Id: I3fc0e6baaa89eb7edacbcc50158098ce28eab612
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/config.yml b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
index b0b20c8..237db95 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
@@ -30,8 +30,8 @@
reclass_data_revision: master
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
- reclass_config_master: 192.168.10.90
- single_address: 172.16.10.100
+ reclass_config_master: ${_param:infra_config_deploy_address}
+ single_address: ${_param:infra_config_address}
salt_master_host: 127.0.0.1
salt_master_base_environment: prd
salt_minion_ca_host: ${linux:network:fqdn}
@@ -50,7 +50,7 @@
site:
nginx_proxy_openstack_web:
proxy:
- host: prx
+ host: ${_param:openstack_proxy_address}
nginx_proxy_openstack_api_heat_cfn:
enabled: false
salt:
@@ -166,12 +166,10 @@
- system.influxdb.database.stacklight
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_gateway_node01:
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/init.yml b/classes/cluster/virtual-mcp11-ovs/infra/init.yml
index af6f300..1162e75 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/init.yml
@@ -3,7 +3,8 @@
cluster_domain: virtual-mcp11-ovs.local
cluster_name: virtual-mcp11-ovs
infra_config_hostname: cfg01
- infra_config_address: 172.16.10.100
+ infra_config_deploy_address: 192.168.10.90
+ infra_config_address: 172.16.10.90
linux:
network:
host: