commit 0046bbecb74fb9fd4e6d26ae00ac99a7317892e8
author Richard Felkl <rfelkl@mirantis.com> Wed Jun 06 12:48:25 2018 +0000
committer Gerrit Code Review <gerrit2@99e8dbefe3b7> Wed Jun 06 12:48:25 2018 +0000
tree 42c3664d9313e928ca27468b18fd74c0472b773e
parent e65e5128af1e9d59f0dd4b8dcff4c4c5b9a39bf6
parent 80f9da7b62c1164a9c206b8f3f7807f6bdd8a0f8

Merge "Refactor mirror state"

README.rst

diff --git a/README.rst b/README.rst
index d08ec42..0903a6e 100644
--- a/README.rst
+++ b/README.rst
@@ -225,6 +225,7 @@
 
 
 .. code-block:: yaml
+
   maas:
     region:
       machines:
@@ -405,7 +406,7 @@
 
 
 
-Setup image mirror
+Setup image mirror (Maas boot resources,)
 
 .. code-block:: yaml
 
@@ -413,16 +414,23 @@
     mirror:
       enabled: true
       image:
-        release:
+        sections:
+          bootloaders:
+            keyring: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
+            upstream: http://images.maas.io/ephemeral-v3/daily/
+            local_dir: /var/www/html/maas/images/ephemeral-v3/daily
+            count: 1
+            # i386 need for pxe
+            filters: ['arch~(i386|amd64)', 'os~(grub*|pxelinux)']
           xenial:
-          keyring: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
-          upstream: http://images.maas.io/ephemeral-v3/daily/
-          local_dir: /var/www/html/maas/images/ephemeral-v3/daily
-          arch: amd64
-          subarch: 'generic|hwe-t'
+            keyring: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
+            upstream: http://images.maas.io/ephemeral-v3/daily/
+            local_dir: /var/www/html/maas/images/ephemeral-v3/daily
+            count: 1
+            filters: ['release~(xenial)', 'arch~(amd64)', 'subarch~(generic|hwe-16.04$|ga-16.04)']
           count: 1
 
-Usage of local repos
+Usage of local deb repos
 
 .. code-block:: yaml
 
@@ -464,6 +472,7 @@
 MAAS region service with backup data
 
 .. code-block:: yaml
+
     maas:
       region:
         database:

maas/mirror.sls

diff --git a/maas/mirror.sls b/maas/mirror.sls
index f7c586d..0772e1c 100644
--- a/maas/mirror.sls
+++ b/maas/mirror.sls
@@ -8,11 +8,20 @@
   pkg.installed:
     - names: {{ mirror.pkgs }}
 
-{%- for release_name, release in mirror.image.release.iteritems() %}
+{%- for section_name, section in mirror.image.sections.iteritems() %}
 
-mirror_image_{{ release_name }}:
+mirror_image_{{ section_name }}:
   cmd.run:
-  - name: "sstream-mirror --keyring={{ release.keyring }} {{ release.upstream }} {{ release.local_dir }} {%- if release.get('arch') %} 'arch={{ release.arch }}'{%- endif %} {%- if release.get('subarch') %} 'subarch~({{ release.subarch }})'{%- endif %} 'release~({{ release_name }})' {%- if release.get('count') %} --max={{ release.count }}{%- endif %}"
+  - name: "sstream-mirror --keyring={{ section.keyring }} {{ section.upstream }} {{ section.local_dir }}
+    {%- if section.get('arch') %}
+      'arch={{ section.arch }}'
+    {%- endif %}
+    {%- if section.get('filters') %}
+     {% for item in section.filters %} '{{ item }}' {%- endfor %}
+    {%- endif %}
+    {%- if section.get('count') %}
+      --max={{ section.count }}
+    {%- endif %}"
   - require:
     - pkg: maas_mirror_packages
 
@@ -21,3 +30,4 @@
 {%- endif %}
 
 {%- endif %}
+

tests/pillar/maas_mirror.sls

diff --git a/tests/pillar/maas_mirror.sls b/tests/pillar/maas_mirror.sls
index 090c794..dbdcc25 100644
--- a/tests/pillar/maas_mirror.sls
+++ b/tests/pillar/maas_mirror.sls
@@ -2,11 +2,11 @@
   mirror:
     enabled: true
     image:
-      release:
-        xenial:
-          keyring: '/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg'
-          upstream: 'http://images.maas.io/ephemeral-v3/daily/'
-          local_dir: '/var/www/html/maas/images/ephemeral-v3/daily'
-          arch: amd64
-          subarch: 'generic|hwe-t'
-          count: '1'
+      sections:
+        bootloaders:
+          keyring: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
+          upstream: http://images.maas.io/ephemeral-v3/daily/
+          local_dir: /var/www/html/maas/images/ephemeral-v3/daily
+          count: 1
+          # i386 need for pxe
+          filters: ['arch~(i386|amd64)', 'os~(grub*|pxelinux)']

tests/pillar/maas_storage.sls

diff --git a/tests/pillar/disk_layout.sls b/tests/pillar/maas_storage.sls
similarity index 100%
rename from tests/pillar/disk_layout.sls
rename to tests/pillar/maas_storage.sls