diff options
Diffstat (limited to 'mcp/config')
| -rwxr-xr-x | mcp/config/states/maas | 6 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_ha | 4 | ||||
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas index 070045165..eea3e0ef6 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -19,13 +19,13 @@ function maas_fixup() { local ncount=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \ grep -cE '^\s{2}\w+:$') wait_for 180 "${statuscmd} | tee /dev/stderr | " \ - "grep -Eq '((Deployed|Ready): ${ncount}|status:Failed|status:Allocated)'" + "grep -Eq '((Deployed|Ready): ${ncount}|status: (Failed|Allocated))'" # shellcheck disable=SC2155 local statusout=$(eval "${statuscmd}") # shellcheck disable=SC2155 local fcnodes=$(echo "${statusout}" | \ - grep -Po '(?<=system_id:)(.*)(?=,status:Failed commissioning)') + grep -Pzo 'status: Failed commissioning\n\s+system_id: \K.+\n') for node_system_id in ${fcnodes}; do salt -C 'mas01*' state.apply maas.machines.delete \ pillar="{'system_id': '${node_system_id}'}" @@ -38,7 +38,7 @@ function maas_fixup() { # shellcheck disable=SC2155 local fdnodes=$(echo "${statusout}" | \ - grep -Po '(?<=system_id:)(.*)(?=,status:(Failed deployment|Allocated))') + grep -Pzo 'status: (Failed deployment|Allocated)\n\s+system_id: \K.+\n') for node_system_id in ${fdnodes}; do salt -C 'mas01*' state.apply maas.machines.mark_broken_fixed \ pillar="{'system_id': '${node_system_id}'}" diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 9237cc00b..e816a9dcc 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -70,3 +70,7 @@ clstr_vip_addr=$(salt -C 'I@nginx:server and *01*' --out=yaml \ salt -C 'I@nginx:server and *01*' cp.push \ "/etc/ssl/certs/${clstr_vip_addr}-with-chain.crt" upload_path='certs/os_cacert' cd /etc/ssl/certs && ln -sf /var/cache/salt/master/minions/prx01.*/files/certs/os_cacert + +# glance v1 api is required by orchestra tests +salt -I 'glance:server' ini.set_option /etc/glance/glance-api.conf '{DEFAULT: {enable_v1_api: True}}' +salt -I 'glance:server' service.restart glance-api diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 065086991..9ebf4bf69 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -13,6 +13,9 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" # KVM, compute node prereqs (libvirt first), VCP deployment +salt -C 'kvm* or cmp*' file.line \ + /usr/lib/python2.7/dist-packages/salt/modules/debian_ip.py \ + content='iface = iface.lower()' mode='delete' salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network salt -C 'cmp*' state.apply linux.system |