rename cluster levels to non-underscore names
Change-Id: Ic9bdafbeb1333699ce424612f8b2e8d8dafb7be2
diff --git a/classes/cluster/k8s-ha-contrail/MAINTAINERS b/classes/cluster/k8s-ha-contrail/MAINTAINERS
new file mode 100644
index 0000000..3c56b7b
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail/MAINTAINERS
@@ -0,0 +1 @@
+Tomáš Kukrál <tkukral@mirantis.com
diff --git a/classes/cluster/k8s-ha-contrail/infra/config.yml b/classes/cluster/k8s-ha-contrail/infra/config.yml
new file mode 100644
index 0000000..1b9e70d
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail/infra/config.yml
@@ -0,0 +1,125 @@
+classes:
+- 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.k8s-ha-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}
+ 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_deploy_address}
+ salt:
+ master:
+ reactor:
+ reclass/minion/classify:
+ - salt://reclass/reactor/node_register.sls
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ 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>>
+ deploy_address:
+ value_template: <<node_deploy_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_control_node01_deploy_address:
+ value_template: <<node_deploy_ip>>
+ kubernetes_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ kubernetes_control_node02_address:
+ value_template: <<node_control_ip>>
+ kubernetes_control_node02_deploy_address:
+ value_template: <<node_deploy_ip>>
+ kubernetes_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ kubernetes_control_node03_address:
+ value_template: <<node_control_ip>>
+ kubernetes_control_node03_deploy_address:
+ value_template: <<node_deploy_ip>>
+ etcd_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ etcd_control_node01_address:
+ value_template: <<node_deploy_ip>>
+ etcd_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ etcd_control_node02_address:
+ value_template: <<node_deploy_ip>>
+ etcd_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ etcd_control_node03_address:
+ value_template: <<node_deploy_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_control_ip>>
+ kubernetes_compute:
+ expression: <<node_hostname>>__startswith__cmp
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.kubernetes.compute
+ node:
+ 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/k8s-ha-contrail/infra/init.yml b/classes/cluster/k8s-ha-contrail/infra/init.yml
new file mode 100644
index 0000000..fad2edc
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail/infra/init.yml
@@ -0,0 +1,30 @@
+classes:
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.ubuntu
+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: k8s-ha-contrail.local
+ cluster_name: k8s_ha_contrail
+ apt_mk_version: nightly
+ linux:
+ network:
+ host:
+ self:
+ address: ${_param:single_address}
+ names:
+ - ${linux:system:name}
+ - ${linux:system:name}.${linux:system:domain}
+ cfg01:
+ address: ${_param:infra_config_address}
+ names:
+ - ${_param:infra_config_hostname}
+ - ${_param:infra_config_hostname}.${_param:cluster_domain}
+ system:
+ name: ${_param:infra_config_hostname}
+ domain: ${_param:cluster_domain}
diff --git a/classes/cluster/k8s-ha-contrail/init.yml b/classes/cluster/k8s-ha-contrail/init.yml
new file mode 100644
index 0000000..d36ddde
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail/init.yml
@@ -0,0 +1,10 @@
+classes:
+- system.linux.system.single
+- cluster.k8s-ha-contrail.kubernetes
+- cluster.k8s-ha-contrail.opencontrail
+- cluster.k8s-ha-contrail.infra
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- system.openssh.server.team.k8s_team
+- cluster.overrides
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
new file mode 100644
index 0000000..1006f1b
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -0,0 +1,54 @@
+classes:
+- system.linux.system.repo.docker
+- system.kubernetes.pool.cluster
+- system.linux.network.hosts
+- system.salt.minion.cert.k8s_client
+- system.salt.minion.cert.etcd_client
+- cluster.k8s-ha-contrail.opencontrail.compute
+- cluster.k8s-ha-contrail
+parameters:
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: manual
+ ipflush_onchange: true
+ vhost0:
+ enabled: true
+ type: eth
+ mtu: 1500
+ address: ${_param:single_address}
+ netmask: '255.255.255.0'
+ pre_up_cmds:
+ - /usr/lib/contrail/if-vhost0
+ use_interfaces:
+ - ens4
+ docker:
+ host:
+ pkgs:
+ - docker-engine=1.12.6-0~ubuntu-xenial
+ - python-docker
+ options:
+ bip: 172.31.255.1/24
+ kubernetes:
+ pool:
+ network:
+ engine: opencontrail
+ config:
+ api:
+ host: ${_param:opencontrail_control_address}
+ etcd:
+ ssl:
+ enabled: true
+ image: ${_param:kubernetes_calico_image}
+ calicoctl:
+ image: ${_param:kubernetes_calicoctl_image}
+ cni:
+ image: ${_param:kubernetes_calico_cni_image}
+ contrail_cni:
+ image: ${_param:kubernetes_opencontrail_cni_image}
+ common:
+ hyperkube:
+ image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
new file mode 100644
index 0000000..4776b3b
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -0,0 +1,52 @@
+classes:
+- service.etcd.server.cluster
+- system.haproxy.proxy.listen.kubernetes.apiserver
+- system.linux.system.repo.docker
+- system.salt.minion.cert.etcd_server
+- system.kubernetes.master.cluster
+- cluster.k8s-ha-contrail.kubernetes.compute
+- cluster.k8s-ha-contrail
+parameters:
+ _param:
+ keepalived_vip_interface: ens3
+ keepalived_vip_virtual_router_id: 60
+ etcd:
+ server:
+ bind:
+ host: ${_param:deploy_address}
+ source:
+ engine: docker_hybrid
+ ssl:
+ enabled: true
+ setup:
+ calico:
+ key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
+ value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
+ kubernetes:
+ common:
+ addons:
+ netchecker:
+ enabled: true
+ agent_image: ${_param:kubernetes_netchecker_agent_image}
+ server_image: ${_param:kubernetes_netchecker_server_image}
+ helm:
+ enabled: true
+ master:
+ etcd:
+ ssl:
+ enabled: true
+ network:
+ etcd:
+ ssl:
+ enabled: true
+ namespace:
+ netchecker:
+ enabled: true
+ network:
+ engine: opencontrail
+ public_ip_range: 185.22.97.128/26
+ public_network: default-domain:default-project:Public
+ private_ip_range: 10.150.0.0/16
+ config:
+ api:
+ host: ${_param:opencontrail_control_address}
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
new file mode 100644
index 0000000..9a7f189
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -0,0 +1,91 @@
+
+parameters:
+ _param:
+ salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+
+ # kubernetes settings
+ kubernetes_admin_user: admin
+ kubernetes_admin_password: sbPfel23ZigJF3Bm
+ kubernetes_admin_token: PpP6Mm3pAoPVqcKOKUu0x1dh7b1959Fi
+ kubernetes_kubelet_token: JJ2PKHxjiU6EYvIt18BqwdSK1HvWh8pt
+ kubernetes_kube-proxy_token: jT0hJk9L6cIw5UpYDNhsRwcj3Z2n62B6
+ kubernetes_scheduler_token: VgkUHfrW07zNxrb0ucFyX7NBnSJN9Xp6
+ kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
+ kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
+ etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
+
+ # component docker images
+ kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
+ kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
+ kubernetes_opencontrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.3-1
+ kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
+ kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
+
+ # addresses and hostnames
+ kubernetes_internal_api_address: 10.254.0.1
+ kubernetes_control_hostname: ctl
+ kubernetes_control_address: 192.168.10.253
+ kubernetes_control_node01_hostname: ctl01
+ kubernetes_control_node02_hostname: ctl02
+ kubernetes_control_node03_hostname: ctl03
+ kubernetes_control_node01_address: 172.16.10.101
+ kubernetes_control_node02_address: 172.16.10.102
+ kubernetes_control_node03_address: 172.16.10.103
+ kubernetes_control_node01_deploy_address: 192.168.10.101
+ kubernetes_control_node02_deploy_address: 192.168.10.102
+ kubernetes_control_node03_deploy_address: 192.168.10.103
+ etcd_control_node01_address: 192.168.10.101
+ etcd_control_node02_address: 192.168.10.102
+ etcd_control_node03_address: 192.168.10.103
+ kubernetes_proxy_node01_hostname: prx01
+ kubernetes_proxy_node01_address: 172.16.10.121
+
+ cluster_vip_address: ${_param:kubernetes_control_address}
+ cluster_local_address: ${_param:deploy_address}
+
+ # etcd stuff
+ cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}
+ cluster_node01_address: ${_param:etcd_control_node01_address}
+ cluster_node01_port: 4001
+ cluster_node02_hostname: ${_param:kubernetes_control_node02_hostname}
+ cluster_node02_address: ${_param:etcd_control_node02_address}
+ cluster_node02_port: 4001
+ cluster_node03_hostname: ${_param:kubernetes_control_node03_hostname}
+ cluster_node03_address: ${_param:etcd_control_node03_address}
+ cluster_node03_port: 4001
+
+ # calico
+ calico_private_network: 192.168.0.0
+ calico_private_netmask: 16
+
+ linux:
+ network:
+ host:
+ ctl:
+ address: ${_param:kubernetes_control_address}
+ names:
+ - ${_param:kubernetes_control_hostname}
+ - ${_param:kubernetes_control_hostname}.${_param:cluster_domain}
+ ctl01:
+ address: ${_param:kubernetes_control_node01_address}
+ names:
+ - ${_param:kubernetes_control_node01_hostname}
+ - ${_param:kubernetes_control_node01_hostname}.${_param:cluster_domain}
+ ctl02:
+ address: ${_param:kubernetes_control_node02_address}
+ names:
+ - ${_param:kubernetes_control_node02_hostname}
+ - ${_param:kubernetes_control_node02_hostname}.${_param:cluster_domain}
+ ctl03:
+ address: ${_param:kubernetes_control_node03_address}
+ names:
+ - ${_param:kubernetes_control_node03_hostname}
+ - ${_param:kubernetes_control_node03_hostname}.${_param:cluster_domain}
+ prx01:
+ address: ${_param:kubernetes_proxy_node01_address}
+ names:
+ - ${_param:kubernetes_proxy_node01_hostname}
+ - ${_param:kubernetes_proxy_node01_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/compute.yml b/classes/cluster/k8s-ha-contrail/opencontrail/compute.yml
new file mode 100644
index 0000000..d6f92b6
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail/opencontrail/compute.yml
@@ -0,0 +1,30 @@
+classes:
+- system.linux.system.repo.mcp.contrail
+- system.opencontrail.compute.cluster
+- system.opencontrail.client.cluster
+- system.opencontrail.client.resource.virtual_router
+parameters:
+ _param:
+ opencontrail_compute_address: ${_param:single_address}
+ opencontrail_compute_iface: ens4
+ opencontrail_compute_gateway: 172.16.10.1
+ opencontrail_compute_dns: 8.8.8.8
+ opencontrail:
+ common:
+ identity:
+ engine: k8s
+ host: none
+ token: none
+ password: none
+ network:
+ engine: k8s
+ host: none
+ kubernetes:
+ pool:
+ network:
+ hash: 2276df10feae8f09fb50dce3a96fff6c
+ linux:
+ network:
+ concat_iface_files:
+ - src: '/etc/network/interfaces.d/50-cloud-init.cfg'
+ dst: '/etc/network/interfaces'
\ No newline at end of file
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
new file mode 100644
index 0000000..0c101cc
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
@@ -0,0 +1,78 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.cassandra
+- system.linux.system.repo.mcp.contrail
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.trusty
+- system.opencontrail.client.resource.edge_router
+- system.rabbitmq.server.cluster
+- system.opencontrail.control.cluster
+- system.opencontrail.client.cluster
+- system.opencontrail.client.resource.control_node
+- system.opencontrail.client.resource.config_node
+- system.opencontrail.client.resource.database_node
+- system.opencontrail.client.resource.analytics_node
+- system.haproxy.proxy.listen.opencontrail.analytics
+- cluster.k8s-ha-contrail
+parameters:
+ _param:
+ keepalived_vip_interface: eth1
+ cluster_vip_address: ${_param:opencontrail_control_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_node01_hostname: ${_param:opencontrail_control_node01_hostname}
+ cluster_node01_address: ${_param:opencontrail_control_node01_address}
+ cluster_node02_hostname: ${_param:opencontrail_control_node02_hostname}
+ cluster_node02_address: ${_param:opencontrail_control_node02_address}
+ cluster_node03_hostname: ${_param:opencontrail_control_node03_hostname}
+ cluster_node03_address: ${_param:opencontrail_control_node03_address}
+ rabbitmq_secret_key: password
+ rabbitmq_admin_password: password
+ opencontrail_router01_hostname: vsrx01.${_param:cluster_domain}
+ opencontrail_router01_address: 172.16.10.131
+ linux:
+ network:
+ interface:
+ eth1:
+ enabled: true
+ type: eth
+ proto: dhcp
+ keepalived:
+ cluster:
+ instance:
+ VIP:
+ virtual_router_id: 144
+ opencontrail:
+ common:
+ identity:
+ host: none
+ engine: k8s
+ network:
+ engine: k8s
+ config:
+ network:
+ engine: k8s
+ identity:
+ engine: k8s
+ region: none
+ host: none
+ multi_tenancy: false
+ message_queue:
+ host: ${_param:opencontrail_control_address}
+ web:
+ network:
+ engine: k8s
+ identity:
+ engine: k8s
+ host: none
+ rabbitmq:
+ server:
+ host:
+ '/':
+ enabled: true
+ user: guest
+ password: guest
+ policies:
+ - name: HA
+ pattern: '^(?!amq\.).*'
+ definition: '{"ha-mode": "all", "message-ttl": 120000}'
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/init.yml b/classes/cluster/k8s-ha-contrail/opencontrail/init.yml
new file mode 100644
index 0000000..cd3445a
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail/opencontrail/init.yml
@@ -0,0 +1,43 @@
+parameters:
+ _param:
+ opencontrail_version: 3.0
+ opencontrail_control_hostname: ntw
+ opencontrail_control_node01_hostname: ntw01
+ opencontrail_control_node02_hostname: ntw02
+ opencontrail_control_node03_hostname: ntw03
+
+ opencontrail_control_address: 172.16.10.252
+ opencontrail_control_node01_address: 172.16.10.110
+ opencontrail_control_node02_address: 172.16.10.111
+ opencontrail_control_node03_address: 172.16.10.112
+
+ keystone_admin_password: none
+ opencontrail_stats_password: password
+ keystone_service_token: none
+ openstack_version: mitaka
+ openstack_control_address: none
+ keystone_admin_password: none
+
+ linux:
+ network:
+ host:
+ ntw:
+ address: ${_param:opencontrail_control_address}
+ names:
+ - ${_param:opencontrail_control_hostname}
+ - ${_param:opencontrail_control_hostname}.${_param:cluster_domain}
+ ntw01:
+ address: ${_param:opencontrail_control_node01_address}
+ names:
+ - ${_param:opencontrail_control_node01_hostname}
+ - ${_param:opencontrail_control_node01_hostname}.${_param:cluster_domain}
+ ntw02:
+ address: ${_param:opencontrail_control_node02_address}
+ names:
+ - ${_param:opencontrail_control_node02_hostname}
+ - ${_param:opencontrail_control_node02_hostname}.${_param:cluster_domain}
+ ntw03:
+ address: ${_param:opencontrail_control_node03_address}
+ names:
+ - ${_param:opencontrail_control_node03_hostname}
+ - ${_param:opencontrail_control_node03_hostname}.${_param:cluster_domain}