diff options
Diffstat (limited to 'mcp/config')
-rw-r--r-- | mcp/config/scenario/defaults.yaml | 3 | ||||
-rwxr-xr-x | mcp/config/states/maas | 11 | ||||
-rwxr-xr-x | mcp/config/states/openstack_ha | 12 | ||||
-rwxr-xr-x | mcp/config/states/openstack_noha | 10 |
4 files changed, 2 insertions, 34 deletions
diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml index 110ffc704..6affc7da6 100644 --- a/mcp/config/scenario/defaults.yaml +++ b/mcp/config/scenario/defaults.yaml @@ -43,8 +43,7 @@ aarch64: - armband 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/pike/xenial pike-armband main pkg: install: - - linux-image-generic-hwe-16.04-edge - - linux-headers-generic-hwe-16.04-edge + - linux-generic-hwe-16.04 - python-futures - salt-minion control: diff --git a/mcp/config/states/maas b/mcp/config/states/maas index 10cfd01bf..ec2458234 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -57,16 +57,7 @@ function maas_fixup() { sleep 10 done if [ -n "${fdnodes}" ] || [ -n "${rnodes}" ]; then - for node_system_id in ${fdnodes} ${rnodes}; do - # For now, we allocate 30GB (fixed) for / on cmp nodes - local node_hostname=$(echo "${statusout}" | \ - grep -Pzo 'hostname: \K.+(?=\n.+\n\s+system_id: '"${node_system_id}"')') - if [[ "${node_hostname}" =~ ^cmp ]]; then - salt -C 'mas01*' state.apply maas.machines.set_storage_layout \ - pillar="{'system_id': '${node_system_id}', 'lv_size': '32212254720'}" - sleep 10 - fi - done + salt -C 'mas01*' state.apply maas.machines.storage salt -C 'mas01*' state.apply maas.machines.deploy return 1 fi diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 77063d6c8..576a47e13 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -65,18 +65,6 @@ salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon salt -I 'nginx:server' state.sls nginx -# workaround for Ubuntu Pike Horizon missing css, FUEL-324 -if ! salt -C 'I@horizon:server and *01*' --out=yaml pkg.version openstack-dashboard | grep -qE ':.*mcp'; then - salt -I 'horizon:server' file.symlink \ - /var/lib/openstack-dashboard/static \ - /usr/share/openstack-dashboard/static - salt -I 'horizon:server' cmd.run "/usr/share/openstack-dashboard/manage.py collectstatic --noinput" - salt -I 'horizon:server' cmd.run "/usr/share/openstack-dashboard/manage.py compress --force" - salt -I 'horizon:server' file.append /etc/openstack-dashboard/local_settings.py \ - "AVAILABLE_THEMES = [ ('default', 'Default', 'themes/default'),]" - salt -I 'horizon:server' service.reload apache2 -fi - cluster_public_host=$(salt -C 'I@nginx:server and *01*' --out=yaml \ pillar.get _param:cluster_public_host | awk '{print $2; exit}') dashboard_host=$(salt -C 'I@nginx:server and *01*' --out=yaml cp.push \ diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha index 4c8cbcf8a..0fffd7a55 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -52,13 +52,3 @@ salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon - -# workaround for the pike horizon is missing css, FUEL-324 -salt -I 'horizon:server' file.symlink \ - /var/lib/openstack-dashboard/static \ - /usr/share/openstack-dashboard/static -salt -I 'horizon:server' cmd.run "/usr/share/openstack-dashboard/manage.py collectstatic --noinput" -salt -I 'horizon:server' cmd.run "/usr/share/openstack-dashboard/manage.py compress --force" -salt -I 'horizon:server' file.append /etc/openstack-dashboard/local_settings.py \ - "AVAILABLE_THEMES = [ ('default', 'Default', 'themes/default'),]" -salt -I 'horizon:server' service.reload apache2 |