summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorGuillermo Herrero <guillermo.herrero@enea.com>2017-09-25 12:48:26 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-09-26 16:01:09 +0000
commit48f978f10c6f31ea1b9e0d5aabfe8a83c96081fd (patch)
tree241aad141fd67378af584c517725ac9d93585c1c /mcp
parent533b81df35acd7c2f16cd347cf3167583e870d38 (diff)
Extended PDF support to all baremetal scenarios
JIRA: FUEL-275 Change-Id: I67e8d7ab95e35c78a4f960a12733124fe7bffaec Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com> (cherry picked from commit 809ea60a05f55d98814f8794a46540edcd2b0298)
Diffstat (limited to 'mcp')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml20
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml62
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml12
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml76
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml1
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml20
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml62
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml73
13 files changed, 175 insertions, 179 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 90c3c8556..ecc8dad28 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
@@ -51,6 +51,7 @@ parameters:
opnfv_openstack_compute_node01_external_address: 172.30.10.2
opnfv_openstack_compute_node02_external_address: 172.30.10.3
+ opnfv_opendaylight_server_node01_single_address: 10.167.4.111
opnfv_name_servers: ['8.8.8.8', '8.8.4.4']
opnfv_dns_server01: '8.8.8.8'
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
index 4cf2a60a6..15202f11b 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
@@ -26,7 +26,6 @@ parameters:
reclass_data_repository: local
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
- reclass_config_master: ${_param:infra_config_deploy_address}
single_address: ${_param:infra_config_address}
deploy_address: ${_param:infra_config_deploy_address}
salt_master_host: ${_param:infra_config_deploy_address}
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 b1cd5d21c..58c562799 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
@@ -18,18 +18,18 @@ parameters:
infra_maas_database_password: opnfv_secret
# infra service addresses
- infra_config_address: 10.167.4.100
- infra_config_deploy_address: 10.20.0.2
- infra_maas_node01_address: 10.167.4.3
+ infra_config_address: ${_param:opnfv_infra_config_address}
+ 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_compute_node01_address: 10.167.4.141
- infra_compute_node02_address: 10.167.4.142
- infra_compute_node03_address: 10.167.4.143
+ 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}
- infra_kvm_address: 10.167.4.140
- infra_kvm_node01_address: 10.167.4.141
- infra_kvm_node02_address: 10.167.4.142
- infra_kvm_node03_address: 10.167.4.143
+ infra_kvm_address: ${_param:opnfv_infra_kvm_address}
+ infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address}
+ infra_kvm_node02_address: ${_param:opnfv_infra_kvm_node02_address}
+ infra_kvm_node03_address: ${_param:opnfv_infra_kvm_node03_address}
infra_maas_node01_hostname: mas01
infra_kvm_node01_hostname: kvm01
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
index 99ac02e34..da26254a7 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
@@ -153,17 +153,15 @@ parameters:
enabled: true
proto: dhcp
type: bridge
- name_servers:
- - 8.8.8.8
- - 8.8.4.4
+ name_servers: ${_param:opnfv_name_servers}
use_interfaces:
- ${_param:deploy_nic}
noifupdown: true
- vlan300:
+ mgmt-vlan:
enabled: true
proto: manual
type: vlan
- name: ${_param:deploy_nic}.300
+ name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
use_interfaces:
- ${_param:deploy_nic}
br-ctl:
@@ -173,4 +171,4 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
- - ${_param:deploy_nic}.300
+ - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
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 2a2fedb86..cbb1cafaf 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
@@ -15,7 +15,7 @@ parameters:
maas_admin_username: opnfv
maas_admin_password: opnfv_secret
maas_db_password: opnfv_secret
- dns_server01: 8.8.4.4
+ dns_server01: ${_param:opnfv_dns_server01}
single_address: ${_param:infra_maas_node01_deploy_address}
maas:
region:
@@ -48,57 +48,57 @@ parameters:
machines:
kvm01:
interface:
- mac: "00:25:b5:a0:00:2a"
+ mac: ${_param:opnfv_maas_node01_interface_mac}
power_parameters:
- power_address: "172.30.8.75"
- power_password: "octopus"
- power_type: ipmi
- power_user: "admin"
- architecture: 'amd64/generic'
+ power_address: ${_param:opnfv_maas_node01_power_address}
+ power_password: ${_param:opnfv_maas_node01_power_password}
+ power_type: ${_param:opnfv_maas_node01_power_type}
+ power_user: ${_param:opnfv_maas_node01_power_user}
+ architecture: ${_param:opnfv_maas_node01_architecture}
distro_series: xenial
hwe_kernel: hwe-16.04
kvm02:
interface:
- mac: "00:25:b5:a0:00:3a"
+ mac: ${_param:opnfv_maas_node02_interface_mac}
power_parameters:
- power_address: "172.30.8.65"
- power_password: "octopus"
- power_type: ipmi
- power_user: "admin"
- architecture: 'amd64/generic'
+ power_address: ${_param:opnfv_maas_node02_power_address}
+ power_password: ${_param:opnfv_maas_node02_power_password}
+ power_type: ${_param:opnfv_maas_node02_power_type}
+ power_user: ${_param:opnfv_maas_node02_power_user}
+ architecture: ${_param:opnfv_maas_node02_architecture}
distro_series: xenial
hwe_kernel: hwe-16.04
kvm03:
interface:
- mac: "00:25:b5:a0:00:4a"
+ mac: ${_param:opnfv_maas_node03_interface_mac}
power_parameters:
- power_address: "172.30.8.74"
- power_password: "octopus"
- power_type: ipmi
- power_user: "admin"
- architecture: 'amd64/generic'
+ power_address: ${_param:opnfv_maas_node03_power_address}
+ power_password: ${_param:opnfv_maas_node03_power_password}
+ power_type: ${_param:opnfv_maas_node03_power_type}
+ power_user: ${_param:opnfv_maas_node03_power_user}
+ architecture: ${_param:opnfv_maas_node03_architecture}
distro_series: xenial
hwe_kernel: hwe-16.04
cmp001:
interface:
- mac: "00:25:b5:a0:00:5a"
+ mac: ${_param:opnfv_maas_node04_interface_mac}
power_parameters:
- power_address: "172.30.8.73"
- power_password: "octopus"
- power_type: ipmi
- power_user: "admin"
- architecture: 'amd64/generic'
+ power_address: ${_param:opnfv_maas_node04_power_address}
+ power_password: ${_param:opnfv_maas_node04_power_password}
+ power_type: ${_param:opnfv_maas_node04_power_type}
+ power_user: ${_param:opnfv_maas_node04_power_user}
+ architecture: ${_param:opnfv_maas_node04_architecture}
distro_series: xenial
hwe_kernel: hwe-16.04
cmp002:
interface:
- mac: "00:25:b5:a0:00:6a"
+ mac: ${_param:opnfv_maas_node05_interface_mac}
power_parameters:
- power_address: "172.30.8.72"
- power_password: "octopus"
- power_type: ipmi
- power_user: "admin"
- architecture: 'amd64/generic'
+ power_address: ${_param:opnfv_maas_node05_power_address}
+ power_password: ${_param:opnfv_maas_node05_power_password}
+ power_type: ${_param:opnfv_maas_node05_power_type}
+ power_user: ${_param:opnfv_maas_node05_power_user}
+ architecture: ${_param:opnfv_maas_node05_architecture}
distro_series: xenial
hwe_kernel: hwe-16.04
linux:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
index 82b1a6eff..ba0f385e7 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
@@ -91,19 +91,19 @@ parameters:
netmask: 255.255.255.0
mtu: 1500
use_interfaces:
- - ${_param:tenant_nic}.302
- vlan300:
+ - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
+ mgmt-vlan:
enabled: true
proto: manual
type: vlan
- name: ${_param:mgmt_nic}.300
+ name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
use_interfaces:
- ${_param:mgmt_nic}
- vlan302:
+ tenant-vlan:
enabled: true
proto: manual
type: vlan
- name: ${_param:tenant_nic}.302
+ name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
use_interfaces:
- ${_param:tenant_nic}
br-ctl:
@@ -113,7 +113,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
- - ${_param:mgmt_nic}.300
+ - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
br-floating:
enabled: true
type: ovs_bridge
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
index 16bdc0671..c7df472d3 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
@@ -1,35 +1,36 @@
---
+# yamllint disable rule:line-length
parameters:
_param:
openstack_version: ocata
- openstack_gateway_node01_address: 10.167.4.124
- openstack_gateway_node02_address: 10.167.4.125
- openstack_gateway_node03_address: 10.167.4.126
- openstack_gateway_node01_tenant_address: 10.1.0.6
- openstack_gateway_node02_tenant_address: 10.1.0.7
- openstack_gateway_node03_tenant_address: 10.1.0.9
+ openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address}
+ openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address}
+ openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address}
+ openstack_gateway_node01_tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
+ openstack_gateway_node02_tenant_address: ${_param:opnfv_openstack_gateway_node02_tenant_address}
+ openstack_gateway_node03_tenant_address: ${_param:opnfv_openstack_gateway_node03_tenant_address}
openstack_gateway_node01_hostname: gtw01
openstack_gateway_node02_hostname: gtw02
openstack_gateway_node03_hostname: gtw03
# openstack service addresses
- openstack_proxy_address: 10.167.4.80
- openstack_proxy_node01_address: 10.167.4.81
- openstack_proxy_node02_address: 10.167.4.82
- openstack_control_address: 10.167.4.10
- openstack_control_node01_address: 10.167.4.11
- openstack_control_node02_address: 10.167.4.12
- openstack_control_node03_address: 10.167.4.13
- openstack_database_address: 10.167.4.50
- openstack_database_node01_address: 10.167.4.51
- openstack_database_node02_address: 10.167.4.52
- openstack_database_node03_address: 10.167.4.53
- openstack_message_queue_address: 10.167.4.40
- openstack_message_queue_node01_address: 10.167.4.41
- openstack_message_queue_node02_address: 10.167.4.42
- openstack_message_queue_node03_address: 10.167.4.43
+ openstack_proxy_address: ${_param:opnfv_openstack_proxy_address}
+ openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address}
+ openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address}
+ openstack_control_address: ${_param:opnfv_openstack_control_address}
+ openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address}
+ openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address}
+ openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address}
+ openstack_database_address: ${_param:opnfv_openstack_database_address}
+ openstack_database_node01_address: ${_param:opnfv_openstack_database_node01_address}
+ openstack_database_node02_address: ${_param:opnfv_openstack_database_node02_address}
+ openstack_database_node03_address: ${_param:opnfv_openstack_database_node03_address}
+ openstack_message_queue_address: ${_param:opnfv_openstack_message_queue_address}
+ openstack_message_queue_node01_address: ${_param:opnfv_openstack_message_queue_node01_address}
+ openstack_message_queue_node02_address: ${_param:opnfv_openstack_message_queue_node02_address}
+ openstack_message_queue_node03_address: ${_param:opnfv_openstack_message_queue_node03_address}
openstack_telemetry_hostname: mdb
@@ -37,27 +38,26 @@ parameters:
openstack_telemetry_node02_hostname: mdb02
openstack_telemetry_node03_hostname: mdb03
- openstack_telemetry_address: 10.167.4.75
- openstack_telemetry_node01_address: 10.167.4.76
- openstack_telemetry_node02_address: 10.167.4.77
- openstack_telemetry_node03_address: 10.167.4.78
+ openstack_telemetry_address: ${_param:opnfv_openstack_telemetry_address}
+ openstack_telemetry_node01_address: ${_param:opnfv_openstack_telemetry_node01_address}
+ openstack_telemetry_node02_address: ${_param:opnfv_openstack_telemetry_node02_address}
+ openstack_telemetry_node03_address: ${_param:opnfv_openstack_telemetry_node03_address}
# OpenStack Compute
- openstack_compute_node01_single_address: 10.167.4.101
- openstack_compute_node02_single_address: 10.167.4.102
- openstack_compute_node03_single_address: 10.167.4.103
- openstack_compute_node01_control_address: 10.167.4.101
- openstack_compute_node02_control_address: 10.167.4.102
- openstack_compute_node03_control_address: 10.167.4.103
- openstack_compute_node01_tenant_address: 10.1.0.101
- openstack_compute_node02_tenant_address: 10.1.0.102
- openstack_compute_node03_tenant_address: 10.1.0.103
- openstack_compute_node01_external_address: 172.30.10.2
- openstack_compute_node02_external_address: 172.30.10.3
+ openstack_compute_node01_single_address: ${_param:opnfv_openstack_compute_node01_single_address}
+ openstack_compute_node02_single_address: ${_param:opnfv_openstack_compute_node02_single_address}
+ openstack_compute_node03_single_address: ${_param:opnfv_openstack_compute_node03_single_address}
+ openstack_compute_node01_control_address: ${_param:opnfv_openstack_compute_node01_control_address}
+ openstack_compute_node02_control_address: ${_param:opnfv_openstack_compute_node02_control_address}
+ openstack_compute_node03_control_address: ${_param:opnfv_openstack_compute_node03_control_address}
+ openstack_compute_node01_tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address}
+ openstack_compute_node02_tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address}
+ openstack_compute_node03_tenant_address: ${_param:opnfv_openstack_compute_node03_tenant_address}
+ openstack_compute_node01_external_address: ${_param:opnfv_openstack_compute_node01_external_address}
+ openstack_compute_node02_external_address: ${_param:opnfv_openstack_compute_node02_external_address}
# opendaylight options
- opendaylight_server_node01_single_address: 10.167.4.111
- # yamllint disable rule:line-length
+ opendaylight_server_node01_single_address: ${_param:opnfv_opendaylight_server_node01_single_address}
opendaylight_service_host: ${_param:opendaylight_server_node01_single_address}
opendaylight_server_node01_hostname: odl01
opendaylight_router: odl-router_v2
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
index ca38c2823..9d53193be 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
@@ -25,7 +25,6 @@ parameters:
reclass_data_repository: local
salt_master_environment_repository: "https://github.com/tcpcloud"
salt_master_environment_revision: master
- reclass_config_master: ${_param:infra_config_deploy_address}
single_address: ${_param:infra_config_address}
deploy_address: ${_param:infra_config_deploy_address}
salt_master_host: ${_param:infra_config_deploy_address}
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 ce3d74d0d..8aadd7a6a 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
@@ -18,18 +18,18 @@ parameters:
infra_maas_database_password: opnfv_secret
# infra service addresses
- infra_config_address: 10.167.4.100
- infra_config_deploy_address: 10.20.0.2
- infra_maas_node01_address: 10.167.4.3
+ infra_config_address: ${_param:opnfv_infra_config_address}
+ 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_compute_node01_address: 10.167.4.141
- infra_compute_node02_address: 10.167.4.142
- infra_compute_node03_address: 10.167.4.143
+ 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}
- infra_kvm_address: 10.167.4.140
- infra_kvm_node01_address: 10.167.4.141
- infra_kvm_node02_address: 10.167.4.142
- infra_kvm_node03_address: 10.167.4.143
+ infra_kvm_address: ${_param:opnfv_infra_kvm_address}
+ infra_kvm_node01_address: ${_param:opnfv_infra_kvm_node01_address}
+ infra_kvm_node02_address: ${_param:opnfv_infra_kvm_node02_address}
+ infra_kvm_node03_address: ${_param:opnfv_infra_kvm_node03_address}
infra_maas_node01_hostname: mas01
infra_kvm_node01_hostname: kvm01
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
index 05cd09737..72e6ac2ed 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
@@ -142,17 +142,15 @@ parameters:
enabled: true
proto: dhcp
type: bridge
- name_servers:
- - 8.8.8.8
- - 8.8.4.4
+ name_servers: ${_param:opnfv_name_servers}
use_interfaces:
- ${_param:deploy_nic}
noifupdown: true
- vlan300:
+ mgmt-vlan:
enabled: true
proto: manual
type: vlan
- name: ${_param:deploy_nic}.300
+ name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
use_interfaces:
- ${_param:deploy_nic}
br-ctl:
@@ -162,4 +160,4 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
- - ${_param:deploy_nic}.300
+ - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
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 4e9ed2fb9..783e4ec00 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
@@ -15,7 +15,7 @@ parameters:
maas_admin_username: opnfv
maas_admin_password: opnfv_secret
maas_db_password: opnfv_secret
- dns_server01: 8.8.4.4
+ dns_server01: ${_param:opnfv_dns_server01}
single_address: ${_param:infra_maas_node01_deploy_address}
maas:
region:
@@ -48,57 +48,57 @@ parameters:
machines:
kvm01:
interface:
- mac: "00:25:b5:a0:00:2a"
+ mac: ${_param:opnfv_maas_node01_interface_mac}
power_parameters:
- power_address: "172.30.8.75"
- power_password: "octopus"
- power_type: ipmi
- power_user: "admin"
- architecture: 'amd64/generic'
+ power_address: ${_param:opnfv_maas_node01_power_address}
+ power_password: ${_param:opnfv_maas_node01_power_password}
+ power_type: ${_param:opnfv_maas_node01_power_type}
+ power_user: ${_param:opnfv_maas_node01_power_user}
+ architecture: ${_param:opnfv_maas_node01_architecture}
distro_series: xenial
hwe_kernel: hwe-16.04
kvm02:
interface:
- mac: "00:25:b5:a0:00:3a"
+ mac: ${_param:opnfv_maas_node02_interface_mac}
power_parameters:
- power_address: "172.30.8.65"
- power_password: "octopus"
- power_type: ipmi
- power_user: "admin"
- architecture: 'amd64/generic'
+ power_address: ${_param:opnfv_maas_node02_power_address}
+ power_password: ${_param:opnfv_maas_node02_power_password}
+ power_type: ${_param:opnfv_maas_node02_power_type}
+ power_user: ${_param:opnfv_maas_node02_power_user}
+ architecture: ${_param:opnfv_maas_node02_architecture}
distro_series: xenial
hwe_kernel: hwe-16.04
kvm03:
interface:
- mac: "00:25:b5:a0:00:4a"
+ mac: ${_param:opnfv_maas_node03_interface_mac}
power_parameters:
- power_address: "172.30.8.74"
- power_password: "octopus"
- power_type: ipmi
- power_user: "admin"
- architecture: 'amd64/generic'
+ power_address: ${_param:opnfv_maas_node03_power_address}
+ power_password: ${_param:opnfv_maas_node03_power_password}
+ power_type: ${_param:opnfv_maas_node03_power_type}
+ power_user: ${_param:opnfv_maas_node03_power_user}
+ architecture: ${_param:opnfv_maas_node03_architecture}
distro_series: xenial
hwe_kernel: hwe-16.04
cmp001:
interface:
- mac: "00:25:b5:a0:00:5a"
+ mac: ${_param:opnfv_maas_node04_interface_mac}
power_parameters:
- power_address: "172.30.8.73"
- power_password: "octopus"
- power_type: ipmi
- power_user: "admin"
- architecture: 'amd64/generic'
+ power_address: ${_param:opnfv_maas_node04_power_address}
+ power_password: ${_param:opnfv_maas_node04_power_password}
+ power_type: ${_param:opnfv_maas_node04_power_type}
+ power_user: ${_param:opnfv_maas_node04_power_user}
+ architecture: ${_param:opnfv_maas_node04_architecture}
distro_series: xenial
hwe_kernel: hwe-16.04
cmp002:
interface:
- mac: "00:25:b5:a0:00:6a"
+ mac: ${_param:opnfv_maas_node05_interface_mac}
power_parameters:
- power_address: "172.30.8.72"
- power_password: "octopus"
- power_type: ipmi
- power_user: "admin"
- architecture: 'amd64/generic'
+ power_address: ${_param:opnfv_maas_node05_power_address}
+ power_password: ${_param:opnfv_maas_node05_power_password}
+ power_type: ${_param:opnfv_maas_node05_power_type}
+ power_user: ${_param:opnfv_maas_node05_power_user}
+ architecture: ${_param:opnfv_maas_node05_architecture}
distro_series: xenial
hwe_kernel: hwe-16.04
linux:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
index 41b9984a0..696c5a5bb 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
@@ -78,11 +78,11 @@ parameters:
mtu: ${_param:interface_mtu}
proto: manual
type: eth
- vlan300:
+ mgmt-vlan:
enabled: true
proto: manual
type: vlan
- name: ${_param:mgmt_nic}.300
+ name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
use_interfaces:
- ${_param:mgmt_nic}
br-ctl:
@@ -92,7 +92,7 @@ parameters:
address: ${_param:single_address}
netmask: 255.255.255.0
use_interfaces:
- - ${_param:mgmt_nic}.300
+ - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
br-floating:
enabled: true
type: ovs_bridge
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
index cfc3688b4..9fa69baf3 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
@@ -1,35 +1,36 @@
---
+# yamllint disable rule:line-length
parameters:
_param:
openstack_version: ocata
- openstack_gateway_node01_address: 10.167.4.124
- openstack_gateway_node02_address: 10.167.4.125
- openstack_gateway_node03_address: 10.167.4.126
- openstack_gateway_node01_tenant_address: 10.1.0.6
- openstack_gateway_node02_tenant_address: 10.1.0.7
- openstack_gateway_node03_tenant_address: 10.1.0.9
+ openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address}
+ openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address}
+ openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address}
+ openstack_gateway_node01_tenant_address: ${_param:opnfv_openstack_gateway_node01_tenant_address}
+ openstack_gateway_node02_tenant_address: ${_param:opnfv_openstack_gateway_node02_tenant_address}
+ openstack_gateway_node03_tenant_address: ${_param:opnfv_openstack_gateway_node03_tenant_address}
openstack_gateway_node01_hostname: gtw01
openstack_gateway_node02_hostname: gtw02
openstack_gateway_node03_hostname: gtw03
# openstack service addresses
- openstack_proxy_address: 10.167.4.80
- openstack_proxy_node01_address: 10.167.4.81
- openstack_proxy_node02_address: 10.167.4.82
- openstack_control_address: 10.167.4.10
- openstack_control_node01_address: 10.167.4.11
- openstack_control_node02_address: 10.167.4.12
- openstack_control_node03_address: 10.167.4.13
- openstack_database_address: 10.167.4.50
- openstack_database_node01_address: 10.167.4.51
- openstack_database_node02_address: 10.167.4.52
- openstack_database_node03_address: 10.167.4.53
- openstack_message_queue_address: 10.167.4.40
- openstack_message_queue_node01_address: 10.167.4.41
- openstack_message_queue_node02_address: 10.167.4.42
- openstack_message_queue_node03_address: 10.167.4.43
+ openstack_proxy_address: ${_param:opnfv_openstack_proxy_address}
+ openstack_proxy_node01_address: ${_param:opnfv_openstack_proxy_node01_address}
+ openstack_proxy_node02_address: ${_param:opnfv_openstack_proxy_node02_address}
+ openstack_control_address: ${_param:opnfv_openstack_control_address}
+ openstack_control_node01_address: ${_param:opnfv_openstack_control_node01_address}
+ openstack_control_node02_address: ${_param:opnfv_openstack_control_node02_address}
+ openstack_control_node03_address: ${_param:opnfv_openstack_control_node03_address}
+ openstack_database_address: ${_param:opnfv_openstack_database_address}
+ openstack_database_node01_address: ${_param:opnfv_openstack_database_node01_address}
+ openstack_database_node02_address: ${_param:opnfv_openstack_database_node02_address}
+ openstack_database_node03_address: ${_param:opnfv_openstack_database_node03_address}
+ openstack_message_queue_address: ${_param:opnfv_openstack_message_queue_address}
+ openstack_message_queue_node01_address: ${_param:opnfv_openstack_message_queue_node01_address}
+ openstack_message_queue_node02_address: ${_param:opnfv_openstack_message_queue_node02_address}
+ openstack_message_queue_node03_address: ${_param:opnfv_openstack_message_queue_node03_address}
openstack_telemetry_hostname: mdb
@@ -37,23 +38,23 @@ parameters:
openstack_telemetry_node02_hostname: mdb02
openstack_telemetry_node03_hostname: mdb03
- openstack_telemetry_address: 10.167.4.75
- openstack_telemetry_node01_address: 10.167.4.76
- openstack_telemetry_node02_address: 10.167.4.77
- openstack_telemetry_node03_address: 10.167.4.78
+ openstack_telemetry_address: ${_param:opnfv_openstack_telemetry_address}
+ openstack_telemetry_node01_address: ${_param:opnfv_openstack_telemetry_node01_address}
+ openstack_telemetry_node02_address: ${_param:opnfv_openstack_telemetry_node02_address}
+ openstack_telemetry_node03_address: ${_param:opnfv_openstack_telemetry_node03_address}
# OpenStack Compute
- openstack_compute_node01_single_address: 10.167.4.101
- openstack_compute_node02_single_address: 10.167.4.102
- openstack_compute_node03_single_address: 10.167.4.103
- openstack_compute_node01_control_address: 10.167.4.101
- openstack_compute_node02_control_address: 10.167.4.102
- openstack_compute_node03_control_address: 10.167.4.103
- openstack_compute_node01_tenant_address: 10.1.0.101
- openstack_compute_node02_tenant_address: 10.1.0.102
- openstack_compute_node03_tenant_address: 10.1.0.103
- openstack_compute_node01_external_address: 172.30.10.2
- openstack_compute_node02_external_address: 172.30.10.3
+ openstack_compute_node01_single_address: ${_param:opnfv_openstack_compute_node01_single_address}
+ openstack_compute_node02_single_address: ${_param:opnfv_openstack_compute_node02_single_address}
+ openstack_compute_node03_single_address: ${_param:opnfv_openstack_compute_node03_single_address}
+ openstack_compute_node01_control_address: ${_param:opnfv_openstack_compute_node01_control_address}
+ openstack_compute_node02_control_address: ${_param:opnfv_openstack_compute_node02_control_address}
+ openstack_compute_node03_control_address: ${_param:opnfv_openstack_compute_node03_control_address}
+ openstack_compute_node01_tenant_address: ${_param:opnfv_openstack_compute_node01_tenant_address}
+ openstack_compute_node02_tenant_address: ${_param:opnfv_openstack_compute_node02_tenant_address}
+ openstack_compute_node03_tenant_address: ${_param:opnfv_openstack_compute_node03_tenant_address}
+ openstack_compute_node01_external_address: ${_param:opnfv_openstack_compute_node01_external_address}
+ openstack_compute_node02_external_address: ${_param:opnfv_openstack_compute_node02_external_address}
# openstack service hostnames
openstack_proxy_hostname: prx