diff options
Diffstat (limited to 'mcp/reclass')
8 files changed, 2 insertions, 34 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml index 9f1ee1da1..b17816fe5 100644 --- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml +++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml @@ -5,7 +5,6 @@ parameters: opnfv_infra_config_deploy_address: 10.20.0.2 opnfv_infra_maas_node01_address: 10.167.4.3 opnfv_infra_maas_node01_deploy_address: 192.168.11.3 - opnfv_infra_maas_node01_external_address: 172.30.10.3 opnfv_infra_compute_node01_address: 10.167.4.141 opnfv_infra_compute_node02_address: 10.167.4.142 opnfv_infra_compute_node03_address: 10.167.4.143 @@ -48,8 +47,8 @@ parameters: opnfv_openstack_compute_node01_tenant_address: 10.1.0.101 opnfv_openstack_compute_node02_tenant_address: 10.1.0.102 opnfv_openstack_compute_node03_tenant_address: 10.1.0.103 - opnfv_openstack_compute_node01_external_address: 172.30.10.101 - opnfv_openstack_compute_node02_external_address: 172.30.10.102 + opnfv_openstack_compute_node01_external_address: 172.30.10.2 + opnfv_openstack_compute_node02_external_address: 172.30.10.3 opnfv_name_servers: ['8.8.8.8', '8.8.4.4'] 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 dc164dd07..29b25216e 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 @@ -21,7 +21,6 @@ parameters: infra_config_deploy_address: 10.20.0.2 infra_maas_node01_address: 10.167.4.3 infra_maas_node01_deploy_address: ${_param:opnfv_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 infra_compute_node03_address: 10.167.4.143 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml index c7006e790..64ae85a38 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml @@ -7,7 +7,6 @@ parameters: dhcp_interface: ens3 primary_interface: ens4 pxe_interface: ens5 - external_interface: ens6 interface_mtu: 1500 # MaaS has issues using MTU > 1500 for PXE interface pxe_interface_mtu: 1500 @@ -125,11 +124,3 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 type: eth - external_interface: - enabled: true - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: static - address: ${_param:infra_maas_node01_external_address} - netmask: 255.255.255.0 - type: eth 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 60a0b67a4..60b615b11 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 @@ -21,7 +21,6 @@ parameters: infra_config_deploy_address: 10.20.0.2 infra_maas_node01_address: 10.167.4.3 infra_maas_node01_deploy_address: ${_param:opnfv_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 infra_compute_node03_address: 10.167.4.143 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml index 61f35f5e6..3f08290f8 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml @@ -7,7 +7,6 @@ parameters: dhcp_interface: ens3 primary_interface: ens4 pxe_interface: ens5 - external_interface: ens6 interface_mtu: 1500 # MaaS has issues using MTU > 1500 for PXE interface pxe_interface_mtu: 1500 @@ -125,11 +124,3 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 type: eth - external_interface: - enabled: true - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: static - address: ${_param:infra_maas_node01_external_address} - netmask: 255.255.255.0 - type: eth 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 64473fcb1..efb288e77 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 @@ -21,7 +21,6 @@ parameters: infra_config_deploy_address: ${_param:reclass_config_master} infra_maas_node01_address: ${_param:opnfv_infra_maas_node01_address} infra_maas_node01_deploy_address: ${_param:opnfv_maas_pxe_address} - infra_maas_node01_external_address: ${_param:opnfv_infra_maas_node01_external_address} infra_compute_node01_address: ${_param:opnfv_infra_compute_node01_address} infra_compute_node02_address: ${_param:opnfv_infra_compute_node02_address} infra_compute_node03_address: ${_param:opnfv_infra_compute_node03_address} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml index a8deb5de0..3e9879b43 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml @@ -148,7 +148,6 @@ parameters: - ${_param:deploy_nic} noifupdown: true mgmt-vlan: - name: vlan${_param:opnfv_net_mgmt_vlan} enabled: true proto: manual type: vlan 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 b9d84eaff..3a98fac2a 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 @@ -7,7 +7,6 @@ parameters: dhcp_interface: ens3 primary_interface: ens4 pxe_interface: ens5 - external_interface: ens6 interface_mtu: 1500 # MaaS has issues using MTU > 1500 for PXE interface pxe_interface_mtu: 1500 @@ -125,11 +124,3 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 type: eth - external_interface: - enabled: true - name: ${_param:external_interface} - mtu: ${_param:interface_mtu} - proto: static - address: ${_param:infra_maas_node01_external_address} - netmask: 255.255.255.0 - type: eth |