rename cluster levels to non-underscore names
Change-Id: Ic9bdafbeb1333699ce424612f8b2e8d8dafb7be2
diff --git a/classes/cluster/sl-k8s-contrail/infra/config.yml b/classes/cluster/sl-k8s-contrail/infra/config.yml
new file mode 100644
index 0000000..c287f17
--- /dev/null
+++ b/classes/cluster/sl-k8s-contrail/infra/config.yml
@@ -0,0 +1,162 @@
+classes:
+- system.docker.client
+- system.docker.host
+- system.linux.system.repo.ubuntu
+- system.openssh.client.lab
+- system.salt.master.pkg
+- system.salt.minion.ca.salt_master
+- system.salt.master.api
+- system.reclass.storage.salt
+- system.salt.minion.cert.k8s_server
+- system.reclass.storage.system.kubernetes_control_cluster
+- system.reclass.storage.system.opencontrail_control_cluster
+- cluster.sl-k8s-contrail
+parameters:
+ _param:
+ salt_master_base_environment: prd
+ reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
+ reclass_data_revision: master
+ reclass_config_master: ${_param:infra_config_deploy_address}
+ single_address: ${_param:infra_config_address}
+ linux_system_codename: xenial
+ salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
+ salt_master_host: ${_param:infra_config_deploy_address}
+ salt:
+ master:
+ reactor:
+ reclass/minion/classify:
+ - salt://reclass/reactor/node_register.sls
+ reclass:
+ storage:
+ class_mapping:
+ common_node:
+ expression: all
+ node_param:
+ single_address:
+ value_template: <<node_control_ip>>
+ linux_system_codename:
+ value_template: <<node_os>>
+ salt_master_host:
+ value_template: <<node_master_ip>>
+ infra_config:
+ expression: <<node_hostname>>__startswith__cfg
+ cluster_param:
+ infra_config_address:
+ value_template: <<node_control_ip>>
+ infra_config_deploy_address:
+ value_template: <<node_deploy_ip>>
+ cluster_domain:
+ value_template: <<node_domain>>
+ kubernetes_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ kubernetes_control_node01_address:
+ value_template: <<node_control_ip>>
+ kubernetes_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ kubernetes_control_node02_address:
+ value_template: <<node_control_ip>>
+ kubernetes_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ kubernetes_control_node03_address:
+ value_template: <<node_control_ip>>
+ opencontrail_control01:
+ expression: <<node_hostname>>__equals__ntw01
+ cluster_param:
+ opencontrail_control_node01_address:
+ value_template: <<node_control_ip>>
+ opencontrail_control02:
+ expression: <<node_hostname>>__equals__ntw02
+ cluster_param:
+ opencontrail_control_node02_address:
+ value_template: <<node_control_ip>>
+ opencontrail_control03:
+ expression: <<node_hostname>>__equals__ntw03
+ cluster_param:
+ opencontrail_control_node03_address:
+ value_template: <<node_ip>
+ kubernetes_proxy:
+ expression: <<node_hostname>>__equals__prx01
+ cluster_param:
+ kubernetes_proxy_node01_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node01:
+ expression: <<node_hostname>>__equals__mon01
+ cluster_param:
+ stacklight_monitor_node01_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node02:
+ expression: <<node_hostname>>__equals__mon02
+ cluster_param:
+ stacklight_monitor_node02_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node03:
+ expression: <<node_hostname>>__equals__mon03
+ cluster_param:
+ stacklight_monitor_node03_address:
+ value_template: <<node_control_ip>>
+ kubernetes_compute:
+ expression: <<node_hostname>>__startswith__cmp
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.kubernetes.compute
+ prx_node:
+ name: ${_param:kubernetes_proxy_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.stacklight.proxy
+ params:
+ salt_master_host: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ single_address: ${_param:kubernetes_proxy_node01_address}
+ stacklight_monitor_node01:
+ name: ${_param:stacklight_monitor_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - service.galera.master.cluster
+ - system.docker.swarm.master
+ - cluster.${_param:cluster_name}.stacklight.client
+ - cluster.${_param:cluster_name}.stacklight.server
+ params:
+ salt_master_host: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ single_address: ${_param:stacklight_monitor_node01_address}
+ keepalived_vip_priority: 100
+ mysql_cluster_role: master
+ stacklight_monitor_node02:
+ name: ${_param:stacklight_monitor_node02_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - service.galera.slave.cluster
+ - system.docker.swarm.manager
+ - cluster.${_param:cluster_name}.stacklight.server
+ params:
+ salt_master_host: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ single_address: ${_param:stacklight_monitor_node02_address}
+ keepalived_vip_priority: 101
+ mysql_cluster_role: slave
+ stacklight_monitor_node03:
+ name: ${_param:stacklight_monitor_node03_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - service.galera.slave.cluster
+ - system.docker.swarm.manager
+ - cluster.${_param:cluster_name}.stacklight.server
+ params:
+ salt_master_host: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ single_address: ${_param:stacklight_monitor_node03_address}
+ keepalived_vip_priority: 102
+ mysql_cluster_role: slave
+ opencontrail_control_node01:
+ params:
+ rabbitmq_cluster_role: master
+ opencontrail_control_node02:
+ params:
+ rabbitmq_cluster_role: slave
+ opencontrail_control_node03:
+ params:
+ rabbitmq_cluster_role: slave
diff --git a/classes/cluster/sl-k8s-contrail/infra/init.yml b/classes/cluster/sl-k8s-contrail/infra/init.yml
new file mode 100644
index 0000000..cb7e820
--- /dev/null
+++ b/classes/cluster/sl-k8s-contrail/infra/init.yml
@@ -0,0 +1,47 @@
+classes:
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.ubuntu
+- system.rsyslog.client.single
+parameters:
+ _param:
+ # infra service addresses
+ infra_config_hostname: cfg01
+ infra_config_address: 172.16.10.100
+ infra_config_deploy_address: 192.168.10.100
+
+ cluster_domain: sl-k8s-contrail.local
+ cluster_name: sl_k8s_contrail
+ apt_mk_version: nightly
+ linux:
+ network:
+ host:
+ cfg01:
+ address: ${_param:infra_config_address}
+ names:
+ - ${_param:infra_config_hostname}
+ - ${_param:infra_config_hostname}.${_param:cluster_domain}
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ 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