Merge "[maas] Adopt maas.machines.storage" into stable/fraser

diff --git a/mcp/config/scenario/defaults.yaml b/mcp/config/scenario/defaults.yaml
index 110ffc7..6affc7d 100644 (file)
--- 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/openstack_ha b/mcp/config/states/openstack_ha
index 77063d6..576a47e 100755 (executable)
--- 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 4c8cbcf..0fffd7a 100755 (executable)
--- 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

diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2
similarity index 71%
rename from mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml
rename to mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2
index 6662f1f..153b493 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/infra/maas.yml.j2
@@ -5,10 +5,18 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+{%- set cluster_arch = [] %}
+{%- for node in conf.nodes %}
+  {%- if node.node.arch not in cluster_arch %}
+    {%- do cluster_arch.append(node.node.arch) %}
+  {%- endif %}
+{%- endfor %}
 ---
 classes:
   - cluster.mcp-pike-common-ha.infra.maas
   - cluster.mcp-pike-odl-ha.infra
+{%- if 'aarch64' not in cluster_arch %}
 parameters:
   _param:
     hwe_kernel: 'ga-16.04'
+{%- endif %}