diff options
| -rw-r--r-- | docs/release/scenarios/os-nosdn-ovs-ha/index.rst | 2 | ||||
| -rw-r--r-- | docs/release/scenarios/os-nosdn-ovs-noha/index.rst | 2 | ||||
| -rw-r--r-- | mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml | 4 | ||||
| -rwxr-xr-x | mcp/config/states/maas | 17 | ||||
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 6 | ||||
| -rw-r--r-- | mcp/patches/0011-service.horizon.server.cluster-Default-to-v2-API.patch | 33 | ||||
| -rw-r--r-- | mcp/patches/patches.list | 1 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml | 2 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 2 |
9 files changed, 61 insertions, 8 deletions
diff --git a/docs/release/scenarios/os-nosdn-ovs-ha/index.rst b/docs/release/scenarios/os-nosdn-ovs-ha/index.rst index e0fcc7e7a..af0105b81 100644 --- a/docs/release/scenarios/os-nosdn-ovs-ha/index.rst +++ b/docs/release/scenarios/os-nosdn-ovs-ha/index.rst @@ -1,4 +1,4 @@ -.. _os-nosdn-ovs-ha: +.. _os-nosdn-ovs-ha1: .. This work is licensed under a Creative Commons Attribution 4.0 International Licence. .. http://creativecommons.org/licenses/by/4.0 diff --git a/docs/release/scenarios/os-nosdn-ovs-noha/index.rst b/docs/release/scenarios/os-nosdn-ovs-noha/index.rst index de9b657fb..066abc938 100644 --- a/docs/release/scenarios/os-nosdn-ovs-noha/index.rst +++ b/docs/release/scenarios/os-nosdn-ovs-noha/index.rst @@ -1,4 +1,4 @@ -.. _os-nosdn-ovs-noha: +.. _os-nosdn-ovs-noha1: .. This work is licensed under a Creative Commons Attribution 4.0 International Licence. .. http://creativecommons.org/licenses/by/4.0 diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml index 79bd84323..a1a9e4175 100644 --- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml +++ b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml @@ -27,7 +27,7 @@ virtual: ram: 2048 cmp01: vcpus: 4 - ram: 6144 + ram: 8192 cmp02: vcpus: 4 - ram: 6144 + ram: 8192 diff --git a/mcp/config/states/maas b/mcp/config/states/maas index d6ef5a607..070045165 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -78,4 +78,19 @@ salt -C 'mas01*' pillar.item\ maas:region:admin:username \ maas:region:admin:password -salt -C '* and not cfg01* and not mas01*' saltutil.sync_all +# Check all baremetal nodes are available +rc=1 +attempt=0 +total_attempts=10 +while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do + bm_nodes=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \ + awk '/^\s+\w+[[:digit:]]+:$/ {gsub(/:$/, "*"); print $1}') + rc=0 + for node in $bm_nodes; do + salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; + done + sleep 5 + ((attempt+=1)) +done + +wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all" diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 909439134..25b036ba9 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -16,6 +16,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network salt -C 'cmp*' state.apply linux.system +salt -C 'cmp*' state.apply linux.network || true salt -C 'kvm* or cmp*' system.reboot wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ "tee /dev/stderr | grep -Fq 'Not connected'" @@ -34,12 +35,15 @@ vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:no # Check all vcp nodes are available rc=1 -while [ $rc -ne 0 ]; do +attempt=0 +total_attempts=10 +while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do rc=0 for node in $vcp_nodes; do salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; done sleep 5 + ((attempt+=1)) done wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all" diff --git a/mcp/patches/0011-service.horizon.server.cluster-Default-to-v2-API.patch b/mcp/patches/0011-service.horizon.server.cluster-Default-to-v2-API.patch new file mode 100644 index 000000000..2f2fb7c9c --- /dev/null +++ b/mcp/patches/0011-service.horizon.server.cluster-Default-to-v2-API.patch @@ -0,0 +1,33 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Thu, 19 Oct 2017 02:03:01 +0200 +Subject: [PATCH] service.horizon.server.cluster: Default to v2 API + +Horizon service definition hardcodes the API version to v3, and +also overrides the value in our reclass model during interpolation. +Adjust the default to '2'. + +Signed-off-by: Ting Wu <ting.wu@enea.com> +Signed-off-by: Junaid Ali <junaidali.yahya@gmail.com> +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + +diff --git a/service/horizon/server/cluster.yml b/service/horizon/server/cluster.yml +--- a/service/horizon/server/cluster.yml ++++ b/service/horizon/server/cluster.yml +@@ -6,7 +6,7 @@ + _param: + horizon_version: liberty + horizon_identity_host: localhost +- horizon_identity_version: 3 ++ horizon_identity_version: 2 + horizon_identity_encryption: none + horizon_identity_endpoint_type: internalURL + horizon: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index 744304d72..accdb6b09 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -14,3 +14,4 @@ /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch +/usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml index f260b28df..c27f73b05 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml @@ -12,7 +12,7 @@ parameters: _param: neutron_tenant_network_types: "flat,vlan" compute_hugepages_size: 2M - compute_hugepages_count: 1024 + compute_hugepages_count: 2048 compute_hugepages_mount: /mnt/hugepages_2M compute_dpdk_driver: uio compute_ovs_pmd_cpu_mask: "0x6" diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 0a2b6bbf8..fc6b101b9 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -47,7 +47,6 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END cp -r ${OPNFV_FUEL_DIR}/mcp/metadata/service /usr/share/salt-formulas/reclass cd /srv/salt/reclass/classes/service && \ ln -sf /usr/share/salt-formulas/reclass/service/opendaylight - cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass cd /srv/salt/scripts export DEBIAN_FRONTEND=noninteractive @@ -59,6 +58,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END cp -r ${OPNFV_FUEL_DIR}/mcp/salt-formulas/* /usr/share/salt-formulas/env cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list formulas + cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass salt-call state.apply salt salt '*' saltutil.sync_all |