Add Swarm cluster to mcp11-k8s-calico model
The change also fixes the network configuration of the infra node and
adds scripts to deploy Kubnernetes environments.
Change-Id: Ib8b3f01210be9180d9c8eaf8dfe885a4475fd82b
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
index 91332ff..2b295d1 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
@@ -16,10 +16,9 @@
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$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
- salt_master_host: ${_param:infra_config_address}
+ salt_master_host: ${_param:infra_config_deploy_address}
apt_mk_version: nightly
reclass:
storage:
@@ -30,7 +29,7 @@
classes:
- cluster.${_param:cluster_name}.kubernetes.compute
params:
- salt_master_host: ${_param:infra_config_address}
+ salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
single_address: ${_param:kubernetes_compute_node01_address}
kubernetes_compute_node02:
@@ -39,7 +38,7 @@
classes:
- cluster.${_param:cluster_name}.kubernetes.compute
params:
- salt_master_host: ${_param:infra_config_address}
+ salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
single_address: ${_param:kubernetes_compute_node02_address}
prx_node:
@@ -48,15 +47,33 @@
classes:
- cluster.${_param:cluster_name}.infra
params:
- salt_master_host: ${_param:infra_config_address}
+ salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
single_address: ${_param:kubernetes_proxy_node01_address}
- mon_node:
- name: ${_param:kubernetes_monitor_node01_hostname}
+ docker_swarm_node01:
+ name: ${_param:docker_swarm_node01_hostname}
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.infra
+ - cluster.${_param:cluster_name}.swarm.master
params:
- salt_master_host: ${_param:infra_config_address}
+ salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:kubernetes_monitor_node01_address}
+ single_address: ${_param:docker_swarm_node01_address}
+ docker_swarm_node02:
+ name: ${_param:docker_swarm_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.swarm.slave
+ params:
+ salt_master_host: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ single_address: ${_param:docker_swarm_node02_address}
+ docker_swarm_node03:
+ name: ${_param:docker_swarm_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.swarm.slave
+ params:
+ salt_master_host: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ single_address: ${_param:docker_swarm_node03_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
index 97511e8..39404c0 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
@@ -1,10 +1,12 @@
-
classes:
- system.linux.system.single
- system.openssh.server.team.lab
+- system.openssh.server.team.stacklight
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
+- system.rsyslog.client.single
- cluster.virtual-mcp11-k8s-calico.kubernetes
+- cluster.virtual-mcp11-k8s-calico.swarm
- cluster.overwrite
parameters:
_param:
@@ -15,7 +17,6 @@
cluster_domain: virtual-mcp11-k8s-calico.local
cluster_name: virtual-mcp11-k8s-calico
- #cluster_public_host: ""
linux:
network:
host:
@@ -24,11 +25,6 @@
names:
- ${_param:infra_config_hostname}
- ${_param:infra_config_hostname}.${_param:cluster_domain}
- cfg:
- address: ${_param:infra_config_address}
- names:
- - cfg
- - cfg.${_param:cluster_domain}
interface:
ens4:
enabled: true