diff options
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha')
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml | 5 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml | 10 |
2 files changed, 8 insertions, 7 deletions
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..6bf0fbe63 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 @@ -1,5 +1,6 @@ classes: - system.linux.system.single +- cluster.all-mcp-ocata-common - cluster.baremetal-mcp-ocata-ovs-ha.openstack # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.client @@ -17,9 +18,9 @@ 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_deploy_address: ${_param:opnfv_fuel_maas_pxe_address} infra_maas_node01_external_address: 10.16.0.3 infra_compute_node01_address: 10.167.4.141 infra_compute_node02_address: 10.167.4.142 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml index d193469fc..f77abea6d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml @@ -32,13 +32,13 @@ parameters: network_discovery: 'enabled' default_min_hwe_kernel: 'hwe-16.04' subnets: - # TODO: parametrize address root (192.168.11), dhcp start/end? - 192.168.11.0/24: - cidr: 192.168.11.0/24 + opnfv_fuel_maas_pxe: + name: ${_param:opnfv_fuel_maas_pxe_network}/24 + cidr: ${_param:opnfv_fuel_maas_pxe_network}/24 gateway_ip: ${_param:single_address} iprange: - start: 192.168.11.5 - end: 192.168.11.250 + start: ${_param:opnfv_fuel_maas_pxe_iprange_start} + end: ${_param:opnfv_fuel_maas_pxe_iprange_end} type: dynamic vlans: untagged: |