removed hardcoded non-local repo classes
Change-Id: I2aeb52c695d09d2b5ec839bd5948cc47f0b6d426
diff --git a/.releasenotes/notes/remove-repo-includes-from-system-d4af8a0ac985d4e5.yaml b/.releasenotes/notes/remove-repo-includes-from-system-d4af8a0ac985d4e5.yaml
new file mode 100644
index 0000000..8ab3536
--- /dev/null
+++ b/.releasenotes/notes/remove-repo-includes-from-system-d4af8a0ac985d4e5.yaml
@@ -0,0 +1,19 @@
+---
+summary: >
+ Removed included classes for linux.system.repo from the system level reclass
+ model because they were breaking installation from local repos.
+features:
+ - |
+ Added linux.system.repo definition for MAAS.
+deprecations:
+ - |
+ Removed:
+ - system.linux.system.repo.mcp.salt from salt/master/pkg.yml
+ - system.linux.system.repo.docker from docker/host.yml
+ - service.maas.region.vendor_repo from maas/region/single.yml
+
+ These repos should be added to appropriate cluster level classes. New cluster
+ models from Cookiecutter have them already included.
+fixes:
+ - |
+ MCP deployments can now be installed from local repositories without problems.
\ No newline at end of file
diff --git a/docker/host.yml b/docker/host.yml
index 853a5d2..7e5fb8c 100644
--- a/docker/host.yml
+++ b/docker/host.yml
@@ -1,6 +1,5 @@
classes:
- service.docker.host
- - system.linux.system.repo.docker
parameters:
docker:
host:
diff --git a/linux/system/repo/maas.yml b/linux/system/repo/maas.yml
new file mode 100644
index 0000000..d36784e
--- /dev/null
+++ b/linux/system/repo/maas.yml
@@ -0,0 +1,7 @@
+parameters:
+ linux:
+ system:
+ repo:
+ maas:
+ source: deb http://ppa.launchpad.net/maas/stable/ubuntu xenial main
+ key_url: salt://maas/files/vendor_key.gpg
\ No newline at end of file
diff --git a/maas/region/single.yml b/maas/region/single.yml
index 2bf9469..20779aa 100644
--- a/maas/region/single.yml
+++ b/maas/region/single.yml
@@ -1,7 +1,6 @@
classes:
- service.maas.region.single
- service.maas.cluster.single
- - service.maas.region.vendor_repo
parameters:
_param:
maas_admin_username: mirantis
diff --git a/salt/master/pkg.yml b/salt/master/pkg.yml
index dba30d0..ac839f8 100644
--- a/salt/master/pkg.yml
+++ b/salt/master/pkg.yml
@@ -9,5 +9,4 @@
- system.salt.master.formula.pkg.stacklight
- system.salt.master.formula.pkg.monitoring
- system.salt.master.formula.pkg.helm
-- system.salt.master.formula.pkg.ceph
-- system.linux.system.repo.mcp.salt
+- system.salt.master.formula.pkg.ceph
\ No newline at end of file