Refactor mirror state
* Unlock possibility to use full-logic filtering
Partial-Bug: PROD-16412 (PROD:PROD-16412)
Change-Id: If0e5ae5c01123a2de69c675038dc679609cfd14a
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)']
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