Merge "Add k8s metallb switch parameter in k8s models"
diff --git a/classes/cluster/os-ha-contrail-40/infra/config.yml b/classes/cluster/os-ha-contrail-40/infra/config.yml
index 7ce56b0..c1ef306 100644
--- a/classes/cluster/os-ha-contrail-40/infra/config.yml
+++ b/classes/cluster/os-ha-contrail-40/infra/config.yml
@@ -1,5 +1,6 @@
classes:
- service.git.client
+- service.opencontrail.test.single
- system.linux.system.single
- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.linux.system.repo.mcp.openstack
diff --git a/classes/cluster/os-ha-contrail-40/init.yml b/classes/cluster/os-ha-contrail-40/init.yml
index dcdaab6..707e8d6 100644
--- a/classes/cluster/os-ha-contrail-40/init.yml
+++ b/classes/cluster/os-ha-contrail-40/init.yml
@@ -6,6 +6,7 @@
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
+- system.openssh.server.team.networking
- cluster.os-ha-contrail-40.infra
- cluster.os-ha-contrail-40.opencontrail
- cluster.os-ha-contrail-40.openstack
diff --git a/classes/cluster/os-ha-contrail/init.yml b/classes/cluster/os-ha-contrail/init.yml
index 05de4a8..877e684 100755
--- a/classes/cluster/os-ha-contrail/init.yml
+++ b/classes/cluster/os-ha-contrail/init.yml
@@ -6,6 +6,7 @@
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
+- system.openssh.server.team.networking
- cluster.os-ha-contrail.infra
- cluster.os-ha-contrail.opencontrail
- cluster.os-ha-contrail.openstack
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
index 1465125..756524c 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -10,7 +10,6 @@
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
- system.salt.minion.cert.proxy
-- system.sphinx.server.doc.reclass
- system.keystone.client.single
- system.keystone.client.service.aodh
- system.keystone.client.service.ceilometer
@@ -26,7 +25,6 @@
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.stacklightv2_server_cluster
- cluster.virtual-offline-pike-ovs-dpdk.infra.backup.client_common
-- cluster.virtual-offline-pike-ovs-dpdk.openstack.proxy
- cluster.virtual-offline-pike-ovs-dpdk.stacklight.proxy
- cluster.virtual-offline-pike-ovs-dpdk
parameters:
@@ -50,14 +48,6 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- nginx:
- server:
- site:
- nginx_proxy_openstack_web:
- proxy:
- host: prx
- nginx_proxy_openstack_api_heat_cfn:
- enabled: false
salt:
master:
backup: true
@@ -176,11 +166,15 @@
- system.influxdb.database.stacklight
openstack_compute_node01:
params:
+ dpdk0_name: ens5
+ dpdk0_pci: '"0000:05.00"'
single_address: 172.16.10.105
tenant_address: 10.1.0.105
external_address: 10.16.0.105
openstack_compute_node02:
params:
+ dpdk0_name: ens5
+ dpdk0_pci: '"0000:05.00"'
single_address: 172.16.10.106
tenant_address: 10.1.0.106
external_address: 10.16.0.106
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
index e8a17b5..df61570 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
@@ -9,6 +9,7 @@
- system.ceilometer.agent.cluster
- system.prometheus.exporters.libvirt
- cluster.virtual-offline-pike-ovs-dpdk
+- system.nova.compute.nfv.hugepages
- system.nova.compute.nfv.cpu_pinning
- system.nova.compute.nfv.sriov
- system.neutron.compute.nfv.dpdk
@@ -25,14 +26,16 @@
sriov_nic01_numvfs: 16
sriov_nic01_physical_network: physnet3
sriov_unsafe_interrupts: False
- dpdk0_pci: '"0000:04:00"'
nova_cpu_pinning: 0,1,2
compute_dpdk_driver: uio
compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
compute_ovs_pmd_cpu_mask: "0x6"
compute_ovs_dpdk_socket_mem: "1024"
- compute_ovs_dpdk_lcore_mask: "0x400"
+ compute_ovs_dpdk_lcore_mask: "0x1"
compute_ovs_memory_channels: "2"
+ compute_hugepages_size: 2M
+ compute_hugepages_count: 600
+ compute_hugepages_mount: /mnt/hugepages_2M
nova:
compute:
@@ -93,9 +96,14 @@
- ${_param:primary_interface}
br-mesh:
enabled: true
- type: bridge
- proto: static
+ type: dpdk_ovs_bridge
address: ${_param:tenant_address}
netmask: 255.255.255.0
- use_interfaces:
- - ${_param:tenant_interface}
+ dpdk0:
+ name: ${_param:dpdk0_name}
+ pci: ${_param:dpdk0_pci}
+ driver: igb_uio
+ bridge: br-mesh
+ enabled: true
+ type: dpdk_ovs_port
+ n_rxq: 2
diff --git a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
index a3b626b..2ff558e 100644
--- a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
@@ -10,7 +10,6 @@
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
- system.salt.minion.cert.proxy
-- system.sphinx.server.doc.reclass
- system.keystone.client.single
- system.keystone.client.service.aodh
- system.keystone.client.service.ceilometer
@@ -25,7 +24,6 @@
- system.reclass.storage.system.openstack_gateway_single
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.stacklightv2_server_cluster
-- cluster.virtual-offline-pike-ovs.openstack.proxy
- cluster.virtual-offline-pike-ovs.stacklight.proxy
- cluster.virtual-offline-pike-ovs
parameters:
@@ -49,14 +47,6 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- nginx:
- server:
- site:
- nginx_proxy_openstack_web:
- proxy:
- host: prx
- nginx_proxy_openstack_api_heat_cfn:
- enabled: false
salt:
master:
reactor:
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
index 9f1aba9..e529290 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
@@ -7,6 +7,7 @@
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_protocol: http
+ cluster_internal_protocol: http
cluster_public_host: 172.16.10.254
neutron_public_protocol: http
neutron_control_dvr: False
@@ -89,6 +90,12 @@
nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
neutron_version: ${_param:openstack_version}
neutron_service_host: ${_param:cluster_vip_address}
+ keystone_service_protocol: ${_param:cluster_internal_protocol}
+ glance_service_protocol: ${_param:cluster_internal_protocol}
+ nova_service_protocol: ${_param:cluster_internal_protocol}
+ neutron_service_protocol: ${_param:cluster_internal_protocol}
+ heat_service_protocol: ${_param:cluster_internal_protocol}
+ cinder_service_protocol: ${_param:cluster_internal_protocol}
glusterfs_service_host: ${_param:cluster_vip_address}
designate_service_host: ${_param:cluster_vip_address}
metadata_password: workshop
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
index b59f9ce..ee06caf 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
@@ -9,7 +9,7 @@
_param:
cluster_public_host: ${_param:openstack_proxy_address}
nginx_proxy_ssl:
- enabled: true
+ enabled: false
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
@@ -19,5 +19,5 @@
site:
nginx_ssl_redirect_openstack_web:
redirect:
- protocol: https
+ protocol: http
host: $host
diff --git a/classes/cluster/virtual-offline-ssl/infra/config.yml b/classes/cluster/virtual-offline-ssl/infra/config.yml
index c0a6e64..3fceea5 100644
--- a/classes/cluster/virtual-offline-ssl/infra/config.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/config.yml
@@ -14,7 +14,6 @@
#-salt/master/formula/pkg/dogtag.yml
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
-- system.sphinx.server.doc.reclass
- system.keystone.client.single
- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
@@ -183,11 +182,15 @@
linux_system_codename: xenial
openstack_compute_node01:
params:
+ dpdk0_name: ens5
+ dpdk0_pci: '"0000:05.00"'
single_address: 172.16.10.105
tenant_address: 10.1.0.105
external_address: 10.16.0.105
openstack_compute_node02:
params:
+ dpdk0_name: ens5
+ dpdk0_pci: '"0000:05.00"'
single_address: 172.16.10.106
tenant_address: 10.1.0.106
external_address: 10.16.0.106
diff --git a/classes/cluster/virtual-offline-ssl/openstack/compute.yml b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
index 87d472e..92395c8 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
@@ -15,6 +15,7 @@
- system.nova.compute.nfv.cpu_pinning
- system.nova.compute.nfv.sriov
- system.neutron.compute.nfv.dpdk
+- system.nova.compute.nfv.hugepages
- system.neutron.compute.nfv.sriov
- system.nova.compute.libvirt.ssl
- cluster.virtual-offline-ssl
@@ -29,14 +30,16 @@
sriov_nic01_numvfs: 16
sriov_nic01_physical_network: physnet3
sriov_unsafe_interrupts: False
- dpdk0_pci: '"0000:04:00"'
nova_cpu_pinning: 0,1,2
compute_dpdk_driver: uio
compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
compute_ovs_pmd_cpu_mask: "0x6"
compute_ovs_dpdk_socket_mem: "1024"
- compute_ovs_dpdk_lcore_mask: "0x400"
+ compute_ovs_dpdk_lcore_mask: "0x1"
compute_ovs_memory_channels: "2"
+ compute_hugepages_size: 2M
+ compute_hugepages_count: 600
+ compute_hugepages_mount: /mnt/hugepages_2M
loopback_device_size: 20
nova:
compute:
@@ -92,9 +95,14 @@
- ${_param:primary_interface}
br-mesh:
enabled: true
- type: bridge
- proto: static
+ type: dpdk_ovs_bridge
address: ${_param:tenant_address}
netmask: 255.255.255.0
- use_interfaces:
- - ${_param:tenant_interface}
+ dpdk0:
+ name: ${_param:dpdk0_name}
+ pci: ${_param:dpdk0_pci}
+ driver: igb_uio
+ bridge: br-mesh
+ enabled: true
+ type: dpdk_ovs_port
+ n_rxq: 2