summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
Diffstat (limited to 'mcp')
-rw-r--r--mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml5
-rw-r--r--mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml5
-rw-r--r--mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml5
-rwxr-xr-xmcp/config/states/maas5
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml4
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml5
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml4
-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-ha/infra/kvm.yml4
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml5
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml5
-rwxr-xr-xmcp/scripts/salt.sh2
12 files changed, 44 insertions, 9 deletions
diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
index 780edbd81..ad1b8a7ab 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
@@ -8,6 +8,9 @@ virtual:
nodes:
- cfg01
- mas01
+ cfg01:
+ vcpus: 4
+ ram: 6144
mas01:
vcpus: 4
- ram: 16384
+ ram: 6144
diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
index 6e55038fc..c5820be09 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
@@ -9,6 +9,9 @@ virtual:
nodes:
- cfg01
- mas01
+ cfg01:
+ vcpus: 4
+ ram: 6144
mas01:
vcpus: 4
- ram: 16384
+ ram: 6144
diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
index 2d5339068..20d9107ca 100644
--- a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
@@ -9,6 +9,9 @@ virtual:
nodes:
- cfg01
- mas01
+ cfg01:
+ vcpus: 4
+ ram: 6144
mas01:
vcpus: 4
- ram: 16384
+ ram: 6144
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 0d733bafa..e1ffa8733 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -28,6 +28,7 @@ function maas_fixup() {
for node_system_id in ${fcnodes}; do
salt -C 'mas01*' state.apply maas.machines.delete \
pillar="{'system_id': '${node_system_id}'}"
+ sleep 30
done
if [ -n "${fcnodes}" ]; then
salt -C 'mas01*' state.apply maas.machines
@@ -40,6 +41,7 @@ function maas_fixup() {
for node_system_id in ${fdnodes}; do
salt -C 'mas01*' state.apply maas.machines.mark_broken_fixed \
pillar="{'system_id': '${node_system_id}'}"
+ sleep 30
done
if [ -n "${fdnodes}" ]; then
salt -C 'mas01*' state.apply maas.machines.deploy
@@ -111,3 +113,6 @@ wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp |
wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
$(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")"
+
+# Get the latest packages
+salt '*' pkg.upgrade refresh=False
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 acd6a6d34..e55bcbf25 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
@@ -32,12 +32,12 @@ parameters:
##Default production sizing
openstack.control:
cpu: 4
- ram: 10240
+ ram: 12288
disk_profile: small
net_profile: default
openstack.database:
cpu: 4
- ram: 8192
+ ram: 6144
disk_profile: large
net_profile: default
openstack.message_queue:
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 c5333fe76..d2495c26a 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
@@ -58,6 +58,11 @@ parameters:
group: nova
opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
linux:
+ system:
+ kernel:
+ sysctl:
+ vm.dirty_ratio: 10
+ vm.dirty_background_ratio: 5
network:
bridge: openvswitch
interface:
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 d77aeff7a..266f2ba65 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
@@ -32,12 +32,12 @@ parameters:
##Default production sizing
openstack.control:
cpu: 4
- ram: 10240
+ ram: 12288
disk_profile: small
net_profile: default
openstack.database:
cpu: 4
- ram: 8192
+ ram: 6144
disk_profile: large
net_profile: default
openstack.message_queue:
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 8c83c4a00..126751c4b 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
@@ -51,6 +51,10 @@ parameters:
opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
linux:
system:
+ kernel:
+ sysctl:
+ vm.dirty_ratio: 10
+ vm.dirty_background_ratio: 5
repo:
uca:
source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
index 5064cff7b..a8deb5de0 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
@@ -32,12 +32,12 @@ parameters:
##Default production sizing
openstack.control:
cpu: 4
- ram: 10240
+ ram: 12288
disk_profile: small
net_profile: default
openstack.database:
cpu: 4
- ram: 8192
+ ram: 6144
disk_profile: large
net_profile: default
openstack.message_queue:
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 a48d924e0..fca40654a 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
@@ -41,6 +41,11 @@ parameters:
group: nova
opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
linux:
+ system:
+ kernel:
+ sysctl:
+ vm.dirty_ratio: 10
+ vm.dirty_background_ratio: 5
network:
bridge: openvswitch
interface:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
index 978f468e6..99f517f8a 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
@@ -53,6 +53,11 @@ parameters:
fstype: nfs
device: ${_param:openstack_control_address}:/srv/nova/instances
linux:
+ system:
+ kernel:
+ sysctl:
+ vm.dirty_ratio: 10
+ vm.dirty_background_ratio: 5
network:
bridge: openvswitch
interface:
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index c6d8e73a7..f184bcde6 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -62,4 +62,6 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s << SALT_INSTALL_END
salt -C '* and not cfg01*' state.sls linux
salt '*' state.sls ntp
+
+ salt '*' pkg.upgrade refresh=False
SALT_INSTALL_END