Merge "Enable external iface to get external net ready"
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml
index 578961e..f09c9c6 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml
@@ -1,7 +1,6 @@
classes:
- system.linux.system.repo.mcp.contrail
-#- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mos10
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.nova.compute.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
index e547a4c..d657e0f 100644
--- a/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
@@ -2,8 +2,7 @@
- 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.mos10
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.trusty
- system.opencontrail.client.resource.edge_router
@@ -17,6 +16,7 @@
- cluster.virtual-mcp11-contrail
parameters:
_param:
+ openstack_version: mitaka
keepalived_vip_interface: eth1
cluster_vip_address: ${_param:opencontrail_control_address}
cluster_local_address: ${_param:single_address}
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
index f52f34b..ba57a98 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/compute.yml
@@ -1,7 +1,6 @@
classes:
- system.linux.system.repo.mcp.contrail
-#- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mos10
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.nova.compute.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index 4825074..a93e1eb 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -2,8 +2,7 @@
- system.linux.system.lowmem
- system.linux.system.repo.glusterfs
- system.linux.system.repo.mcp.contrail
-#- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mos10
+- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
index 0edfa04..a83c082 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- openstack_version: newton
+ openstack_version: ocata
apt_mk_version: nightly
openstack_region: RegionOne
admin_email: root@localhost
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
index 91332ff..4bb98f5 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/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
@@ -16,11 +15,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:
@@ -30,7 +27,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,24 +36,48 @@
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.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
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
index cc710a8..20e53e3 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/infra/init.yml
@@ -1,34 +1,40 @@
-
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-calico.kubernetes
+- 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-calico.local
cluster_name: virtual-mcp11-k8s-calico
- #cluster_public_host: ""
+ 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}
- cfg:
- address: ${_param:infra_config_address}
- names:
- - cfg
- - cfg.${_param:cluster_domain}
interface:
ens4:
enabled: true
@@ -39,3 +45,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
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index 588c0c9..819acf9 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -29,3 +29,24 @@
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}
+ 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/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 5f3298d..f224099 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -4,6 +4,8 @@
- system.linux.system.repo.docker
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
+- system.glusterfs.server.cluster
+- system.glusterfs.server.volume.prometheus
- cluster.virtual-mcp11-k8s-calico.kubernetes.compute
- cluster.virtual-mcp11-k8s-calico.infra
parameters:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index 5659748..d494439 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -1,4 +1,3 @@
-
parameters:
_param:
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
@@ -31,9 +30,6 @@
kubernetes_compute_node02_address: 172.16.10.106
kubernetes_proxy_node01_hostname: prx01
kubernetes_proxy_node01_address: 172.16.10.121
- kubernetes_monitor_node01_hostname: mon01
- kubernetes_monitor_node01_address: 172.16.10.107
-
cluster_vip_address: ${_param:kubernetes_control_address}
cluster_local_address: ${_param:single_address}
@@ -53,8 +49,17 @@
calico_private_network: 192.168.0.0
calico_private_netmask: 16
+ # glusterfs
+ glusterfs_service_host: ${_param:kubernetes_control_address}
+
linux:
network:
+ resolv:
+ domain: virtual-mcp11-k8s-calico.local
+ options:
+ - ndots:5
+ - timeout:2
+ - attempts:2
host:
ctl:
address: ${_param:kubernetes_control_address}
@@ -91,8 +96,17 @@
names:
- ${_param:kubernetes_proxy_node01_hostname}
- ${_param:kubernetes_proxy_node01_hostname}.${_param:cluster_domain}
- mon01:
- address: ${_param:kubernetes_monitor_node01_address}
- names:
- - ${_param:kubernetes_monitor_node01_hostname}
- - ${_param:kubernetes_monitor_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/monitoring/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/monitoring/init.yml
new file mode 100644
index 0000000..d054aa0
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico/monitoring/init.yml
@@ -0,0 +1,3 @@
+parameters:
+ _param:
+ prometheus_control_address: ${_param:docker_swarm_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/monitoring/proxy.yml b/classes/cluster/virtual-mcp11-k8s-calico/monitoring/proxy.yml
new file mode 100644
index 0000000..f09e157
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico/monitoring/proxy.yml
@@ -0,0 +1,8 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
+- cluster.virtual-mcp11-k8s-calico.infra
+parameters:
+ _param:
+ cluster_public_host: ${_param:prometheus_control_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/monitoring/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/monitoring/server.yml
new file mode 100644
index 0000000..cf4b598
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico/monitoring/server.yml
@@ -0,0 +1,38 @@
+classes:
+- system.linux.system.repo.tcp_elastic
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- service.haproxy.proxy.single
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.prometheus
+- system.salt.minion.cert.prometheus_server
+- system.keepalived.cluster.instance.prometheus_server_vip
+- system.prometheus.server.target.etcd
+- system.prometheus.server.target.kubernetes
+- system.prometheus.server.target.dns
+- system.docker.swarm.stack.monitoring
+- system.docker.swarm.service.dashboard.grafana_server
+- cluster.virtual-mcp11-k8s-calico.infra
+parameters:
+ _param:
+ cluster_vip_address: ${_param:docker_swarm_address}
+ docker_image_alertmanager: alertmanager:latest
+ docker_image_pushgateway: pushgateway:latest
+ docker_image_prometheus: prometheus:latest
+ docker_image_grafana: grafana/grafana:latest
+ grafana_admin_password: admin
+ keepalived_prometheus_vip_address: ${_param:cluster_vip_address}
+ keepalived_prometheus_vip_password: password
+ keepalived_prometheus_vip_interface: ens4
+ # Kibana
+ kibana_elasticsearch_host: ${_param:cluster_vip_address}
+ # Elasticsearch
+ cluster_node01_hostname: ${_param:docker_swarm_node01_hostname}
+ cluster_node01_address: ${_param:docker_swarm_node01_address}
+ cluster_node02_hostname: ${_param:docker_swarm_node02_hostname}
+ cluster_node02_address: ${_param:docker_swarm_node02_address}
+ cluster_node03_hostname: ${_param:docker_swarm_node03_hostname}
+ cluster_node03_address: ${_param:docker_swarm_node03_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/swarm/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/swarm/init.yml
new file mode 100644
index 0000000..72ce980
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico/swarm/init.yml
@@ -0,0 +1,36 @@
+parameters:
+ _param:
+ docker_swarm_hostname: mon
+ docker_swarm_address: 172.16.10.252
+ docker_swarm_node01_hostname: mon01
+ docker_swarm_node02_hostname: mon02
+ docker_swarm_node03_hostname: mon03
+ docker_swarm_node01_address: 172.16.10.107
+ docker_swarm_node02_address: 172.16.10.108
+ docker_swarm_node03_address: 172.16.10.109
+ linux:
+ network:
+ host:
+ mon:
+ address: ${_param:docker_swarm_address}
+ names:
+ - ${_param:docker_swarm_hostname}
+ - ${_param:docker_swarm_hostname}.${_param:cluster_domain}
+ mon01:
+ address: ${_param:docker_swarm_node01_address}
+ names:
+ - ${_param:docker_swarm_node01_hostname}
+ - ${_param:docker_swarm_node01_hostname}.${_param:cluster_domain}
+ mon02:
+ address: ${_param:docker_swarm_node02_address}
+ names:
+ - ${_param:docker_swarm_node02_hostname}
+ - ${_param:docker_swarm_node02_hostname}.${_param:cluster_domain}
+ mon03:
+ address: ${_param:docker_swarm_node03_address}
+ names:
+ - ${_param:docker_swarm_node03_hostname}
+ - ${_param:docker_swarm_node03_hostname}.${_param:cluster_domain}
+ system:
+ name: ${_param:infra_config_hostname}
+ domain: ${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/swarm/master.yml b/classes/cluster/virtual-mcp11-k8s-calico/swarm/master.yml
new file mode 100644
index 0000000..b2d33a1
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico/swarm/master.yml
@@ -0,0 +1,18 @@
+classes:
+- system.docker.client
+- system.docker.host
+- system.docker.swarm.master
+- cluster.virtual-mcp11-k8s-calico.infra
+parameters:
+ _param:
+ cluster_public_host: ${_param:docker_swarm_hostname}
+ docker:
+ client:
+ enabled: true
+ compose:
+ source:
+ engine: docker
+ image: "docker/compose:1.8.0"
+ swarm:
+ role: master
+ advertise_addr: ${_param:single_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/swarm/slave.yml b/classes/cluster/virtual-mcp11-k8s-calico/swarm/slave.yml
new file mode 100644
index 0000000..810da3d
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-calico/swarm/slave.yml
@@ -0,0 +1,11 @@
+classes:
+- system.docker.host
+- system.docker.swarm.manager
+- cluster.virtual-mcp11-k8s-calico.infra
+parameters:
+ _param:
+ cluster_public_host: ${_param:docker_swarm_hostname}
+ docker:
+ swarm:
+ master:
+ host: ${_param:docker_swarm_node01_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 72dcebe..15af706 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -3,8 +3,8 @@
- system.kubernetes.pool.cluster
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
-- cluster.virtual-mcp11-k8s-calico.infra
-- cluster.virtual-mcp11-k8s-calico.opencontrail.compute
+- cluster.virtual-mcp11-k8s-contrail.infra
+- cluster.virtual-mcp11-k8s-contrail.opencontrail.compute
parameters:
_param:
kubernetes_hyperkube_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.5.4-5
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index f7bcd0c..c88d8ed 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -4,8 +4,7 @@
- system.linux.system.repo.docker
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
-- cluster.virtual-mcp11-k8s-calico.kubernetes.compute
-- cluster.virtual-mcp11-k8s-calico.infra
+- cluster.virtual-mcp11-k8s-contrail.kubernetes.compute
parameters:
_param:
keepalived_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
index 8663b63..a6de5e9 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
@@ -3,17 +3,16 @@
- system.linux.system.repo.cassandra
- system.linux.system.repo.mcp.contrail
#- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mos10
- 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.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.virtual-mcp11-k8s-contrail.infra
parameters:
@@ -65,4 +64,4 @@
engine: k8s
identity:
engine: k8s
- host: none
\ No newline at end of file
+ host: none
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
index a880fee..30ec91e 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
@@ -11,6 +11,11 @@
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
+
linux:
network:
host:
diff --git a/classes/system b/classes/system
index 34e2661..65ae6c9 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 34e266192bab45db3584cd78fcdcf3dc1717c610
+Subproject commit 65ae6c91bbe72c4b176631588f56c7e918d7fc73
diff --git a/scripts/bootstrap_kubernetes.sh b/scripts/bootstrap_kubernetes.sh
new file mode 100755
index 0000000..63c5112
--- /dev/null
+++ b/scripts/bootstrap_kubernetes.sh
@@ -0,0 +1,8 @@
+#!/bin/bash -x
+
+CWD="$(dirname "$(readlink -f "$0")")"
+
+"$CWD"/fuel_config_verify.sh
+"$CWD"/fuel_infra_install.sh
+"$CWD"/docker_swarm.sh
+"$CWD"/kubernetes_install.sh
diff --git a/scripts/docker_swarm.sh b/scripts/docker_swarm.sh
new file mode 100755
index 0000000..8037590
--- /dev/null
+++ b/scripts/docker_swarm.sh
@@ -0,0 +1,9 @@
+#!/bin/bash -x
+exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
+
+salt -C 'I@docker:swarm' state.sls docker.host
+salt -C 'I@docker:swarm:role:master' state.sls docker.swarm
+salt -C 'I@docker:swarm' state.sls salt.minion.grains
+salt -C 'I@docker:swarm' mine.update
+salt -C 'I@docker:swarm:role:manager' state.sls docker.swarm -b 1
+salt -C 'I@docker:swarm:role:master' cmd.run 'docker node ls'
diff --git a/scripts/kubernetes_install.sh b/scripts/kubernetes_install.sh
new file mode 100755
index 0000000..c1b35c1
--- /dev/null
+++ b/scripts/kubernetes_install.sh
@@ -0,0 +1,39 @@
+#!/bin/bash -xe
+exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
+
+# Create and distribute SSL certificates for services using salt state
+salt --state-output=terse '*' state.sls salt
+
+# Install keepalived
+salt --state-output=terse -C 'I@keepalived:cluster' state.sls keepalived -b 1
+
+# Install haproxy
+salt --state-output=terse -C 'I@haproxy:proxy' state.sls haproxy
+salt --state-output=terse -C 'I@haproxy:proxy' service.status haproxy
+
+# Install docker
+salt --state-output=terse -C 'I@docker:host' state.sls docker.host
+salt --state-output=terse -C 'I@docker:host' cmd.run "docker ps"
+
+# Install etcd
+salt --state-output=terse -C 'I@etcd:server' state.sls etcd.server.service
+salt --state-output=terse -C 'I@etcd:server' cmd.run ". /var/lib/etcd/configenv && etcdctl cluster-health"
+
+# Install Kubernetes and Calico
+salt --state-output=terse -C 'I@kubernetes:master' state.sls kubernetes.master.kube-addons
+salt --state-output=terse -C 'I@kubernetes:pool' state.sls kubernetes.pool
+salt --state-output=terse -C 'I@kubernetes:pool' cmd.run "calicoctl node status"
+salt --state-output=terse -C 'I@kubernetes:pool' cmd.run "calicoctl get ippool"
+
+# Setup NAT for Calico
+salt --state-output=terse -C 'I@kubernetes:master' --subset 1 state.sls etcd.server.setup
+
+# Run whole master to check consistency
+salt --state-output=terse -C 'I@kubernetes:master' state.sls kubernetes exclude=kubernetes.master.setup
+
+# Register addons
+salt --state-output=terse -C 'I@kubernetes:master' --subset 1 state.sls kubernetes.master.setup
+
+# Nginx needs to be configured
+#salt --state-output=terse -C 'I@nginx:server' state.sls nginx
+# IMHO not related to k8s installation