diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-10 22:04:58 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-11 19:13:20 +0200 |
| commit | a760c973e420371b07ac1739ba2d32a1df87226f (patch) | |
| tree | 851260c1f5d6f9efec3195085f5f742c0bde4620 /mcp/reclass | |
| parent | c2269d2ed4f55ec051c058dc6b733f74d0d3eec3 (diff) | |
salt master, maas: Move mcpcontrol to 10.20.0.0/24
Use INSTALLER_IP Jenkins param instead of SALT_MASTER_IP, allowing
us to drop SALT_MASTER_IP completely from releng.
mcpcontrol IP changes:
- 192.168.10.100 becomes 10.20.0.2 (align with legacy Fuel master);
- 192.168.10.3 becomes 10.20.0.3 (baremetal MaaS address);
JIRA: FUEL-285
Change-Id: I6e2d44c3a8b43846196bd64191735214167a76ce
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass')
4 files changed, 4 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml index f1769d714..d08bdbb77 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml @@ -17,7 +17,7 @@ parameters: # infra service addresses infra_config_address: 10.167.4.100 - infra_config_deploy_address: 192.168.10.100 + infra_config_deploy_address: 10.20.0.2 infra_maas_node01_address: 10.167.4.3 infra_maas_node01_deploy_address: 192.168.11.3 infra_maas_node01_external_address: 10.16.0.3 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml index 1389aefff..7d029b3ab 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml @@ -17,7 +17,7 @@ parameters: # infra service addresses infra_config_address: 10.167.4.100 - infra_config_deploy_address: 192.168.10.100 + infra_config_deploy_address: 10.20.0.2 infra_maas_node01_address: 10.167.4.3 infra_maas_node01_deploy_address: 192.168.11.3 infra_maas_node01_external_address: 10.16.0.3 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml index d7e365a1b..b6261f624 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml @@ -17,7 +17,7 @@ parameters: # infra service addresses infra_config_address: 10.167.4.100 - infra_config_deploy_address: 192.168.10.100 + infra_config_deploy_address: 10.20.0.2 infra_maas_node01_address: 10.167.4.3 infra_maas_node01_deploy_address: 192.168.11.3 infra_maas_node01_external_address: 10.16.0.3 diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml index d60c81dd1..0e3a26454 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml @@ -16,7 +16,7 @@ parameters: reclass_data_repository: local salt_master_environment_repository: "https://github.com/tcpcloud" salt_master_environment_revision: master - reclass_config_master: 192.168.10.100 + reclass_config_master: 10.20.0.2 single_address: 172.16.10.100 salt_master_host: 127.0.0.1 salt_master_base_environment: prd |