Merge "Add model with openstack ocata and cicd"
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
index 434abec..29bdc19 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/control.yml
@@ -22,7 +22,7 @@
- system.cinder.control.cluster
- system.heat.server.cluster
- system.designate.server.cluster
-- system.designate.server.backend.bind
+- system.designate.server.backend.pdns
- system.galera.server.cluster
- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
@@ -57,20 +57,13 @@
instance:
VIP:
virtual_router_id: 150
- bind:
+ powerdns:
server:
- control:
- mgmt:
- enabled: true
- bind:
- address: ${_param:single_address}
- port: 953
- allow:
- - ${_param:openstack_control_node01_address}
- - ${_param:openstack_control_node02_address}
- - ${_param:openstack_control_node03_address}
- keys:
- - designate
+ axfr_ips:
+ - ${_param:openstack_control_node01_address}
+ - ${_param:openstack_control_node02_address}
+ - ${_param:openstack_control_node03_address}
+ - 127.0.0.1
keystone:
server:
admin_email: ${_param:admin_email}
@@ -92,9 +85,8 @@
options:
host: ${_param:openstack_control_node02_address}
port: 53
- rndc_host: ${_param:openstack_control_node02_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
+ api_endpoint: "http://${_param:openstack_control_node02_address}:${_param:powerdns_webserver_port}"
+ api_token: ${_param:designate_pdns_api_key}
default2:
type: ${_param:designate_pool_target_type}
description: 'test target3'
@@ -102,9 +94,8 @@
options:
host: ${_param:openstack_control_node03_address}
port: 53
- rndc_host: ${_param:openstack_control_node03_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
+ api_endpoint: "http://${_param:openstack_control_node03_address}:${_param:powerdns_webserver_port}"
+ api_token: ${_param:designate_pdns_api_key}
glance:
server:
storage:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
index 3b0c78f..4bca9d3 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
@@ -33,8 +33,11 @@
rabbitmq_admin_password: workshop
rabbitmq_openstack_password: workshop
rabbitmq_cold_password: workshop
- designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
+ powerdns_webserver_password: gJ6n3gVaYP8eS
+ powerdns_webserver_port: 8081
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_pdns_api_key: VxK9cMlFL5Ae
+ designate_pdns_api_endpoint: "http://${_param:openstack_control_node01_address}:${_param:powerdns_webserver_port}"
designate_pool_ns_records:
- hostname: 'ns1.example.org.'
priority: 10
@@ -45,7 +48,7 @@
port: 53
- host: ${_param:openstack_control_node03_address}
port: 53
- designate_pool_target_type: bind9
+ designate_pool_target_type: pdns4
designate_pool_target_masters:
- host: ${_param:openstack_control_node01_address}
port: 5354
@@ -56,9 +59,8 @@
designate_pool_target_options:
host: ${_param:openstack_control_node01_address}
port: 53
- rndc_host: ${_param:openstack_control_node01_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
+ api_token: ${_param:designate_pdns_api_key}
+ api_endpoint: ${_param:designate_pdns_api_endpoint}
designate_version: ${_param:openstack_version}
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:cluster_vip_address}
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
index a6bb32b..27e6fe9 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
@@ -22,6 +22,8 @@
- system.neutron.control.opencontrail.cluster
- system.cinder.control.cluster
- system.heat.server.cluster
+- system.opencontrail.client.cluster
+- system.heat.server.resource.contrail
- system.designate.server.cluster
- system.designate.server.backend.bind
- system.ceilometer.server.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index 3f48fab..5c0b690 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -13,7 +13,6 @@
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
- system.glusterfs.server.volume.prometheus
-- system.glusterfs.server.volume.grafana
- system.glusterfs.server.cluster
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.glance
@@ -23,6 +22,8 @@
- system.neutron.control.opencontrail.cluster
- system.cinder.control.cluster
- system.heat.server.cluster
+- system.opencontrail.client.cluster
+- system.heat.server.resource.contrail
- system.designate.server.cluster
- system.designate.server.backend.bind
- system.ceilometer.server.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
index 51dcfd4..245de1c 100755
--- a/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-contrail/stacklight/server.yml
@@ -9,7 +9,6 @@
- system.heka.remote_collector.output.elasticsearch
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
-- system.glusterfs.client.volume.grafana
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
@@ -47,13 +46,12 @@
grafana_database_type: mysql
grafana_database_host: ${_param:openstack_database_address}
grafana_database_password: ${_param:mysql_grafana_password}
- docker_grafana_replicas: 3
docker_image_alertmanager: mirantis/alertmanager:latest
docker_image_pushgateway: mirantis/pushgateway:latest
docker_image_prometheus: mirantis/prometheus:latest
docker_image_remote_agent: mirantis/telegraf:latest
docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
- docker_image_grafana: grafana/grafana:latest
+ docker_image_grafana: grafana/grafana:4.3.2
prometheus_glusterfs_service_host: ${_param:openstack_control_address}
glusterfs_node01_address: ${_param:openstack_control_node01_address}
glusterfs_node02_address: ${_param:openstack_control_node02_address}
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
index 853a1b4..f06e83d 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
@@ -15,7 +15,6 @@
- system.glusterfs.server.volume.glance
- system.glusterfs.server.volume.keystone
- system.glusterfs.server.volume.prometheus
-- system.glusterfs.server.volume.grafana
- system.glusterfs.server.cluster
- system.glance.control.cluster
- system.nova.control.cluster
diff --git a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
index 769492d..4243f6c 100644
--- a/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-dvr/stacklight/server.yml
@@ -9,7 +9,6 @@
- system.heka.remote_collector.output.elasticsearch
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
-- system.glusterfs.client.volume.grafana
- system.elasticsearch.server.cluster
- system.elasticsearch.server.curator
- system.kibana.server.single
@@ -47,13 +46,12 @@
grafana_database_type: mysql
grafana_database_host: ${_param:openstack_database_address}
grafana_database_password: ${_param:mysql_grafana_password}
- docker_grafana_replicas: 3
docker_image_alertmanager: mirantis/alertmanager:latest
docker_image_pushgateway: mirantis/pushgateway:latest
docker_image_prometheus: mirantis/prometheus:latest
docker_image_remote_agent: mirantis/telegraf:latest
docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
- docker_image_grafana: grafana/grafana:latest
+ docker_image_grafana: grafana/grafana:4.3.2
prometheus_glusterfs_service_host: ${_param:openstack_control_address}
glusterfs_node01_address: ${_param:openstack_control_node01_address}
glusterfs_node02_address: ${_param:openstack_control_node02_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
index 9a19b3a..6c49533 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/stacklight/server.yml
@@ -11,10 +11,8 @@
- service.haproxy.proxy.single
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
-- system.glusterfs.client.volume.grafana
- system.glusterfs.server.cluster
- system.glusterfs.server.volume.prometheus
-- system.glusterfs.server.volume.grafana
- system.galera.server.cluster
- system.galera.server.database.grafana
- system.salt.minion.cert.prometheus_server
@@ -36,8 +34,7 @@
docker_image_prometheus: mirantis/prometheus:latest
docker_image_remote_agent: mirantis/telegraf:latest
docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
- docker_image_grafana: grafana/grafana:latest
- docker_grafana_replicas: 3
+ docker_image_grafana: grafana/grafana:4.3.2
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
keepalived_prometheus_vip_password: password
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/config.yml
new file mode 100644
index 0000000..1afe68f
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/config.yml
@@ -0,0 +1,74 @@
+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.salt.minion.cert.k8s_server
+- system.reclass.storage.salt
+- system.reclass.storage.system.kubernetes_control_cluster
+- cluster.virtual-mcp11-k8s-calico-minimal
+parameters:
+ _param:
+ salt_master_base_environment: prd
+ reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab.git"
+ 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_ip>>
+ linux_system_codename:
+ value_template: <<node_os>>
+ salt_master_host:
+ value_template: <<node_master_ip>>
+ infra_config:
+ expression: <<node_hostname>>__equals__cfg01
+ cluster_param:
+ infra_config_address:
+ value_template: <<node_ip>>
+ infra_config_deploy_address:
+ value_template: <<node_ip>>
+ kubernetes_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ kubernetes_control_node01_address:
+ value_template: <<node_ip>>
+ kubernetes_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ kubernetes_control_node02_address:
+ value_template: <<node_ip>>
+ kubernetes_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ kubernetes_control_node03_address:
+ value_template: <<node_ip>>
+ kubernetes_compute:
+ expression: <<node_hostname>>__startswith__cmp
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.kubernetes.compute
+ node:
+ kubernetes_compute_node01:
+ name: ${_param:kubernetes_compute_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.kubernetes.compute
+ params:
+ salt_master_host: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ single_address: ${_param:kubernetes_compute_node01_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
new file mode 100644
index 0000000..e102028
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/infra/init.yml
@@ -0,0 +1,43 @@
+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.openssh.server.team.k8s_team
+- 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: virtual-mcp11-k8s-calico-minimal.local
+ cluster_name: virtual-mcp11-k8s-calico-minimal
+ apt_mk_version: nightly
+ linux:
+ network:
+ resolv:
+ dns:
+ - 172.18.176.4
+ - 172.18.176.7
+ 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}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/init.yml
new file mode 100644
index 0000000..e1ad5a6
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/init.yml
@@ -0,0 +1,4 @@
+classes:
+- cluster.virtual-mcp11-k8s-calico-minimal.kubernetes
+- cluster.virtual-mcp11-k8s-calico-minimal.infra
+- cluster.overrides
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
new file mode 100644
index 0000000..1df5f06
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
@@ -0,0 +1,42 @@
+classes:
+- system.linux.system.repo.docker
+- system.kubernetes.pool.cluster
+- system.salt.minion.cert.k8s_client
+- system.salt.minion.cert.etcd_client
+- cluster.virtual-mcp11-k8s-calico-minimal
+- cluster.overrides
+parameters:
+ docker:
+ host:
+ pkgs:
+ - ${_param:kubernetes_docker_package}
+ - python-docker
+ kubernetes:
+ pool:
+ network:
+ etcd:
+ ssl:
+ enabled: true
+ image: ${_param:kubernetes_calico_image}
+ calicoctl:
+ image: ${_param:kubernetes_calicoctl_image}
+ cni:
+ image: ${_param:kubernetes_calico_cni_image}
+ mtu: ${_param:kubernetes_mtu}
+ common:
+ hyperkube:
+ image: ${_param:kubernetes_hyperkube_image}
+ linux:
+ network:
+ resolv:
+ dns:
+ - 10.254.0.10
+ - 172.18.176.4
+ - 172.18.176.7
+ interface:
+ ens4:
+ route:
+ kubernetes_services:
+ address: 10.254.0.0
+ netmask: 255.255.0.0
+ gateway: ${_param:single_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
new file mode 100644
index 0000000..b82b444
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
@@ -0,0 +1,45 @@
+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.virtual-mcp11-k8s-calico-minimal.kubernetes.compute
+- cluster.virtual-mcp11-k8s-calico-minimal
+- cluster.overrides
+parameters:
+ _param:
+ keepalived_vip_interface: ens4
+ keepalived_vip_virtual_router_id: 60
+ etcd:
+ server:
+ 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:
+ master:
+ etcd:
+ ssl:
+ enabled: true
+ network:
+ etcd:
+ ssl:
+ enabled: true
+ namespace:
+ netchecker:
+ enabled: ${_param:kubernetes_netchecker_enabled}
+ addons:
+ helm:
+ enabled: ${_param:kubernetes_helm_enabled}
+ calico_policy:
+ enabled: ${_param:kubernetes_calico_policy_enabled}
+ image: ${_param:kubernetes_calico_policy_image}
+ netchecker:
+ enabled: ${_param:kubernetes_netchecker_enabled}
+ agent_image: ${_param:kubernetes_netchecker_agent_image}
+ server_image: ${_param:kubernetes_netchecker_server_image}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
new file mode 100644
index 0000000..61a6be8
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
@@ -0,0 +1,113 @@
+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
+ kubernetes_mtu: 1500
+ etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
+
+ # docker package version
+ kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
+
+ # 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_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
+ kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:latest
+ kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:latest
+ kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
+
+ # addresses and hostnames
+ kubernetes_internal_api_address: 10.254.0.1
+ kubernetes_control_hostname: ctl
+ kubernetes_control_address: 172.16.10.253
+ kubernetes_control_node01_hostname: ctl01
+ kubernetes_control_node02_hostname: ctl02
+ kubernetes_control_node03_hostname: ctl03
+ kubernetes_compute_node01_hostname: cmp01
+ 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_compute_node01_address: 172.16.10.105
+
+ cluster_vip_address: ${_param:kubernetes_control_address}
+ cluster_local_address: ${_param:single_address}
+
+ # etcd stuff
+ cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}
+ cluster_node01_address: ${_param:kubernetes_control_node01_address}
+ cluster_node01_port: 4001
+ cluster_node02_hostname: ${_param:kubernetes_control_node02_hostname}
+ cluster_node02_address: ${_param:kubernetes_control_node02_address}
+ cluster_node02_port: 4001
+ cluster_node03_hostname: ${_param:kubernetes_control_node03_hostname}
+ cluster_node03_address: ${_param:kubernetes_control_node03_address}
+ cluster_node03_port: 4001
+
+ # calico
+ calico_private_network: 192.168.0.0
+ calico_private_netmask: 16
+
+ # k8s addons
+ kubernetes_calico_policy_enabled: false
+ kubernetes_helm_enabled: true
+ kubernetes_netchecker_enabled: true
+
+ linux:
+ network:
+ resolv:
+ domain: virtual-mcp11-k8s-calico-minimal.local
+ options:
+ - ndots:5
+ - timeout:2
+ - attempts:2
+ 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}
+ cmp01:
+ address: ${_param:kubernetes_compute_node01_address}
+ names:
+ - ${_param:kubernetes_compute_node01_hostname}
+ - ${_param:kubernetes_compute_node01_hostname}.${_param:cluster_domain}
+ system:
+ rc:
+ local: |
+ #!/bin/sh -e
+ #
+ # rc.local
+ #
+ ######### This file is managed by Salt! ##########
+ # This script is executed at the end of each multiuser runlevel.
+ # Make sure that the script will "exit 0" on success or any other
+ # value on error.
+ #
+ ip r a 10.254.0.0/16 dev ens4
+ exit 0
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index e68a624..4de8d96 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -13,10 +13,8 @@
- service.haproxy.proxy.single
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
-- system.glusterfs.client.volume.grafana
- system.glusterfs.server.cluster
- system.glusterfs.server.volume.prometheus
-- system.glusterfs.server.volume.grafana
- system.galera.server.cluster
- system.galera.server.database.grafana
- system.influxdb.server.single
@@ -41,8 +39,7 @@
docker_image_prometheus: mirantis/prometheus:latest
docker_image_remote_agent: mirantis/telegraf:latest
docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
- docker_image_grafana: grafana/grafana:latest
- docker_grafana_replicas: 3
+ docker_image_grafana: grafana/grafana:4.3.2
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
keepalived_prometheus_vip_password: password
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index 9ff2d53..0116857 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -44,5 +44,6 @@
public_ip_range: 185.22.97.128/26
public_network: default-domain:default-project:Public
private_ip_range: 10.150.0.0/16
- opencontrail:
- address: ${_param:opencontrail_control_address}
+ config:
+ api:
+ address: ${_param:opencontrail_control_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index 5e9d181..33033d9 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -15,10 +15,8 @@
- system.galera.server.database.grafana
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.prometheus
-- system.glusterfs.client.volume.grafana
- system.glusterfs.server.cluster
- system.glusterfs.server.volume.prometheus
-- system.glusterfs.server.volume.grafana
- system.influxdb.server.single
- system.influxdb.database.stacklight
- system.salt.minion.cert.prometheus_server
@@ -41,8 +39,7 @@
docker_image_prometheus: mirantis/prometheus:latest
docker_image_remote_agent: mirantis/telegraf:latest
docker_image_remote_storage_adapter: mirantis/remote_storage_adapter:latest
- docker_image_grafana: grafana/grafana:latest
- docker_grafana_replicas: 3
+ docker_image_grafana: grafana/grafana:4.3.2
grafana_admin_password: admin
keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
keepalived_prometheus_vip_password: password
diff --git a/classes/system b/classes/system
index 9f2c559..70f7f59 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 9f2c5596c833df0f9c72033bd6d6ae39d5f2fa81
+Subproject commit 70f7f5915dabf37b49b954514ecec0778578536c
diff --git a/nodes/cfg01.virtual-mcp11-k8s-calico-minimal.local.yml b/nodes/cfg01.virtual-mcp11-k8s-calico-minimal.local.yml
new file mode 100644
index 0000000..e972393
--- /dev/null
+++ b/nodes/cfg01.virtual-mcp11-k8s-calico-minimal.local.yml
@@ -0,0 +1,10 @@
+classes:
+- cluster.virtual-mcp11-k8s-calico-minimal.infra.config
+parameters:
+ _param:
+ linux_system_codename: xenial
+ reclass_data_revision: master
+ linux:
+ system:
+ name: cfg01
+ domain: virtual-mcp11-k8s-calico-minimal.local