Deploy StackLight v2 in mcp11-k8s-contrail
Change-Id: Iccc5f90533b3d1f52081619be72fe6ff863e641b
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
index 4de736d..29cc1c5 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
@@ -1,5 +1,4 @@
classes:
-- system.linux.system.repo.mcp.salt
- system.linux.system.repo.ubuntu
- system.openssh.client.lab
- system.salt.master.pkg
@@ -17,11 +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}
- apt_mk_version: nightly
+ salt_master_host: ${_param:infra_config_deploy_address}
reclass:
storage:
node:
@@ -31,7 +28,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:
@@ -40,27 +37,52 @@
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:
name: ${_param:kubernetes_proxy_node01_hostname}
domain: ${_param:cluster_domain}
classes:
- - cluster.${_param:cluster_name}.infra
+ - cluster.${_param:cluster_name}.monitoring.proxy
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
+ - cluster.${_param:cluster_name}.monitoring.client
+ - cluster.${_param:cluster_name}.monitoring.server
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}
+ keepalived_vip_priority: 100
+ docker_swarm_node02:
+ name: ${_param:docker_swarm_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.swarm.slave
+ - cluster.${_param:cluster_name}.monitoring.server
+ params:
+ salt_master_host: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ single_address: ${_param:docker_swarm_node02_address}
+ keepalived_vip_priority: 101
+ docker_swarm_node03:
+ name: ${_param:docker_swarm_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.swarm.slave
+ - cluster.${_param:cluster_name}.monitoring.server
+ params:
+ salt_master_host: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ single_address: ${_param:docker_swarm_node03_address}
+ keepalived_vip_priority: 102
opencontrail_control_node01:
params:
rabbitmq_cluster_role: master
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
index 580f728..f81e996 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -1,24 +1,31 @@
classes:
- system.linux.system.single
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.ubuntu
- 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
+- system.telegraf.agent
- cluster.virtual-mcp11-k8s-contrail.kubernetes
- cluster.virtual-mcp11-k8s-contrail.opencontrail
+- cluster.virtual-mcp11-k8s-calico.monitoring
+- cluster.virtual-mcp11-k8s-calico.swarm
- cluster.overwrite
parameters:
_param:
# infra service addresses
infra_config_hostname: cfg01
- infra_config_address: 192.168.10.100
+ infra_config_address: 172.16.10.100
infra_config_deploy_address: 192.168.10.100
cluster_domain: virtual-mcp11-k8s-contrail.local
cluster_name: virtual-mcp11-k8s-contrail
- cluster_public_host:
-
+ apt_mk_version: nightly
linux:
network:
host:
@@ -27,11 +34,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
@@ -42,3 +44,17 @@
system:
name: ${_param:infra_config_hostname}
domain: ${_param:cluster_domain}
+ telegraf:
+ agent:
+ enabled: true
+ interval: 15
+ round_interval: false
+ metric_batch_size: 1000
+ metric_buffer_limit: 10000
+ collection_jitter: 2
+ output:
+ prometheus_client:
+ bind:
+ address: 0.0.0.0
+ port: 9126
+ engine: prometheus