summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-07 16:51:16 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-07 16:51:16 +0000
commit6a5acbe71f8ffabe752e4cd791ecda9662f4fa0e (patch)
tree6667b61e279de7d881f896f44ab53c01d1ed35f8 /mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack
parentfca7d22742df82fc6e502b17ad45ebc11c0ba89b (diff)
parent5ab45d25c8fd3e5528c411e09b105699c745457f (diff)
Merge "Parametrized network config: nic device names"
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml7
-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/control.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml4
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml6
8 files changed, 25 insertions, 22 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml
index 54fe3d793..ea9f816bd 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml
@@ -2,8 +2,11 @@
classes:
- cluster.baremetal-mcp-ocata-ovs-dpdk-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-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
index 8db9d13c7..cdf67a030 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
@@ -24,13 +24,13 @@ 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
- linux_system_codename: xenial
- external_nic: enp8s0
+ mgmt_nic: ${_param:openstack_primary_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:
gateway:
dpdk: 'True'
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
index d59efa656..1aba5242a 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
@@ -23,7 +23,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-dpdk-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}
@@ -41,8 +41,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-ovs-dpdk-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml
index 9e44d62b1..1b3c5c5a9 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-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-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
index d3535eb65..9ecf7e923 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
@@ -16,7 +16,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-dpdk-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-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
index eac9131bc..ba9e0656f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
@@ -7,7 +7,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-dpdk-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-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
index f74373fcc..16c4a0968 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
@@ -17,7 +17,7 @@ classes:
# - cluster.baremetal-mcp-ocata-ovs-dpdk-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-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
index c739b7e92..38267218c 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
@@ -12,7 +12,7 @@ classes:
- cluster.baremetal-mcp-ocata-ovs-dpdk-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: