Update model
* Switch to latest submodules
* Migrate to aptly in docker
Change-Id: Ic6f68aa424b82617e8af3cb256e4aa735d4ca09f
diff --git a/classes/cluster/mcp-offline/infra/aptly.yml b/classes/cluster/mcp-offline/infra/aptly.yml
deleted file mode 100644
index 48cc30d..0000000
--- a/classes/cluster/mcp-offline/infra/aptly.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-classes:
-- system.linux.system.repo.aptly
-- system.linux.system.repo.docker_legacy
-- cluster.mcp-offline.infra
-- cluster.mcp-offline.infra.mirror
-parameters:
- linux:
- system:
- repo:
- debian_sid:
- source: "deb http://ftp.cz.debian.org/debian sid main"
- architectures: amd64
- key_id: 7638D0442B90D010
- key_server: keys.gnupg.net
- pin:
- - pin: 'origin "ftp.cz.debian.org"'
- priority: 100
- package: '*'
- - pin: 'origin "ftp.cz.debian.org"'
- priority: 500
- package: 'aptly-publisher'
diff --git a/classes/cluster/mcp-offline/infra/config.yml b/classes/cluster/mcp-offline/infra/config.yml
index f024bad..fe9219d 100644
--- a/classes/cluster/mcp-offline/infra/config.yml
+++ b/classes/cluster/mcp-offline/infra/config.yml
@@ -8,10 +8,13 @@
- system.salt.master.api
- system.reclass.storage.salt
- cluster.mcp-offline.infra
+- system.linux.system.repo.docker_legacy
+- cluster.mcp-offline.infra.mirror
+
parameters:
_param:
salt_master_base_environment: prd
- reclass_data_repository: "https://github.com/richardfelkl/mcp-offline-model.git"
+ reclass_data_repository: "https://github.com/Mirantis/mcp-offline-model.git"
reclass_data_revision: master
reclass_config_master: ${_param:infra_config_deploy_address}
single_address: ${_param:infra_config_address}
@@ -38,4 +41,4 @@
reclass:
storage:
data_source:
- engine: local
\ No newline at end of file
+ engine: local
diff --git a/classes/cluster/mcp-offline/infra/init.yml b/classes/cluster/mcp-offline/infra/init.yml
index f3c4f96..5f44e00 100644
--- a/classes/cluster/mcp-offline/infra/init.yml
+++ b/classes/cluster/mcp-offline/infra/init.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.single
+- system.linux.system.single.debian
- system.openssh.server.team.cicd
parameters:
_param:
@@ -13,6 +13,9 @@
linux_repo_refresh_db: true
infra_config_hostname: apt01
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
+ # for docker-swarm
+ cluster_node01_address: ${_param:aptly_server_address}
+ admin_email: root@localhost
# infra service addresses
infra_config_address: 10.4.0.15
infra_config_deploy_address: 10.1.0.15
diff --git a/classes/cluster/mcp-offline/infra/mirror b/classes/cluster/mcp-offline/infra/mirror
index 344c132..a789a30 160000
--- a/classes/cluster/mcp-offline/infra/mirror
+++ b/classes/cluster/mcp-offline/infra/mirror
@@ -1 +1 @@
-Subproject commit 344c132b26eaafd94e95e6735b01f59921426f33
+Subproject commit a789a302a2a20b6d1728d617275da6060905d7f0