diff options
| -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 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml | 9 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 | 9 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml | 4 | ||||
| m--------- | mcp/scripts/pharos | 0 |
7 files changed, 31 insertions, 4 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 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml index 757295a04..d098fa6df 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml @@ -78,7 +78,7 @@ parameters: cpu: 2 ram: 2048 disk_profile: small - net_profile: default + net_profile: default_ext cluster: internal: node: @@ -120,6 +120,13 @@ parameters: eth0: bridge: br-ctl model: virtio + default_ext: + eth1: + bridge: br-mgmt + model: virtio + eth0: + bridge: br-ex + model: virtio glusterfs: server: volumes: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 index 08abc36f2..d14f90582 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm_init.yml.j2 @@ -88,3 +88,12 @@ parameters: netmask: 255.255.255.0 use_interfaces: - {{ nic_mgmt }}{% if vlan_mgmt and vlan_mgmt != 'native' %}.{{ vlan_mgmt }}{% endif %} + br-ex: + enabled: true + proto: manual + address: 0.0.0.0 + netmask: 255.255.255.0 + type: bridge + use_interfaces: + - {{ nic_public }}{% if vlan_public and vlan_public != 'native' %}.{{ vlan_public }}{% endif %} + noifupdown: true diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml index 66111841e..2288e687f 100644 --- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml +++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml @@ -102,6 +102,10 @@ parameters: novncproxy_port: 6080 vncproxy_url: http://${_param:cluster_vip_address}:6080 workers: 1 + horizon: + server: + # yamllint disable-line rule:truthy + secure: False heat: server: bind: diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos -Subproject 2c4fac2e41aaca9dd679b200ffc968eeb448b39 +Subproject af9e2a904ad7f1e44ba26cf9cebbc8bb3f7d884 |