Collapse dummy cluster classes
* bump submodule
Change-Id: Iba3bf22addea4de7d4e35277a20febb3d006cc51
diff --git a/classes/cluster/mcp-offline/infra/apt01_dummy.yml b/classes/cluster/mcp-offline/infra/apt01_dummy.yml
new file mode 100644
index 0000000..3b5dc72
--- /dev/null
+++ b/classes/cluster/mcp-offline/infra/apt01_dummy.yml
@@ -0,0 +1,103 @@
+classes:
+- system.defaults
+- system.linux.system.single.debian
+- system.linux.system.repo.mcp.apt_mirantis.salt-formulas
+- system.linux.system.repo.mcp.apt_mirantis.extra
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.docker
+- system.openssh.client.lab
+- system.salt.master.pkg
+- system.salt.minion.ca.salt_master
+- system.salt.master.api
+- system.reclass.storage.salt
+- cluster.mcp-offline.infra.mirror
+- cluster.mcp-offline.infra.mirror.docker-registry
+parameters:
+ _param:
+ # TODO: Uncomment next line "linux_system_user_sudo: true" during the deployment.
+ # Don't set it "false" before you configure sudo policies and enable power users.
+ # linux_system_user_sudo: true
+ #mcp_version: "2018.11.0"
+ mcp_version: "proposed"
+ aptly_server_hostname: apt
+ aptly_server_address: 127.0.0.1
+ 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: ${_param:aptly_server_address}
+ infra_config_deploy_address: ${_param:aptly_server_address}
+
+ cluster_domain: mcp-offline.local
+ cluster_name: mcp-offline
+
+ control_network_netmask: 255.255.255.0
+ tenant_network_netmask: 255.255.255.0
+
+ dns_server01: 8.8.8.8
+ dns_server02: 8.8.4.4
+ # Stub's
+ deploy_network_netmask: 255.255.0.0
+ deploy_network_gateway: 10.0.0.1
+ # Configuration of dummy apt01 salt-master, during generation
+ salt_master_base_environment: prd
+ reclass_data_repository: "https://github.com/Mirantis/reclass-system-salt-model"
+ reclass_data_revision: master
+ reclass_config_master: ${_param:infra_config_deploy_address}
+ single_address: ${_param:infra_config_address}
+ deploy_address: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ salt_api_password_hash: "$6$YJog182m$2/VdfO/XQWrVbkQvh3Q3jSp941xQZOROdk6iJb2TfXkoMEi/Uu10sRqky7V3wHf7AYzMoAnr3hQyMC0esNMIn0"
+ salt_master_host: ${_param:infra_config_deploy_address}
+ salt:
+ master:
+ command_timeout: 240
+ user:
+ deploy:
+ permissions: ${_param:salt_master_api_permissions}
+ minion:
+ master:
+ host: "localhost"
+ trusted_ca_minions:
+ - ${_param:salt_minion_ca_host}
+ linux:
+ network:
+ interface:
+ ens3:
+ enabled: true
+ type: eth
+ proto: dhcp
+ host:
+ hostname:
+ address: ${_param:single_address}
+ names:
+ - ${linux:network:hostname}
+ - ${linux:network:fqdn}
+ apt:
+ address: ${_param:aptly_server_address}
+ names:
+ - ${_param:aptly_server_hostname}
+ - ${_param:aptly_server_hostname}.${_param:cluster_domain}
+ system:
+ name: ${_param:infra_config_hostname}
+ domain: ${_param:cluster_domain}
+ purge_repos: True
+ service:
+ apt-daily.timer:
+ status: dead
+ enabled: false
+ user:
+ root:
+ password: false
+ package:
+ cloud-init:
+ version: latest
+ reclass:
+ version: latest
+ reclass:
+ storage:
+ data_source:
+ engine: local
diff --git a/classes/cluster/mcp-offline/infra/config.yml b/classes/cluster/mcp-offline/infra/config.yml
deleted file mode 100644
index 84fb98b..0000000
--- a/classes/cluster/mcp-offline/infra/config.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-classes:
-- system.linux.system.repo.mcp.apt_mirantis.salt-formulas
-- system.linux.system.repo.mcp.apt_mirantis.extra
-- system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo.mcp.apt_mirantis.docker
-- system.openssh.client.lab
-- system.salt.master.pkg
-- system.salt.minion.ca.salt_master
-- system.salt.master.api
-- system.reclass.storage.salt
-- cluster.mcp-offline.infra.mirror
-- cluster.mcp-offline.infra.mirror.docker-registry
-- cluster.mcp-offline.infra
-parameters:
- _param:
- salt_master_base_environment: prd
- 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}
- deploy_address: ${_param:infra_config_deploy_address}
- linux_system_codename: xenial
- salt_api_password_hash: "$6$YJog182m$2/VdfO/XQWrVbkQvh3Q3jSp941xQZOROdk6iJb2TfXkoMEi/Uu10sRqky7V3wHf7AYzMoAnr3hQyMC0esNMIn0"
- salt_master_host: ${_param:infra_config_deploy_address}
- linux:
- network:
- interface:
- ens3:
- enabled: true
- type: eth
- proto: dhcp
- salt:
- master:
- command_timeout: 600
- user:
- deploy:
- permissions: ${_param:salt_master_api_permissions}
- minion:
- master:
- host: "localhost"
- reclass:
- storage:
- data_source:
- engine: local
diff --git a/classes/cluster/mcp-offline/infra/init.yml b/classes/cluster/mcp-offline/infra/init.yml
deleted file mode 100644
index aa17067..0000000
--- a/classes/cluster/mcp-offline/infra/init.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-classes:
-- system.defaults
-- system.linux.system.single.debian
-parameters:
- _param:
- # TODO: Uncomment next line "linux_system_user_sudo: true" during the deployment.
- # Don't set it "false" before you configure sudo policies and enable power users.
- # linux_system_user_sudo: true
- #mcp_version: "2018.11.0"
- mcp_version: "proposed"
- aptly_server_hostname: apt
- aptly_server_address: 127.0.0.1
- 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: ${_param:aptly_server_address}
- infra_config_deploy_address: ${_param:aptly_server_address}
-
- cluster_domain: mcp-offline.local
- cluster_name: mcp-offline
-
- control_network_netmask: 255.255.255.0
- tenant_network_netmask: 255.255.255.0
-
- dns_server01: 8.8.8.8
- dns_server02: 8.8.4.4
- # Stub's
- deploy_network_netmask: 255.255.0.0
- deploy_network_gateway: 10.0.0.1
-
- salt:
- minion:
- trusted_ca_minions:
- - ${_param:salt_minion_ca_host}
- linux:
- network:
- host:
- hostname:
- address: ${_param:single_address}
- names:
- - ${linux:network:hostname}
- - ${linux:network:fqdn}
- apt:
- address: ${_param:aptly_server_address}
- names:
- - ${_param:aptly_server_hostname}
- - ${_param:aptly_server_hostname}.${_param:cluster_domain}
- system:
- name: ${_param:infra_config_hostname}
- domain: ${_param:cluster_domain}
- purge_repos: True
- service:
- apt-daily.timer:
- status: dead
- enabled: false
- user:
- root:
- password: false
- package:
- cloud-init:
- version: latest
- reclass:
- version: latest
diff --git a/classes/cluster/mcp-offline/infra/mirror b/classes/cluster/mcp-offline/infra/mirror
index 5d754a0..a7b2b05 160000
--- a/classes/cluster/mcp-offline/infra/mirror
+++ b/classes/cluster/mcp-offline/infra/mirror
@@ -1 +1 @@
-Subproject commit 5d754a0ecec87a5ab22584ce8426b914912148f0
+Subproject commit a7b2b0503eea0ce7baf154808d795575d3886ed8