aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml4
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml8
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml7
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml7
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml8
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml4
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml6
13 files changed, 42 insertions, 38 deletions
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 15202f11b..2e3e9d124 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
@@ -31,11 +31,13 @@ parameters:
salt_master_host: ${_param:infra_config_deploy_address}
# yamllint disable rule:line-length
salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+ dhcp_nic: ${_param:infra_secondary_nic}
+ single_nic: ${_param:infra_tertiary_nic}
linux:
network:
interface:
- ens3: ${_param:linux_dhcp_interface}
- ens4: ${_param:linux_single_interface}
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
salt:
master:
accept_policy: open_mode
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 236d521d0..a84911661 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
@@ -45,14 +45,18 @@ parameters:
storage:
node:
name: default
+ dhcp_nic: ${_param:infra_primary_nic}
+ single_nic: ${_param:infra_secondary_nic}
linux_dhcp_interface:
enabled: true
type: eth
proto: dhcp
+ name: ${_param:dhcp_nic}
linux_single_interface:
enabled: true
type: eth
proto: static
+ name: ${_param:single_nic}
address: ${_param:single_address}
netmask: 255.255.255.0
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 67a2c4da5..c13c47514 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
@@ -25,7 +25,7 @@ parameters:
cluster_node03_address: ${_param:infra_kvm_node03_address}
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
- deploy_nic: enp6s0
+ deploy_nic: ${_param:openstack_primary_nic}
salt:
control:
size: # RAM 4096,8192,16384,32768,65536
@@ -115,10 +115,10 @@ parameters:
virt:
nic:
default:
- eth1:
+ - name: ${_param:deploy_nic}
bridge: br-mgmt
model: virtio
- eth0:
+ - name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
bridge: br-ctl
model: virtio
glusterfs:
@@ -140,7 +140,7 @@ parameters:
linux:
network:
interface:
- eth3:
+ deploy:
enabled: true
type: eth
proto: manual
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 2e39588f4..40e23eb8c 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
@@ -5,9 +5,9 @@ classes:
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
_param:
- dhcp_interface: ens3
- primary_interface: ens4
- pxe_interface: ens5
+ dhcp_interface: ${_param:infra_primary_nic}
+ primary_interface: ${_param:infra_secondary_nic}
+ pxe_interface: ${_param:infra_tertiary_nic}
interface_mtu: 1500
# MaaS has issues using MTU > 1500 for PXE interface
pxe_interface_mtu: 1500
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml
index ce1bdfdb5..f002ebd58 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml
@@ -10,12 +10,7 @@ parameters:
linux:
network:
interface:
- ens3:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
+ single: ${_param:linux_single_interface}
opendaylight:
server:
odl_bind_ip: ${_param:single_address}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
index 160d0bd62..8c7985aba 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
@@ -2,8 +2,11 @@
classes:
- cluster.baremetal-mcp-ocata-odl-ha
parameters:
+ _param:
+ dhcp_nic: eth0
+ single_nic: eth1
linux:
network:
interface:
- eth0: ${_param:linux_dhcp_interface}
- eth1: ${_param:linux_single_interface}
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
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 f2dab3983..841d2f255 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
@@ -24,14 +24,14 @@ parameters:
cluster_node03_hostname: ctl03
cluster_node03_address: ${_param:openstack_control_node03_address}
nova_vncproxy_url: https://${_param:cluster_public_host}:6080
- mgmt_nic: enp6s0
- tenant_nic: enp7s0
- linux_system_codename: xenial
- external_nic: enp8s0
+ mgmt_nic: ${_param:openstack_primary_nic}
+ tenant_nic: ${_param:openstack_secondary_nic}
+ external_nic: ${_param:openstack_tertiary_nic}
interface_mtu: 1500
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
loopback_device_size: 20
+ linux_system_codename: xenial
neutron_agents:
- neutron-dhcp-agent
- neutron-metadata-agent
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
index b04513f12..9da1f03da 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
@@ -23,7 +23,7 @@ classes:
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: ${_param:single_nic}
keepalived_vip_virtual_router_id: 50
cluster_vip_address: ${_param:openstack_control_address}
cluster_local_address: ${_param:single_address}
@@ -37,8 +37,8 @@ parameters:
linux:
network:
interface:
- ens2: ${_param:linux_dhcp_interface}
- ens3: ${_param:linux_single_interface}
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
keystone:
server:
cacert: /etc/ssl/certs/mcp_os_cacert
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
index ddcc196ae..e70aab514 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
@@ -8,5 +8,5 @@ parameters:
linux:
network:
interface:
- ens2: ${_param:linux_dhcp_interface}
- ens3: ${_param:linux_single_interface}
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
index 12fbe91d7..fc783d1b4 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
@@ -16,7 +16,7 @@ classes:
- cluster.baremetal-mcp-ocata-odl-ha
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: ${_param:single_nic}
keepalived_vip_virtual_router_id: 80
galera_server_cluster_name: openstack_cluster
galera_max_connections: 3072
@@ -32,5 +32,5 @@ parameters:
linux:
network:
interface:
- ens2: ${_param:linux_dhcp_interface}
- ens3: ${_param:linux_single_interface}
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
index 4bbd92f5e..f740e2904 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
@@ -7,7 +7,7 @@ classes:
- cluster.baremetal-mcp-ocata-odl-ha
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: ${_param:single_nic}
keepalived_vip_virtual_router_id: 90
cluster_vip_address: ${_param:openstack_message_queue_address}
cluster_local_address: ${_param:single_address}
@@ -20,5 +20,5 @@ parameters:
linux:
network:
interface:
- ens2: ${_param:linux_dhcp_interface}
- ens3: ${_param:linux_single_interface}
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
index b8d71099a..83a4be3fb 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
@@ -17,7 +17,7 @@ classes:
# - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: ${_param:single_nic}
keepalived_vip_virtual_router_id: 240
nginx_proxy_ssl:
enabled: true
@@ -29,8 +29,8 @@ parameters:
linux:
network:
interface:
- ens2: ${_param:linux_dhcp_interface}
- ens3: ${_param:linux_single_interface}
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
system:
package:
libapache2-mod-wsgi:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
index 8c4d65a62..4b14f7beb 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
@@ -12,7 +12,7 @@ classes:
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
_param:
- keepalived_openstack_telemetry_vip_interface: ens3
+ keepalived_openstack_telemetry_vip_interface: ${_param:single_nic}
keepalived_vip_virtual_router_id: 230
cluster_vip_address: ${_param:openstack_telemetry_address}
cluster_local_address: ${_param:single_address}
@@ -25,8 +25,8 @@ parameters:
linux:
network:
interface:
- ens2: ${_param:linux_dhcp_interface}
- ens3: ${_param:linux_single_interface}
+ dhcp: ${_param:linux_dhcp_interface}
+ single: ${_param:linux_single_interface}
mongodb:
server:
logging: