summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mcp/patches/Makefile4
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml4
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml4
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml2
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml12
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml4
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml2
m---------mcp/reclass/classes/system0
9 files changed, 23 insertions, 11 deletions
diff --git a/mcp/patches/Makefile b/mcp/patches/Makefile
index 7468d01e0..dc87832b8 100644
--- a/mcp/patches/Makefile
+++ b/mcp/patches/Makefile
@@ -32,7 +32,7 @@ FPATCHES = $(shell find ${F_PATCH_DIR} -name '*.patch')
# To enable remote tracking, set the following var to any non-empty string.
# Leaving this var empty will bind each git submodule to its saved commit.
-FUEL_TRACK_REMOTES ?= yes
+FUEL_TRACK_REMOTES ?=
.PHONY: all
all: release
@@ -50,7 +50,7 @@ sub: .cachefuelinfo
@if [ -n "${FUEL_TRACK_REMOTES}" ]; then \
cd ${F_GIT_ROOT} && git submodule update --init --remote 2>/dev/null; \
else \
- git submodule update --init 2>/dev/null; \
+ cd ${F_GIT_ROOT} && git submodule update --init 2>/dev/null; \
fi
@touch $@
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 6f0c52c72..6d2c7f39c 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
@@ -2,11 +2,14 @@ classes:
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
+- system.linux.storage.loopback
- system.nova.compute.cluster
- system.nova.compute.nfv.hugepages
- system.nova.compute.nfv.cpu_pinning
- system.neutron.gateway.opendaylight.single
- system.neutron.gateway.cluster
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
- system.ceilometer.agent.cluster
- cluster.baremetal-mcp-ocata-odl-ha.infra
parameters:
@@ -27,6 +30,7 @@ parameters:
interface_mtu: 1500
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
+ loopback_device_size: 20
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 e8666d6c1..b46e23da7 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
@@ -10,7 +10,7 @@ classes:
- system.neutron.control.opendaylight.cluster
- system.nova.control.cluster
- system.cinder.control.cluster
-- system.cinder.volume.single
+- system.cinder.control.backend.lvm
- system.heat.server.cluster
- system.designate.server.cluster
- system.designate.server.backend.bind
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 6ea3827b9..a534e225f 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
@@ -2,11 +2,14 @@ classes:
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
+- system.linux.storage.loopback
- system.nova.compute.cluster
- system.nova.compute.nfv.hugepages
- system.nova.compute.nfv.cpu_pinning
- system.neutron.compute.nfv.dpdk
- system.neutron.gateway.cluster
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
- system.ceilometer.agent.cluster
- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
parameters:
@@ -26,6 +29,7 @@ parameters:
interface_mtu: 1500
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
+ loopback_device_size: 20
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 e7a3b85c4..7e8ea312f 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
@@ -10,7 +10,7 @@ classes:
- system.neutron.control.openvswitch.cluster
- system.nova.control.cluster
- system.cinder.control.cluster
-- system.cinder.volume.single
+- system.cinder.control.backend.lvm
- system.heat.server.cluster
- system.designate.server.cluster
- system.designate.server.backend.bind
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 bfe0d8ca5..016fcb8f5 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
@@ -95,15 +95,15 @@ parameters:
rabbitmq_admin_password: opnfv_secret
rabbitmq_openstack_password: opnfv_secret
neutron_tenant_vlan_range: "1000:1030"
- nova_cpu_pinning: "1,2,3,4,5,7,8,9,10,11"
+ nova_cpu_pinning: "5-7,13-15"
compute_hugepages_size: 1G
- compute_hugepages_count: 16
+ compute_hugepages_count: 12
compute_hugepages_mount: /mnt/hugepages_1G
- compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
+ compute_kernel_isolcpu: 2,5,6,7,9,10,13,14,15
compute_dpdk_driver: uio
- compute_ovs_pmd_cpu_mask: "0x6"
- compute_ovs_dpdk_socket_mem: "1024"
- compute_ovs_dpdk_lcore_mask: "0x400"
+ compute_ovs_pmd_cpu_mask: "0x2060"
+ compute_ovs_dpdk_socket_mem: "1024,1024"
+ compute_ovs_dpdk_lcore_mask: "0x1000"
compute_ovs_memory_channels: "2"
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:openstack_control_address}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
index 070ab7865..e11e35e54 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
@@ -2,10 +2,13 @@ classes:
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
+- system.linux.storage.loopback
- system.nova.compute.cluster
- system.nova.compute.nfv.hugepages
- system.nova.compute.nfv.cpu_pinning
- system.neutron.gateway.cluster
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
- system.ceilometer.agent.cluster
- cluster.baremetal-mcp-ocata-ovs-ha.infra
parameters:
@@ -26,6 +29,7 @@ parameters:
interface_mtu: 1500
keepalived_vip_interface: br-ctl
keepalived_vip_virtual_router_id: 69
+ loopback_device_size: 20
linux:
network:
bridge: openvswitch
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
index a5913dd52..1711ab0fe 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
@@ -10,7 +10,7 @@ classes:
- system.neutron.control.openvswitch.cluster
- system.nova.control.cluster
- system.cinder.control.cluster
-- system.cinder.volume.single
+- system.cinder.control.backend.lvm
- system.heat.server.cluster
- system.designate.server.cluster
- system.designate.server.backend.bind
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
-Subproject 4967aeda27a379d07f7a466dc2d6ace728ee63a
+Subproject 4b335b98fae73d59af0eb4bf81e33369d55a94c