Merge "Setup os-ha-contrail for FIP"
diff --git a/.kitchen.yml b/.kitchen.yml
index 7df4724..f66b6bf 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -21,6 +21,7 @@
provision_command:
- apt-get update
- apt-get install -y git curl python-pip
+ - pip install --upgrade pip
- git clone https://github.com/salt-formulas/salt-formulas-scripts /srv/salt/scripts
- cd /srv/salt/scripts; git pull -r; cd -
# NOTE: Configure ENV options as needed, example:
@@ -28,8 +29,9 @@
export BOOTSTRAP=1;\n
export CLUSTER_NAME=<%= cluster %>;\n
export FORMULAS_SOURCE=pkg;\n
- export RECLASS_VERSION=dev;\n
+ export RECLASS_VERSION=develop;\n
export RECLASS_IGNORE_CLASS_NOTFOUND=True;\n
+ export RECLASS_IGNORE_CLASS_REGEXP='service.*';\n
export EXTRA_FORMULAS="";\n
" > /kitchen.env
#export RECLASS_SOURCE_PATH=/usr/lib/python2.7/site-packages/reclass;\n
diff --git a/classes/cluster/ceph-ha/.env b/classes/cluster/ceph-ha/.env
new file mode 100644
index 0000000..ba7d5dc
--- /dev/null
+++ b/classes/cluster/ceph-ha/.env
@@ -0,0 +1,4 @@
+EXTRA_FORMULAS="barbican linux salt reclass maas memcached openssh ntp sphinx \
+ grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf \
+ elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins \
+ gerrit artifactory influxdb horizon nginx collectd heka mysql"
diff --git a/classes/cluster/drivetrain-ha-clusters/.env b/classes/cluster/drivetrain-ha-clusters/.env
new file mode 100644
index 0000000..c5ed6e7
--- /dev/null
+++ b/classes/cluster/drivetrain-ha-clusters/.env
@@ -0,0 +1,4 @@
+EXTRA_FORMULAS="java docker linux salt reclass aptly jenkins gerrit \
+ haproxy keepalived postgresql openssh ntp nginx sphinx mysql \
+ libvirt rsyslog glusterfs xtrabackup freeipa elasticsearch \
+ rundeck devops-portal"
diff --git a/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml b/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
index d5b6a53..3c4e16a 100644
--- a/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
@@ -94,18 +94,18 @@
- cluster.drivetrain-ha-clusters.cicd
parameters:
_param:
- cluster_name: cicd-lab-dev
- cluster_node01_name: ci01
+ cluster_name: drivetrain-ha-clusters
+ cluster_node01_name: cid01
cluster_node01_address: ${_param:control_node01_address}
- cluster_node02_name: ci02
+ cluster_node02_name: cid02
cluster_node02_address: ${_param:control_node02_address}
- cluster_node03_name: ci03
+ cluster_node03_name: cid03
cluster_node03_address: ${_param:control_node03_address}
keepalived_vip_virtual_router_id: 180
keepalived_vip_priority: 103
keepalived_vip_password: password
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: ens4
cluster_vip_address: ${_param:control_vip_address}
cluster_public_host: ${_param:control_public_host}
diff --git a/classes/cluster/drivetrain-ha-clusters/infra/config.yml b/classes/cluster/drivetrain-ha-clusters/infra/config.yml
index d5467bc..73af8b7 100644
--- a/classes/cluster/drivetrain-ha-clusters/infra/config.yml
+++ b/classes/cluster/drivetrain-ha-clusters/infra/config.yml
@@ -7,18 +7,6 @@
- system.sphinx.server.doc.reclass
- cluster.drivetrain-ha-clusters
parameters:
- _param:
- 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_master_base_environment: prd
- salt_minion_ca_host: ${linux:network:fqdn}
- salt_master_host: ${_param:infra_config_deploy_address}
- cluster_public_host: ${_param:infra_config_address}
- salt_api_password: hovno12345!
- salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
salt:
master:
order_masters: true
@@ -79,7 +67,6 @@
classes:
- cluster.${_param:cluster_name}.infra.config
- cluster.${_param:cluster_name}.cicd.control.master
- - cluster.overrides
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
@@ -90,7 +77,6 @@
domain: ${_param:cluster_domain}
classes:
- cluster.${_param:cluster_name}.cicd.control.slave
- - cluster.overrides
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
@@ -102,7 +88,6 @@
domain: ${_param:cluster_domain}
classes:
- cluster.${_param:cluster_name}.cicd.control.slave
- - cluster.overrides
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
diff --git a/classes/cluster/drivetrain-ha-clusters/infra/init.yml b/classes/cluster/drivetrain-ha-clusters/infra/init.yml
index d385985..3a75d48 100644
--- a/classes/cluster/drivetrain-ha-clusters/infra/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/infra/init.yml
@@ -2,6 +2,7 @@
_param:
cluster_domain: drivetrain-ha-clusters.local
cluster_name: drivetrain-ha-clusters
+ linux_system_codename: xenial
apt_mk_version: nightly
admin_email: root@localhosti
infra_config_hostname: cfg01
@@ -9,6 +10,16 @@
infra_config_deploy_address: 192.168.10.90
salt_minion_ca_host: ci01.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
+ salt_master_base_environment: prd
+ salt_minion_ca_host: ${linux:network:fqdn}
+ salt_master_host: ${_param:infra_config_deploy_address}
+ salt_api_password: hovno12345!
+ salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+ 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}
+ cluster_public_host: ${_param:infra_config_address}
+ single_address: ${_param:infra_config_address}
linux:
network:
host:
diff --git a/classes/cluster/drivetrain-ha/.env b/classes/cluster/drivetrain-ha/.env
new file mode 100644
index 0000000..c5ed6e7
--- /dev/null
+++ b/classes/cluster/drivetrain-ha/.env
@@ -0,0 +1,4 @@
+EXTRA_FORMULAS="java docker linux salt reclass aptly jenkins gerrit \
+ haproxy keepalived postgresql openssh ntp nginx sphinx mysql \
+ libvirt rsyslog glusterfs xtrabackup freeipa elasticsearch \
+ rundeck devops-portal"
diff --git a/classes/cluster/drivetrain-ha/cicd/control/init.yml b/classes/cluster/drivetrain-ha/cicd/control/init.yml
index b6f1b7c..c38c965 100644
--- a/classes/cluster/drivetrain-ha/cicd/control/init.yml
+++ b/classes/cluster/drivetrain-ha/cicd/control/init.yml
@@ -94,18 +94,18 @@
- cluster.drivetrain-ha.cicd
parameters:
_param:
- cluster_name: cicd-lab-dev
- cluster_node01_name: ci01
+ cluster_name: drivetrain-ha
+ cluster_node01_name: cid01
cluster_node01_address: ${_param:control_node01_address}
- cluster_node02_name: ci02
+ cluster_node02_name: cid02
cluster_node02_address: ${_param:control_node02_address}
- cluster_node03_name: ci03
+ cluster_node03_name: cid03
cluster_node03_address: ${_param:control_node03_address}
keepalived_vip_virtual_router_id: 180
keepalived_vip_priority: 103
keepalived_vip_password: password
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: ens4
cluster_vip_address: ${_param:control_vip_address}
cluster_public_host: ${_param:control_public_host}
@@ -359,9 +359,9 @@
rundeck_postgresql_database: rundeck
rundeck_postgresql_host: ${_param:rundeck_db_host}
rundeck_cis_openstack:
- username: ${_param:oss_openstack_username}/auth/tokens
+ username: ${_param:oss_openstack_username}
password: ${_param:oss_openstack_password}
- auth_url: ${_param:oss_openstack_auth_url}
+ auth_url: ${_param:oss_openstack_auth_url}/auth/tokens
rundeck_cis_elasticsearch_url: http://${_param:haproxy_elasticsearch_bind_host}:${_param:haproxy_elasticsearch_http_bind_port}
rundeck_runbook_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBPHRctBuN16hVe05HxKeN1AqPqbjvWvqQ1zcr/sbJJXHgVBTACRD6G+DAi7SSJr7dLzyeNo042szJclsH/qf9h0tcytINATzye//x6MtzXZ4YIDkcd1Yhz1LRgCXk1PvIensJAdClYOymx+SRaJxEEzbLxgqhSnYOUY3xVGbUrgfXI9+ZG9hs9zfq5JEMRjQay5p+xuYv/wCoU+pbFPDmsW0hQ99O+XBHcwrpU3crkImetTM2WfnRlBkoJypLv/HicTJtnL91/BWcebvW50oxrEq1QQ82T1Wl3pQsJw24M48fXyl/HbF2QVP6O1Ptqr3O7cIByxJWHih3paZncVEj
rundeck_runbook_private_key: |
diff --git a/classes/cluster/drivetrain-ha/infra/config.yml b/classes/cluster/drivetrain-ha/infra/config.yml
index dbc0348..3fb5e9b 100644
--- a/classes/cluster/drivetrain-ha/infra/config.yml
+++ b/classes/cluster/drivetrain-ha/infra/config.yml
@@ -7,17 +7,6 @@
- system.sphinx.server.doc.reclass
- cluster.drivetrain-ha
parameters:
- _param:
- 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_master_base_environment: prd
- salt_minion_ca_host: ${linux:network:fqdn}
- salt_master_host: ${_param:infra_config_deploy_address}
- salt_api_password: hovno12345!
- salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
salt:
master:
reactor:
@@ -78,7 +67,6 @@
classes:
- cluster.${_param:cluster_name}.infra.config
- cluster.${_param:cluster_name}.cicd.control.master
- - cluster.overrides
params:
salt_master_host: 127.0.0.1
linux_system_codename: xenial
@@ -89,7 +77,6 @@
domain: ${_param:cluster_domain}
classes:
- cluster.${_param:cluster_name}.cicd.control.slave
- - cluster.overrides
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
@@ -101,7 +88,6 @@
domain: ${_param:cluster_domain}
classes:
- cluster.${_param:cluster_name}.cicd.control.slave
- - cluster.overrides
params:
salt_master_host: ${_param:reclass_config_master}
linux_system_codename: xenial
diff --git a/classes/cluster/drivetrain-ha/infra/init.yml b/classes/cluster/drivetrain-ha/infra/init.yml
index 0b205e5..3d1efe2 100644
--- a/classes/cluster/drivetrain-ha/infra/init.yml
+++ b/classes/cluster/drivetrain-ha/infra/init.yml
@@ -2,12 +2,22 @@
_param:
cluster_domain: drivetrain-ha.local
cluster_name: drivetrain-ha
+ linux_system_codename: xenial
apt_mk_version: nightly
infra_config_hostname: cid01
infra_config_address: 172.16.10.100
infra_config_deploy_address: 192.168.10.90
salt_minion_ca_host: cid01.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
+ salt_api_password: hovno12345!
+ salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+ salt_master_base_environment: prd
+ salt_minion_ca_host: ${linux:network:fqdn}
+ salt_master_host: ${_param:infra_config_deploy_address}
+ 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:
network:
host:
diff --git a/classes/cluster/k8s-aio-calico/.env b/classes/cluster/k8s-aio-calico/.env
new file mode 100644
index 0000000..407e2d1
--- /dev/null
+++ b/classes/cluster/k8s-aio-calico/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="ntp"
diff --git a/classes/cluster/k8s-aio-calico/infra/config.yml b/classes/cluster/k8s-aio-calico/infra/config.yml
index a9d6178..63034f6 100644
--- a/classes/cluster/k8s-aio-calico/infra/config.yml
+++ b/classes/cluster/k8s-aio-calico/infra/config.yml
@@ -5,10 +5,9 @@
- system.salt.master.pkg
- system.salt.minion.ca.salt_master
- system.salt.master.api
-- system.salt.minion.cert.k8s_server
-- system.mysql.client
+- system.salt.minion.cert.k8s_server_single
- system.reclass.storage.salt
-- system.reclass.storage.system.kubernetes_control_cluster
+- system.reclass.storage.system.kubernetes_control_single
- cluster.k8s-aio-calico
parameters:
_param:
@@ -17,6 +16,7 @@
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: 127.0.0.1
@@ -37,6 +37,8 @@
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:
@@ -44,23 +46,20 @@
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>>
+ kubernetes_control_node01_deploy_address:
+ value_template: <<node_deploy_ip>>
kubernetes_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
value_template:
- cluster.<<node_cluster>>.kubernetes.compute
+ node_param:
+ deploy_address:
+ value_template: <<node_deploy_ip>>
diff --git a/classes/cluster/k8s-aio-calico/infra/init.yml b/classes/cluster/k8s-aio-calico/infra/init.yml
index d6c546e..9d3b5c0 100644
--- a/classes/cluster/k8s-aio-calico/infra/init.yml
+++ b/classes/cluster/k8s-aio-calico/infra/init.yml
@@ -12,8 +12,8 @@
infra_config_address: 172.16.10.100
infra_config_deploy_address: 192.168.10.90
- cluster_domain: virtual-mcp11-k8s-calico.local
- cluster_name: virtual-mcp11-k8s-calico
+ cluster_domain: k8s-aio-calico.local
+ cluster_name: k8s-aio-calico
apt_mk_version: nightly
primary_interface: ens3
linux:
@@ -24,15 +24,6 @@
names:
- ${_param:infra_config_hostname}
- ${_param:infra_config_hostname}.${_param:cluster_domain}
- interface:
- primary_interface:
- enabled: true
- type: eth
- proto: dhcp
- #proto: static
- #name: ${_param:primary_interface}
- #address: ${_param:single_address}
- #netmask: 255.255.255.0
system:
name: ${_param:infra_config_hostname}
domain: ${_param:cluster_domain}
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
index 4c03619..7f9da05 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
@@ -1,25 +1,23 @@
classes:
-- system.linux.system.repo.docker
-- system.kubernetes.pool.cluster
+- system.linux.system.repo.docker_legacy
+- system.kubernetes.pool.single
- system.linux.network.hosts
-- system.salt.minion.cert.k8s_client
+- system.salt.minion.cert.k8s_client_single
- system.salt.minion.cert.etcd_client
- cluster.k8s-aio-calico
parameters:
- _param:
- 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.7.5-2
docker:
host:
pkgs:
- - docker-engine=1.12.6-0~ubuntu-xenial
+ - - ${_param:kubernetes_docker_package}
- python-docker
options:
bip: 172.31.255.1/24
+ storage-driver: overlay2
kubernetes:
pool:
+ kubelet:
+ address: ${_param:single_address}
network:
etcd:
ssl:
@@ -30,6 +28,13 @@
cni:
image: ${_param:kubernetes_calico_cni_image}
common:
+ addons:
+ virtlet:
+ enabled: ${_param:kubernetes_virtlet_enabled}
+ namespace: ${_param:kubernetes_addon_namespace}
+ image: ${_param:kubernetes_virtlet_image}
+ hosts:
+ - ${linux:system:name}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
linux:
@@ -40,9 +45,16 @@
- 172.18.176.4
- 172.18.176.7
interface:
- primary_interface:
+ ens3:
+ enabled: true
+ type: eth
+ proto: static
+ name: ${_param:primary_interface}
+ address: ${_param:deploy_address}
+ netmask: 255.255.255.0
+ gateway: 192.168.10.1
route:
kubernetes_services:
address: 10.254.0.0
netmask: 255.255.0.0
- gateway: ${_param:single_address}
+ gateway: ${_param:deploy_address}
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/control.yml b/classes/cluster/k8s-aio-calico/kubernetes/control.yml
index 7c4dfe3..a26ab0a 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/control.yml
@@ -1,9 +1,9 @@
classes:
-- service.etcd.server.cluster
-- system.haproxy.proxy.listen.kubernetes.apiserver
+- service.etcd.server.single
- system.linux.system.repo.docker_legacy
-- system.salt.minion.cert.etcd_server
-- system.kubernetes.master.cluster
+- system.salt.minion.cert.etcd_server_single
+- system.salt.minion.cert.k8s_server_single
+- system.kubernetes.master.single
- cluster.k8s-aio-calico.kubernetes.compute
- cluster.k8s-aio-calico
parameters:
@@ -12,6 +12,8 @@
keepalived_vip_virtual_router_id: 60
etcd:
server:
+ bind:
+ host: ${_param:deploy_address}
source:
engine: docker_hybrid
ssl:
@@ -23,20 +25,31 @@
kubernetes:
common:
addons:
- netchecker:
- enabled: true
+ dashboard:
+ enabled: ${_param:kubernetes_dashboard}
helm:
- enabled: true
+ enabled: ${_param:kubernetes_helm_enabled}
coredns:
enabled: ${_param:kubernetes_coredns_enabled}
externaldns:
enabled: ${_param:kubernetes_externaldns_enabled}
image: ${_param:kubernetes_externaldns_image}
provider: ${_param:kubernetes_externaldns_provider}
+ 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}
+ agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
master:
etcd:
ssl:
enabled: true
+ master:
+ kubelet:
+ address: ${_param:single_address}
network:
etcd:
ssl:
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/init.yml b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
index 9bb00dd..0856f18 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
@@ -14,36 +14,45 @@
kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
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_calico_policy_image: calico/kube-policy-controller:v0.5.4
+
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
+ kubernetes_virtlet_image: mirantis/virtlet:latest
+ kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
+ kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
+ kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
+
+ # switches of addons
+ kubernetes_addon_namespace: kube-system
+ kubernetes_dashboard: false
+ kubernetes_helm_enabled: true
+ kubernetes_netchecker_enabled: true
+ kubernetes_calico_policy_enabled: false
+ kubernetes_virtlet_enabled: false
+
# 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_compute_node01_hostname: cmp01
- kubernetes_compute_node02_hostname: cmp02
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
- kubernetes_compute_node02_address: 172.16.10.106
- kubernetes_proxy_node01_hostname: prx01
- kubernetes_proxy_node01_address: 172.16.10.121
+ master_address: ${_param:kubernetes_control_node01_address}
- cluster_vip_address: ${_param:kubernetes_control_address}
cluster_local_address: ${_param:single_address}
+ # cert
+ control_address: ${_param:kubernetes_control_node01_address}
+ salt_master_base_environment: prd
+
# 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
+ node_hostname: ${_param:kubernetes_control_node01_hostname}
+ node_address: ${_param:kubernetes_control_node01_address}
+ node_port: 4001
# calico
calico_private_network: 192.168.0.0
@@ -59,59 +68,9 @@
linux:
network:
- resolv:
- domain: virtual-mcp11-k8s-calico.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}
- cmp02:
- address: ${_param:kubernetes_compute_node02_address}
- names:
- - ${_param:kubernetes_compute_node02_hostname}
- - ${_param:kubernetes_compute_node02_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}
- 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 ens3
- exit 0
diff --git a/classes/cluster/k8s-aio-contrail/.env b/classes/cluster/k8s-aio-contrail/.env
new file mode 100644
index 0000000..407e2d1
--- /dev/null
+++ b/classes/cluster/k8s-aio-contrail/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="ntp"
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
index badb177..70d5ee6 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
- system.kubernetes.pool.cluster
- system.linux.network.hosts
- system.salt.minion.cert.k8s_client
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
index 53e289d..48e75b0 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
@@ -19,7 +19,7 @@
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.7.5-2
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
kubernetes_externaldns_image: mirantis/external-dns:latest
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/.env b/classes/cluster/k8s-ha-calico-cloudprovider/.env
new file mode 100644
index 0000000..407e2d1
--- /dev/null
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="ntp"
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml b/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml
index e637c3f..c60131d 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml
@@ -11,8 +11,8 @@
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_domain: k8s-ha-calico-cloudprovider.local
+ cluster_name: k8s-ha-calico-cloudprovider
apt_mk_version: nightly
primary_interface: ens3
linux:
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
index 536dfff..53efb6b 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
- system.kubernetes.pool.cluster
- system.linux.network.hosts
- system.salt.minion.cert.k8s_client
@@ -10,7 +10,7 @@
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.7.5-2
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
docker:
host:
pkgs:
diff --git a/classes/cluster/k8s-ha-calico-syndic/.env b/classes/cluster/k8s-ha-calico-syndic/.env
new file mode 100644
index 0000000..407e2d1
--- /dev/null
+++ b/classes/cluster/k8s-ha-calico-syndic/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="ntp"
diff --git a/classes/cluster/k8s-ha-calico-syndic/infra/init.yml b/classes/cluster/k8s-ha-calico-syndic/infra/init.yml
index d91fab5..3637d1d 100644
--- a/classes/cluster/k8s-ha-calico-syndic/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/infra/init.yml
@@ -12,8 +12,8 @@
infra_config_deploy_address: 192.168.10.90
salt_syndic_master_address: 192.168.10.90
- cluster_domain: virtual-mcp11-k8s-calico.local
- cluster_name: virtual-mcp11-k8s-calico
+ cluster_domain: k8s-ha-calico-syndic.local
+ cluster_name: k8s-ha-calico-syndic
apt_mk_version: nightly
primary_interface: ens3
linux:
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
index eae863f..46635fb 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
- system.kubernetes.pool.cluster
- system.linux.network.hosts
- system.salt.minion.cert.k8s_client
@@ -10,7 +10,7 @@
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.7.5-2
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
docker:
host:
pkgs:
diff --git a/classes/cluster/k8s-ha-calico/.env b/classes/cluster/k8s-ha-calico/.env
new file mode 100644
index 0000000..407e2d1
--- /dev/null
+++ b/classes/cluster/k8s-ha-calico/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="ntp"
diff --git a/classes/cluster/k8s-ha-calico/infra/init.yml b/classes/cluster/k8s-ha-calico/infra/init.yml
index 1ead07a..e1576a8 100644
--- a/classes/cluster/k8s-ha-calico/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico/infra/init.yml
@@ -11,8 +11,8 @@
infra_config_address: 172.16.10.100
infra_config_deploy_address: 192.168.10.90
- cluster_domain: virtual-mcp11-k8s-calico.local
- cluster_name: virtual-mcp11-k8s-calico
+ cluster_domain: k8s-ha-calico.local
+ cluster_name: k8s-ha-calico
apt_mk_version: nightly
primary_interface: ens3
linux:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index 7d5acb7..a73a57b 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
- system.kubernetes.pool.cluster
- system.linux.network.hosts
- system.salt.minion.cert.k8s_client
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index 082d7ab..1b88da8 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -41,6 +41,7 @@
addons:
dashboard:
enabled: ${_param:kubernetes_dashboard}
+ image: ${_param:kubernetes_dashboard_image}
helm:
enabled: ${_param:kubernetes_helm_enabled}
calico_policy:
@@ -51,6 +52,13 @@
agent_image: ${_param:kubernetes_netchecker_agent_image}
server_image: ${_param:kubernetes_netchecker_server_image}
agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
+ dns:
+ enabled: ${_param:kubernetes_dns}
+ kubedns_image: ${_param:kubernetes_kubedns_image}
+ dnsmasq_image: ${_param:kubernetes_dnsmasq_image}
+ sidecar_image: ${_param:kubernetes_sidecar_image}
+ autoscaler:
+ image: ${_param:kubernetes_dns_autoscaler_image}
coredns:
enabled: ${_param:kubernetes_coredns_enabled}
externaldns:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 7eecf89..c669373 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -23,19 +23,25 @@
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.5-2
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
kubernetes_virtlet_image: mirantis/virtlet:latest
+ kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
+ kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
+ kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
+ kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
+ kubernetes_dns_autoscaler_image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
# switches of addons
kubernetes_addon_namespace: kube-system
+ kubernetes_dns: true
kubernetes_dashboard: true
kubernetes_helm_enabled: false
kubernetes_netchecker_enabled: true
kubernetes_calico_policy_enabled: false
- kubernetes_virtlet_enabled: true
+ kubernetes_virtlet_enabled: false
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
diff --git a/classes/cluster/k8s-ha-contrail/.env b/classes/cluster/k8s-ha-contrail/.env
new file mode 100644
index 0000000..407e2d1
--- /dev/null
+++ b/classes/cluster/k8s-ha-contrail/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="ntp"
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index 10d54c9..e3b8396 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
- system.kubernetes.pool.cluster
- system.linux.network.hosts
- system.salt.minion.cert.k8s_client
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 250ae20..08760e2 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -27,6 +27,7 @@
addons:
dashboard:
enabled: ${_param:kubernetes_dashboard}
+ image: ${_param:kubernetes_dashboard_image}
helm:
enabled: ${_param:kubernetes_helm_enabled}
netchecker:
@@ -37,6 +38,13 @@
namespace: ${_param:kubernetes_addon_namespace}
enabled: ${_param:kubernetes_contrail_network_controller}
image: ${_param:kubernetes_contrail_network_controller_image}
+ dns:
+ enabled: ${_param:kubernetes_dns}
+ kubedns_image: ${_param:kubernetes_kubedns_image}
+ dnsmasq_image: ${_param:kubernetes_dnsmasq_image}
+ sidecar_image: ${_param:kubernetes_sidecar_image}
+ autoscaler:
+ image: ${_param:kubernetes_dns_autoscaler_image}
coredns:
enabled: ${_param:kubernetes_coredns_enabled}
externaldns:
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index d84f867..822401b 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -24,8 +24,13 @@
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.5-2
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
kubernetes_virtlet_image: mirantis/virtlet:latest
+ kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
+ kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
+ kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
+ kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
+ kubernetes_dns_autoscaler_image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
@@ -35,6 +40,7 @@
# switches of addons
kubernetes_addon_namespace: kube-system
+ kubernetes_dns: true
kubernetes_dashboard: false
kubernetes_helm_enabled: true
kubernetes_netchecker_enabled: true
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
index 1848dc3..e8b854d 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
@@ -1,9 +1,11 @@
classes:
+- service.docker.host
- 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.docker_legacy
- system.linux.system.repo.saltstack.xenial
- system.opencontrail.client.resource.edge_router
- system.opencontrail.control.cluster4_0
@@ -13,6 +15,7 @@
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
- system.haproxy.proxy.listen.opencontrail.analytics
+- system.docker.client
- cluster.os-ha-contrail-40
parameters:
_param:
@@ -42,25 +45,8 @@
instance:
VIP:
virtual_router_id: 144
- opencontrail:
- web:
- database:
- port: 9042
- network:
- host: ${_param:openstack_control_address}
- identity:
- host: ${_param:openstack_control_address}
- common:
- network:
- host: ${_param:openstack_control_address}
- identity:
- host: ${_param:openstack_control_address}
- config:
- network:
- host: ${_param:openstack_control_address}
- identity:
- host: ${_param:openstack_control_address}
- message_queue:
- engine: rabbitmq
- host: ${_param:openstack_control_address}
- port: 5672
+ docker:
+ host:
+ pkgs:
+ - docker-engine
+ - python-docker
diff --git a/classes/cluster/os-ha-contrail/.env b/classes/cluster/os-ha-contrail/.env
index 753d68a..ba7d5dc 100644
--- a/classes/cluster/os-ha-contrail/.env
+++ b/classes/cluster/os-ha-contrail/.env
@@ -1 +1,4 @@
-EXTRA_FORMULAS="barbican"
+EXTRA_FORMULAS="barbican linux salt reclass maas memcached openssh ntp sphinx \
+ grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf \
+ elasticsearch kibana rundeck devops-portal rsync docker keepalived aptly jenkins \
+ gerrit artifactory influxdb horizon nginx collectd heka mysql"
diff --git a/classes/cluster/os-ha-ovs/.env b/classes/cluster/os-ha-ovs/.env
new file mode 100644
index 0000000..fdfff18
--- /dev/null
+++ b/classes/cluster/os-ha-ovs/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="ntp sphinx nginx memcached horizon"
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index f4038a9..ced1168 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
- system.kubernetes.pool.cluster
- system.linux.network.hosts
- system.salt.minion.cert.k8s_client
@@ -10,7 +10,7 @@
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.7.5-2
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
docker:
host:
pkgs:
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
index 34e1512..7afdd01 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
@@ -1,7 +1,7 @@
classes:
- service.etcd.server.cluster
- system.haproxy.proxy.listen.kubernetes.apiserver
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
- cluster.sl-k8s-calico.kubernetes.compute
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
index cdd5047..8a508c4 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
- system.kubernetes.pool.cluster
- system.linux.network.hosts
- system.salt.minion.cert.k8s_client
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
index 7b1b16a..04d188a 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
@@ -1,7 +1,7 @@
classes:
- service.etcd.server.cluster
- system.haproxy.proxy.listen.kubernetes.apiserver
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
- cluster.sl-k8s-contrail.kubernetes.compute
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
index 906ec13..6d3270f 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
@@ -19,7 +19,7 @@
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.7.5-2
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
kubernetes_externaldns_image: mirantis/external-dns:latest
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/cephfs.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/cephfs.yml
new file mode 100644
index 0000000..caed3db
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/cephfs.yml
@@ -0,0 +1,3 @@
+classes:
+- system.linux.system.repo.ubuntu
+- cluster.virtual-mcp-ocata-ovs-ceph
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
new file mode 100644
index 0000000..2aad679
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/common.yml
@@ -0,0 +1,8 @@
+classes:
+- system.linux.system.repo.ceph
+- cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+ ceph:
+ common:
+ public_network: 10.1.0.0/24
+ cluster_network: 10.16.0.0/24
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/init.yml
new file mode 100644
index 0000000..2f0d2ec
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/init.yml
@@ -0,0 +1,48 @@
+parameters:
+ _param:
+ linux_repo_ceph_component: ${_param:ceph_version}
+ ceph_version: luminous
+ ceph_mon_node01_hostname: cmn01
+ ceph_mon_node02_hostname: cmn02
+ ceph_mon_node03_hostname: cmn03
+
+ ceph_osd_node01_hostname: osd01
+ ceph_osd_node02_hostname: osd02
+
+
+ ceph_osd_node01_address: 172.16.10.94
+ ceph_osd_node02_address: 172.16.10.95
+ ceph_mon_node01_address: 172.16.10.96
+ ceph_mon_node02_address: 172.16.10.97
+ ceph_mon_node03_address: 172.16.10.98
+
+ ceph_cluster_fsid: a619c5fc-c4ed-4f22-9ed2-66cf2feca23d
+
+ linux:
+ network:
+ host:
+ cmn01:
+ address: ${_param:ceph_mon_node01_address}
+ names:
+ - ${_param:ceph_mon_node01_hostname}
+ - ${_param:ceph_mon_node01_hostname}.${_param:cluster_domain}
+ cmn02:
+ address: ${_param:ceph_mon_node02_address}
+ names:
+ - ${_param:ceph_mon_node02_hostname}
+ - ${_param:ceph_mon_node02_hostname}.${_param:cluster_domain}
+ cmn03:
+ address: ${_param:ceph_mon_node03_address}
+ names:
+ - ${_param:ceph_mon_node03_hostname}
+ - ${_param:ceph_mon_node03_hostname}.${_param:cluster_domain}
+ osd01:
+ address: ${_param:ceph_osd_node01_address}
+ names:
+ - ${_param:ceph_osd_node01_hostname}
+ - ${_param:ceph_osd_node01_hostname}.${_param:cluster_domain}
+ osd02:
+ address: ${_param:ceph_osd_node02_address}
+ names:
+ - ${_param:ceph_osd_node02_hostname}
+ - ${_param:ceph_osd_node02_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml
new file mode 100644
index 0000000..7d6fcd0
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/mon.yml
@@ -0,0 +1,5 @@
+classes:
+- system.ceph.mon.cluster
+- system.ceph.mgr.cluster
+- system.linux.system.repo.ceph
+- cluster.virtual-mcp-ocata-ovs-ceph
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml
new file mode 100644
index 0000000..8aab729
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/osd.yml
@@ -0,0 +1,15 @@
+classes:
+- service.ceph.osd.cluster
+- system.linux.system.repo.ceph
+- cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+ ceph:
+ osd:
+ enabled: true
+ crush_parent: ${_param:ceph_crush_parent}
+ bluestore_block_db_size: 10073741824
+ backend:
+ bluestore:
+ disks:
+ - dev: /dev/vdb
+ block_db: /dev/vdb
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml
new file mode 100644
index 0000000..d33991d
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/ceph/setup.yml
@@ -0,0 +1,61 @@
+classes:
+- system.ceph.mon.cluster_init
+- cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+ ceph:
+ setup:
+ pool:
+ images:
+ pg_num: 30
+ pgp_num: 30
+ type: replicated
+ application: rbd
+ crush_rule: sata
+ volumes:
+ pg_num: 30
+ pgp_num: 30
+ type: replicated
+ application: rbd
+ crush_rule: sata
+ vms:
+ pg_num: 30
+ pgp_num: 30
+ type: replicated
+ application: rbd
+ crush_rule: sata
+ .rgw.root:
+ pg_num: 30
+ pgp_num: 30
+ type: replicated
+ application: rgw
+ crush_rule: sata
+ default.rgw.control:
+ pg_num: 30
+ pgp_num: 30
+ type: replicated
+ application: rgw
+ crush_rule: sata
+ default.rgw.meta:
+ pg_num: 30
+ pgp_num: 30
+ type: replicated
+ application: rgw
+ crush_rule: sata
+ default.rgw.log:
+ pg_num: 30
+ pgp_num: 30
+ type: replicated
+ application: rgw
+ crush_rule: sata
+ default.rgw.buckets.index:
+ pg_num: 30
+ pgp_num: 30
+ type: replicated
+ application: rgw
+ crush_rule: sata
+ default.rgw.buckets.data:
+ pg_num: 30
+ pgp_num: 30
+ type: replicated
+ application: rgw
+ crush_rule: sata
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
new file mode 100644
index 0000000..ee079b6
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/config.yml
@@ -0,0 +1,236 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.openstack
+- system.openssh.client.lab
+- system.salt.master.api
+- system.salt.master.pkg
+- system.reclass.storage.salt
+- system.reclass.storage.system.ceph_mon_cluster
+- system.salt.minion.ca.salt_master
+- system.salt.minion.cert.proxy
+- system.sphinx.server.doc.reclass
+- system.keystone.client.single
+- system.keystone.client.service.aodh
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
+- system.keystone.client.service.glare
+- system.keystone.client.service.cinder3
+- system.mysql.client.single
+- system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.stacklightv2_server_cluster
+#- system.reclass.storage.system.ceph_mon_cluster
+- cluster.virtual-mcp-ocata-ovs-ceph.openstack.proxy
+- cluster.virtual-mcp-ocata-ovs-ceph.stacklight.proxy
+- cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+ _param:
+ reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
+ reclass_data_revision: master
+ salt_master_environment_repository: "https://github.com/tcpcloud"
+ salt_master_environment_revision: master
+ reclass_config_master: 192.168.10.90
+ single_address: 172.16.10.100
+ salt_master_host: 127.0.0.1
+ salt_master_base_environment: prd
+ salt_minion_ca_host: ${linux:network:fqdn}
+ salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ nginx:
+ server:
+ site:
+ nginx_proxy_openstack_web:
+ proxy:
+ host: prx
+ nginx_proxy_openstack_api_heat_cfn:
+ enabled: false
+ 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>>
+ openstack_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ openstack_control_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ openstack_control_node02_address:
+ value_template: <<node_control_ip>>
+ openstack_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ openstack_control_node03_address:
+ value_template: <<node_control_ip>>
+ openstack_compute:
+ expression: <<node_hostname>>__startswith__cmp
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.compute
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
+ openstack_gateway:
+ expression: <<node_hostname>>__startswith__gtw
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.gateway
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
+ cluster_param:
+ openstack_gateway_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>>
+ ceph_osd_node01:
+ expression: <<node_hostname>>__equals__osd01
+ cluster_param:
+ ceph_osd_node01_address:
+ value_template: <<node_control_ip>>
+ ceph_osd_node02:
+ expression: <<node_hostname>>__equals__osd02
+ cluster_param:
+ ceph_osd_node02_address:
+ value_template: <<node_control_ip>>
+ ceph_mon_node01:
+ expression: <<node_hostname>>__equals__cmn01
+ cluster_param:
+ ceph_mon_node01_address:
+ value_template: <<node_control_ip>>
+ ceph_mon_node02:
+ expression: <<node_hostname>>__equals__cmn02
+ cluster_param:
+ ceph_mon_node02_address:
+ value_template: <<node_control_ip>>
+ ceph_mon_node03:
+ expression: <<node_hostname>>__equals__cmn03
+ cluster_param:
+ ceph_mon_node03_address:
+ value_template: <<node_control_ip>>
+ openstack_dashboard:
+ expression: <<node_hostname>>__startswith__prx
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.dashboard
+ - cluster.<<node_cluster>>.openstack.proxy
+ cluster_param:
+ openstack_proxy_node01_address:
+ value_template: <<node_control_ip>>
+ node:
+ openstack_control_node01:
+ classes:
+ - service.galera.master.cluster
+ params:
+ mysql_cluster_role: master
+ linux_system_codename: xenial
+ openstack_control_node02:
+ classes:
+ - service.galera.slave.cluster
+ params:
+ mysql_cluster_role: slave
+ linux_system_codename: xenial
+ openstack_control_node03:
+ classes:
+ - service.galera.slave.cluster
+ params:
+ mysql_cluster_role: slave
+ linux_system_codename: xenial
+ stacklight_server_node01:
+ classes:
+ - system.influxdb.server.single
+ - system.influxdb.database.stacklight
+ openstack_compute_node01:
+ params:
+ single_address: 172.16.10.105
+ tenant_address: 10.1.0.105
+ external_address: 10.16.0.105
+ openstack_compute_node02:
+ params:
+ single_address: 172.16.10.106
+ tenant_address: 10.1.0.106
+ external_address: 10.16.0.106
+ openstack_gateway_node01:
+ params:
+ tenant_address: 10.1.0.110
+ external_address: 10.16.0.110
+ openstack_proxy_node01:
+ classes:
+ - cluster.virtual-mcp-ocata-ovs-ceph.openstack.proxy
+ params:
+ linux_system_codename: xenial
+ infra_storage_rack01:
+ name: osd0<<count>>
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.ceph.osd
+ repeat:
+ count: 2
+ start: 1
+ digits: 1
+ params:
+ ceph_crush_parent:
+ value: rack<<count>>
+ start: 1
+ single_address:
+ value: ceph_osd_node<<count>>_address
+ start: 1
+ digits: 2
+ interpolate: true
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: xenial
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/init.yml
new file mode 100644
index 0000000..b01723d
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/infra/init.yml
@@ -0,0 +1,14 @@
+parameters:
+ linux:
+ network:
+ 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}
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml
new file mode 100644
index 0000000..0d296ba
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml
@@ -0,0 +1,55 @@
+classes:
+- system.linux.network.dynamic_hosts
+- service.grafana.collector
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
+- system.linux.system.repo.mcp.extra
+- system.linux.system.single
+- system.rsyslog.client.single
+- system.prometheus.collector
+- system.telegraf.agent
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- cluster.virtual-mcp-ocata-ovs-ceph.infra
+- cluster.virtual-mcp-ocata-ovs-ceph.ceph
+- cluster.virtual-mcp-ocata-ovs-ceph.openstack
+- cluster.virtual-mcp-ocata-ovs-ceph.stacklight
+
+parameters:
+ _param:
+ cluster_domain: virtual-mcp-ocata-ovs-ceph.local
+ cluster_name: virtual-mcp-ocata-ovs-ceph
+ infra_config_hostname: cfg01
+ # infra service addresses
+ infra_config_address: 172.16.10.100
+ # openstack service addresses
+ openstack_proxy_address: 172.16.10.121
+ openstack_proxy_node01_address: 172.16.10.121
+ openstack_control_address: 172.16.10.254
+ openstack_control_node01_address: 172.16.10.101
+ openstack_control_node02_address: 172.16.10.102
+ openstack_control_node03_address: 172.16.10.103
+ openstack_gateway_address: 172.16.10.110
+ openstack_database_address: ${_param:openstack_control_address}
+ openstack_message_queue_address: ${_param:openstack_control_address}
+ openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+ openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+ openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+ # stacklight service addresses
+ stacklight_monitor_address: 172.16.10.253
+ stacklight_monitor_node01_address: 172.16.10.107
+ stacklight_monitor_node02_address: 172.16.10.108
+ stacklight_monitor_node03_address: 172.16.10.109
+ stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+ stacklight_log_address: ${_param:stacklight_monitor_address}
+ openstack_gateway_address: 172.16.10.110
+ openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+ stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+ # ceph addresses
+ ceph_osd_node01_address: 172.16.10.94
+ ceph_osd_node02_address: 172.16.10.95
+ ceph_mon_node01_address: 172.16.10.96
+ ceph_mon_node02_address: 172.16.10.97
+ ceph_mon_node03_address: 172.16.10.98
+
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml
new file mode 100644
index 0000000..f16b77e
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/compute.yml
@@ -0,0 +1,70 @@
+classes:
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.linux.network.hosts
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.ceilometer.agent.cluster
+- system.prometheus.exporters.libvirt
+- system.nova.compute.storage.ceph
+- system.ceph.common.cluster
+- cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+ _param:
+ primary_interface: ens4
+ tenant_interface: ens5
+ external_interface: ens6
+ interface_mtu: 9000
+ linux_system_codename: xenial
+ nova:
+ compute:
+ vncproxy_url: http://${_param:cluster_vip_address}:6080
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ notify_on:
+ state_change: vm_and_task_state
+ message_queue:
+ members:
+ - host: ${_param:openstack_control_node01_address}
+ - host: ${_param:openstack_control_node02_address}
+ - host: ${_param:openstack_control_node03_address}
+ linux:
+ network:
+ bridge: openvswitch
+ interface:
+ dhcp_int:
+ enabled: true
+ name: ens3
+ proto: dhcp
+ type: eth
+ mtu: ${_param:interface_mtu}
+ primary_interface:
+ enabled: true
+ name: ${_param:primary_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ tenant_interface:
+ enabled: true
+ name: ${_param:tenant_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ br-mgmt:
+ enabled: true
+ type: bridge
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - ${_param:primary_interface}
+ br-mesh:
+ enabled: true
+ type: bridge
+ proto: static
+ address: ${_param:tenant_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - ${_param:tenant_interface}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
new file mode 100644
index 0000000..7be99ab
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/control.yml
@@ -0,0 +1,110 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo.ceph
+- system.linux.system.repo.glusterfs
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- system.keystone.server.wsgi
+- system.keystone.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.glance
+- system.glusterfs.client.volume.keystone
+- system.glusterfs.server.volume.glance
+- system.glusterfs.server.volume.keystone
+- system.glusterfs.server.cluster
+- system.glance.control.cluster
+- system.nova.control.cluster
+- system.neutron.control.openvswitch.cluster
+- system.heat.server.cluster
+- system.ceilometer.server.cluster
+- system.ceilometer.server.backend.influxdb
+- system.aodh.server.cluster
+- system.heka.ceilometer_collector.single
+- system.galera.server.cluster
+- system.galera.server.database.aodh
+- system.galera.server.database.ceilometer
+- system.galera.server.database.cinder
+- system.galera.server.database.glance
+- system.galera.server.database.grafana
+- system.galera.server.database.heat
+- system.galera.server.database.keystone
+- system.galera.server.database.nova
+- system.haproxy.proxy.listen.openstack.nova-placement
+- system.glance.control.storage.ceph
+- system.cinder.control.backend.ceph
+- system.ceph.common.cluster
+- system.cinder.control.cluster
+- system.cinder.control.notification.messagingv2
+- system.cinder.volume.single
+- system.cinder.volume.notification.messagingv2
+- cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+ _param:
+ keepalived_vip_interface: ens4
+ linux:
+ system:
+ package:
+ python-msgpack:
+ version: latest
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ keepalived:
+ cluster:
+ instance:
+ VIP:
+ virtual_router_id: 150
+ keystone:
+ server:
+ admin_email: ${_param:admin_email}
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ glance:
+ server:
+ storage:
+ engine: file
+ images: []
+ workers: 1
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ heat:
+ server:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ neutron:
+ server:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ nova:
+ controller:
+ networking: dvr
+ cpu_allocation: 54
+ metadata:
+ password: ${_param:metadata_password}
+ vncproxy_url: http://${_param:cluster_vip_address}:6080
+ workers: 1
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ cinder:
+ volume:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
+ controller:
+ notification:
+ driver: messagingv2
+ topics: "notifications,${_param:stacklight_notification_topic}"
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/dashboard.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/dashboard.yml
new file mode 100644
index 0000000..f6c2bbd
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/dashboard.yml
@@ -0,0 +1,19 @@
+classes:
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.horizon.server.single
+- cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+ _param:
+ horizon_site_branding: OpenStack Dashboard
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml
new file mode 100644
index 0000000..dc29f34
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/gateway.yml
@@ -0,0 +1,78 @@
+classes:
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
+- system.neutron.gateway.cluster
+- cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+ _param:
+ primary_interface: ens4
+ tenant_interface: ens5
+ external_interface: ens6
+ interface_mtu: 9000
+ linux_system_codename: xenial
+ linux:
+ network:
+ bridge: openvswitch
+ interface:
+ dhcp_int:
+ enabled: true
+ name: ens3
+ proto: dhcp
+ type: eth
+ mtu: ${_param:interface_mtu}
+ primary_interface:
+ enabled: true
+ name: ${_param:primary_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ tenant_interface:
+ enabled: true
+ name: ${_param:tenant_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ external_interface:
+ enabled: true
+ name: ${_param:external_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ br-floating:
+ enabled: true
+ type: ovs_bridge
+ mtu: ${_param:interface_mtu}
+ br-mgmt:
+ enabled: true
+ type: bridge
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ mtu: ${_param:interface_mtu}
+ use_interfaces:
+ - ${_param:primary_interface}
+ br-mesh:
+ enabled: true
+ type: bridge
+ mtu: ${_param:interface_mtu}
+ proto: static
+ address: ${_param:tenant_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - ${_param:tenant_interface}
+ float-to-ex:
+ enabled: true
+ type: ovs_port
+ mtu: ${_param:interface_mtu}
+ bridge: br-floating
+ br-ex:
+ enabled: true
+ type: bridge
+ mtu: ${_param:interface_mtu}
+ address: ${_param:external_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - ${_param:external_interface}
+ use_ovs_ports:
+ - float-to-ex
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/init.yml
new file mode 100644
index 0000000..892f70e
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/init.yml
@@ -0,0 +1,152 @@
+parameters:
+ _param:
+ openstack_version: ocata
+ apt_mk_version: nightly
+ mcp_repo_version: 1.1
+ openstack_region: RegionOne
+ admin_email: root@localhost
+ cluster_public_protocol: http
+ cluster_public_host: 172.16.10.254
+ neutron_public_protocol: http
+ neutron_control_dvr: False
+ neutron_tenant_network_types: "flat,vxlan"
+ neutron_l3_ha: False
+ neutron_global_physnet_mtu: 1500
+ neutron_external_mtu: 1500
+ neutron_gateway_dvr: False
+ neutron_gateway_agent_mode: legacy
+ neutron_compute_dvr: False
+ neutron_compute_agent_mode: legacy
+ neutron_compute_external_access: False
+ galera_server_cluster_name: openstack_cluster
+ galera_server_maintenance_password: workshop
+ galera_server_admin_password: workshop
+ cluster_vip_address: 172.16.10.254
+ cluster_local_address: ${_param:single_address}
+ cluster_node01_hostname: ctl01
+ cluster_node01_address: 172.16.10.101
+ cluster_node02_hostname: ctl02
+ cluster_node02_address: 172.16.10.102
+ cluster_node03_hostname: ctl03
+ cluster_node03_address: 172.16.10.103
+ rabbitmq_secret_key: workshop
+ rabbitmq_admin_password: workshop
+ rabbitmq_openstack_password: workshop
+ rabbitmq_cold_password: workshop
+ glance_version: ${_param:openstack_version}
+ glance_service_host: ${_param:cluster_vip_address}
+ keystone_version: ${_param:openstack_version}
+ keystone_service_host: ${_param:cluster_vip_address}
+ heat_version: ${_param:openstack_version}
+ heat_service_host: ${_param:cluster_vip_address}
+ heat_domain_admin_password: workshop
+ ceilometer_version: ${_param:openstack_version}
+ ceilometer_service_host: ${_param:cluster_vip_address}
+ cinder_version: ${_param:openstack_version}
+ cinder_service_host: ${_param:cluster_vip_address}
+ aodh_version: ${_param:openstack_version}
+ aodh_service_host: ${_param:cluster_vip_address}
+ ceilometer_graphite_publisher_host: 172.16.10.107
+ ceilometer_graphite_publisher_port: 2013
+ nova_version: ${_param:openstack_version}
+ nova_service_host: ${_param:cluster_vip_address}
+ nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+ neutron_version: ${_param:openstack_version}
+ neutron_service_host: ${_param:cluster_vip_address}
+ glusterfs_service_host: ${_param:cluster_vip_address}
+ metadata_password: workshop
+ mysql_admin_user: root
+ mysql_admin_password: workshop
+ mysql_cinder_password: workshop
+ mysql_ceilometer_password: workshop
+ mysql_glance_password: workshop
+ mysql_grafana_password: workshop
+ mysql_heat_password: workshop
+ mysql_keystone_password: workshop
+ mysql_neutron_password: workshop
+ mysql_nova_password: workshop
+ mysql_aodh_password: workshop
+ keystone_service_token: workshop
+ keystone_admin_password: workshop
+ keystone_ceilometer_password: workshop
+ keystone_aodh_password: workshop
+ keystone_cinder_password: workshop
+ keystone_glance_password: workshop
+ keystone_heat_password: workshop
+ keystone_keystone_password: workshop
+ keystone_neutron_password: workshop
+ keystone_nova_password: workshop
+ ceilometer_secret_key: workshop
+ horizon_version: ${_param:openstack_version}
+ horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+ horizon_identity_host: ${_param:cluster_vip_address}
+ horizon_identity_encryption: none
+ horizon_identity_version: 2
+ mongodb_server_replica_set: ceilometer
+ mongodb_ceilometer_password: cloudlab
+ mongodb_admin_password: cloudlab
+ mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
+ ceilometer_influxdb_password: lmapass
+ # Ceph
+ cinder_storage_secret_uuid: "6e84ffc6-512f-4c0f-b2b7-df67cce14bb6"
+ nova_storage_secret_uuid: "6e84ffc6-512f-4c0f-b2b7-df67cce14bb6"
+ nova_storage_pool: vms
+ nova_storage_user: nova
+ cinder_storage_pool: volumes
+ cinder_storage_user: cinder
+ glance_storage_pool: images
+ glance_storage_user: glance
+ linux:
+ network:
+ purge_hosts: true
+ host:
+ prx:
+ address: ${_param:openstack_proxy_address}
+ names:
+ - prx
+ - prx.${_param:cluster_domain}
+ prx01:
+ address: ${_param:openstack_proxy_node01_address}
+ names:
+ - prx01
+ - prx01.${_param:cluster_domain}
+ ctl:
+ address: ${_param:openstack_control_address}
+ names:
+ - ctl
+ - ctl.${_param:cluster_domain}
+ ctl01:
+ address: ${_param:openstack_control_node01_address}
+ names:
+ - ctl01
+ - ctl01.${_param:cluster_domain}
+ ctl02:
+ address: ${_param:openstack_control_node02_address}
+ names:
+ - ctl02
+ - ctl02.${_param:cluster_domain}
+ ctl03:
+ address: ${_param:openstack_control_node03_address}
+ names:
+ - ctl03
+ - ctl03.${_param:cluster_domain}
+ gtw01:
+ address: ${_param:openstack_gateway_address}
+ names:
+ - gtw01
+ - gtw01.${_param:cluster_domain}
+ cmp01:
+ address: 172.16.10.105
+ names:
+ - cmp01
+ - cmp01.${_param:cluster_domain}
+ cmp02:
+ address: 172.16.10.106
+ names:
+ - cmp02
+ - cmp02.${_param:cluster_domain}
+ system:
+ user:
+ root:
+ name: root
+ password: false
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/proxy.yml
new file mode 100644
index 0000000..92a4c1b
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/proxy.yml
@@ -0,0 +1,15 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack_api
+- system.nginx.server.proxy.openstack_vnc
+- system.nginx.server.proxy.openstack_web
+- system.salt.minion.cert.proxy
+- cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+ _param:
+ nginx_proxy_ssl:
+ enabled: true
+ authority: ${_param:salt_minion_ca_authority}
+ engine: salt
+ mode: secure
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/client.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/client.yml
new file mode 100644
index 0000000..a9b1642
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/client.yml
@@ -0,0 +1,22 @@
+classes:
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+- cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+ _param:
+ # Elasticsearch/Kibana client parameters
+ stacklight_log_address: ${_param:stacklight_monitor_address}
+ # Grafana client parameters
+ grafana_address: ${_param:stacklight_monitor_address}
+ grafana_port: 15013
+ grafana_user: admin
+ grafana_password: ${_param:grafana_admin_password}
+ grafana_prometheus_address: ${_param:stacklight_monitor_address}
+ grafana_prometheus_port: 15016
+
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/init.yml
new file mode 100644
index 0000000..883bad0
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/init.yml
@@ -0,0 +1,35 @@
+parameters:
+ _param:
+ linux_system_codename: xenial
+ prometheus_control_address: ${_param:stacklight_monitor_address}
+ heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+ elasticsearch_port: 9200
+ stacklight_environment: ${_param:cluster_domain}
+ stacklight_notification_topic: stacklight_notifications
+ grafana_admin_password: admin
+ grafana_database_type: mysql
+ grafana_database_host: ${_param:openstack_database_address}
+ grafana_database_password: ${_param:mysql_grafana_password}
+ linux:
+ network:
+ host:
+ mon:
+ address: ${_param:stacklight_monitor_address}
+ names:
+ - mon
+ - mon.${_param:cluster_domain}
+ mon01:
+ address: ${_param:stacklight_monitor_node01_address}
+ names:
+ - mon01
+ - mon01.${_param:cluster_domain}
+ mon02:
+ address: ${_param:stacklight_monitor_node02_address}
+ names:
+ - mon02
+ - mon02.${_param:cluster_domain}
+ mon03:
+ address: ${_param:stacklight_monitor_node03_address}
+ names:
+ - mon03
+ - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/proxy.yml
new file mode 100644
index 0000000..018b206
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/proxy.yml
@@ -0,0 +1,17 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
+- system.salt.minion.cert.proxy
+- cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+ _param:
+ nginx_proxy_grafana_port: 15013
+ nginx_proxy_ssl:
+ enabled: true
+ authority: ${_param:salt_minion_ca_authority}
+ engine: salt
+ mode: secure
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml
new file mode 100644
index 0000000..1f95bb9
--- /dev/null
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/stacklight/server.yml
@@ -0,0 +1,73 @@
+classes:
+- system.docker.host
+- system.linux.system.repo.influxdb
+- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.elasticsearch
+- system.linux.system.repo.kibana
+- system.linux.system.repo.docker
+- system.heka.remote_collector.container
+- system.heka.remote_collector.input.amqp
+- system.heka.remote_collector.output.elasticsearch
+- system.heka.remote_collector.output.telegraf
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
+- service.haproxy.proxy.single
+- system.influxdb.relay.cluster
+- system.influxdb.server.single
+- system.influxdb.database.stacklight
+- system.influxdb.database.ceilometer
+- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
+- system.prometheus.server.remote_write.docker
+- system.prometheus.server.alertmanager.dns
+- system.prometheus.server.target.dns
+- system.docker.swarm.stack.monitoring
+- system.docker.swarm.stack.monitoring.remote_collector
+- system.docker.swarm.stack.dashboard
+- cluster.virtual-mcp-ocata-ovs-ceph
+parameters:
+ _param:
+ heka_amqp_host: ${_param:openstack_control_address}
+ kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+ keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
+ keepalived_prometheus_vip_password: 'password'
+ keepalived_prometheus_vip_interface: ens4
+ cluster_vip_address: ${_param:stacklight_monitor_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_elasticsearch_port: 9200
+ cluster_kibana_port: 5601
+ cluster_node01_hostname: mon01
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_hostname: mon02
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_hostname: mon03
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+ docker_image_alertmanager: docker-prod-virtual.docker.mirantis.net/openstack-docker/alertmanager:latest
+ docker_image_pushgateway: docker-prod-virtual.docker.mirantis.net/openstack-docker/pushgateway:latest
+ docker_image_prometheus: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus:latest
+ docker_image_remote_agent: docker-prod-virtual.docker.mirantis.net/openstack-docker/telegraf:latest
+ docker_image_remote_storage_adapter: docker-prod-virtual.docker.mirantis.net/openstack-docker/remote_storage_adapter:latest
+ docker_image_remote_collector: docker-prod-virtual.docker.mirantis.net/openstack-docker/heka:latest
+ docker_image_prometheus_relay: docker-prod-virtual.docker.mirantis.net/openstack-docker/prometheus_relay:latest
+ docker_image_grafana: grafana/grafana:4.5.2
+ influxdb_port: 8086
+ influxdb_admin_password: password
+ influxdb_stacklight_password: lmapass
+ prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
+ prometheus_influxdb_db: lma
+ prometheus_influxdb_username: lma
+ prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+ remote_collector_telegraf_host: monitoring_remote_agent
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
index 81d89f7..5430906 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
@@ -108,6 +108,8 @@
rndc_host: ${_param:openstack_control_node03_address}
rndc_port: 953
rndc_key_file: /etc/designate/rndc.key
+ quota:
+ zones: ${_param:designate_quota_zones}
worker:
enabled: ${_param:designate_worker_enabled}
glance:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
index b564e0b..c1130e2 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
@@ -35,6 +35,7 @@
rabbitmq_cold_password: workshop
designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_quota_zones: 40
designate_pool_ns_records:
- hostname: 'ns1.example.org.'
priority: 10
diff --git a/classes/cluster/virtual-mcp11-aio/.env b/classes/cluster/virtual-mcp11-aio/.env
index 5b16136..e138b42 100644
--- a/classes/cluster/virtual-mcp11-aio/.env
+++ b/classes/cluster/virtual-mcp11-aio/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables)
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index f1b70a8..03d7636 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -121,7 +121,7 @@
openstack_public_neutron_subnet_allocation_start: 192.168.130.10
openstack_public_neutron_subnet_allocation_end: 192.168.130.254
barbican_simple_crypto_kek: YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY=
- barbican_integration_enabled: True
+ barbican_integration_enabled: False
galera:
master:
members: ~
@@ -147,7 +147,7 @@
nova:
compute:
barbican:
- enable: ${_param:barbican_integration_enabled}
+ enabled: ${_param:barbican_integration_enabled}
vncproxy_url: http://${_param:single_address}:6080
network:
user: neutron
diff --git a/classes/cluster/virtual-mcp11-dvr/.env b/classes/cluster/virtual-mcp11-dvr/.env
new file mode 100644
index 0000000..1409139
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-dvr/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf"
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
index 79a552f..6ee687b 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
- system.kubernetes.pool.cluster
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
index 8d637ca..66c3264 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
@@ -23,7 +23,7 @@
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_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.5-2
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
index 7f42665..c84a223 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
- system.kubernetes.pool.cluster
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
index ec62a19..88e93e8 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
@@ -22,7 +22,7 @@
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.7.5-2
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index e1325ea..405b75a 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
- system.kubernetes.pool.cluster
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index 0e1c8ff..ea70dcc 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -23,7 +23,7 @@
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_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.5-2
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 1935ae4..f9bad77 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
- system.kubernetes.pool.cluster
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index bbe5de9..740c4fe 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -25,7 +25,7 @@
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
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.5-2
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/virtual-mcp11-ovs/.env b/classes/cluster/virtual-mcp11-ovs/.env
new file mode 100644
index 0000000..1409139
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-ovs/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf"
diff --git a/classes/system b/classes/system
index fe4aa38..1cf016f 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit fe4aa384d17b441219c2f0da24d9cc3bb711ccef
+Subproject commit 1cf016fcf3f283df4215efb7697b3a4dcfe4c9ac
diff --git a/scripts/bootstrap_all.sh b/scripts/bootstrap_all.sh
index 445464e..2219d00 100755
--- a/scripts/bootstrap_all.sh
+++ b/scripts/bootstrap_all.sh
@@ -5,12 +5,16 @@
K8S_BOOTSTRAP=$(salt -C 'I@kubernetes:master' test.ping 1>/dev/null 2>&1 && echo true)
OPENSTACK_BOOTSTRAP=$(salt -C 'I@nova:controller' test.ping 1>/dev/null 2>&1 && echo true)
OPENCONTRAIL_BOOTSTRAP=$(salt -C 'I@opencontrail:control' test.ping 1>/dev/null 2>&1 && echo true)
+OSS_BOOTSTRAP=$(salt -C 'I@devops_portal:config' test.ping 1>/dev/null 2>&1 && echo true)
STACKLIGHTV2_BOOTSTRAP=$(salt -C 'I@prometheus:server' test.ping 1>/dev/null 2>&1 && echo true)
"$CWD"/config_verify.sh
"$CWD"/infra_install.sh
"$CWD"/core_services_install.sh
-if [[ "$STACKLIGHTV2_BOOTSTRAP" == "true" ]]; then
+if [[ "$OSS_BOOTSTRAP" == "true" ]]; then
+ "$CWD"/oss_install.sh infra
+fi
+if [[ "$STACKLIGHTV2_BOOTSTRAP" == "true" ]] || [[ "$OSS_BOOTSTRAP" == "true" ]]; then
"$CWD"/docker_swarm_install.sh
fi
if [[ "$K8S_BOOTSTRAP" == "true" ]]; then
@@ -30,3 +34,6 @@
if [[ "$STACKLIGHTV2_BOOTSTRAP" == "true" ]]; then
"$CWD"/stacklightv2_infra_install.sh
fi
+if [[ "$OSS_BOOTSTRAP" == "true" ]]; then
+ "$CWD"/oss_install.sh services
+fi
diff --git a/scripts/oss_install.sh b/scripts/oss_install.sh
new file mode 100755
index 0000000..2c3211f
--- /dev/null
+++ b/scripts/oss_install.sh
@@ -0,0 +1,40 @@
+#!/bin/bash -x
+exec > >(tee -i /tmp/"$(basename "$0" .sh)"_"$(date '+%Y-%m-%d_%H-%M-%S')".log) 2>&1
+
+install_infra () {
+ # DOP config and rundeck files should be created before container start
+ salt -C 'I@devops_portal:config' state.sls devops_portal.config
+ salt -C 'I@rundeck:server' state.sls rundeck.server
+}
+
+install_services () {
+ # Up containers
+ salt -C 'I@docker:swarm:role:master' state.sls docker.client
+
+ # XXX: first run may fails
+ salt -C 'I@postgresql:client' cmd.run 'while true; do if docker service logs postgresql_db | grep "ready to accept"; then break; else sleep 5; fi; done'
+ for i in $(seq 2); do
+ salt -C 'I@postgresql:client' state.sls postgresql.client
+ sleep 10
+ done
+
+ # Rundeck client, jobs, and etc
+ salt -C 'I@rundeck:client' cmd.run 'while true; do curl -sf 172.16.10.254:4440 >/dev/null && break; done'
+ salt -C 'I@rundeck:client' state.sls rundeck.client
+
+ # ElasticSearch indicies
+ salt -C 'I@elasticsearch:client' cmd.run 'while true; do curl -sf 172.16.10.254:9200 >/dev/null && break; done'
+ for i in $(seq 3); do
+ salt -C 'I@elasticsearch:client' state.sls elasticsearch.client
+ sleep 10
+ done
+}
+
+case "$1" in
+ "infra")
+ install_infra
+ ;;
+ "services")
+ install_services
+ ;;
+esac