Merge "Update local kitchen-salt, model validation scripts"
diff --git a/README.rst b/README.rst
index c9aabc6..51ba437 100755
--- a/README.rst
+++ b/README.rst
@@ -74,7 +74,7 @@
* virtual-mcp-ocata-dvr
* virtual-mcp-ocata-ovs
-MCP Kunbernetes
+MCP Kubernetes
---------------
Deployment:
@@ -88,6 +88,7 @@
* k8s-ha-calico
* k8s-ha-calico-syndic
* k8s-ha-contrail
+* k8s-ha-calico-flannel-virtlet
Stacklight
----------
diff --git a/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml b/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml
index 7b74e37..3d76431 100644
--- a/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml
+++ b/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml
@@ -27,6 +27,7 @@
- system.openldap.client.people.admin
# PostgreSQL
- system.postgresql.client.pushkin
+ - system.postgresql.client.pushkin.security_monkey
- system.postgresql.client.rundeck
- system.postgresql.client.security_monkey
diff --git a/classes/cluster/drivetrain-ha-oss/oss/client.yml b/classes/cluster/drivetrain-ha-oss/oss/client.yml
index dc99d6e..9239169 100644
--- a/classes/cluster/drivetrain-ha-oss/oss/client.yml
+++ b/classes/cluster/drivetrain-ha-oss/oss/client.yml
@@ -29,11 +29,12 @@
# PostgreSQL
- system.postgresql.client.pushkin
- - system.postgresql.client.rundeck
+ - system.postgresql.client.pushkin.security_monkey
+ - system.postgresql.client.pushkin.janitor_monkey
+ - system.postgresql.client.pushkin.sfdc
+ - system.postgresql.client.pushkin.alertmanager
- system.postgresql.client.security_monkey
- - system.postgresql.client.janitor_monkey
- - system.postgresql.client.sfdc
- - system.postgresql.client.alertmanager
+ - system.postgresql.client.rundeck
# Elasticsearch
- system.elasticsearch.client
diff --git a/classes/cluster/drivetrain-ha/cicd/control/master.yml b/classes/cluster/drivetrain-ha/cicd/control/master.yml
index 40d881e..3798bf5 100644
--- a/classes/cluster/drivetrain-ha/cicd/control/master.yml
+++ b/classes/cluster/drivetrain-ha/cicd/control/master.yml
@@ -27,6 +27,7 @@
- system.openldap.client.people.admin
# PostgreSQL
- system.postgresql.client.pushkin
+ - system.postgresql.client.pushkin.security_monkey
- system.postgresql.client.rundeck
- system.postgresql.client.security_monkey
diff --git a/classes/cluster/drivetrain-ha/infra/config.yml b/classes/cluster/drivetrain-ha/infra/config.yml
index a360806..5691518 100644
--- a/classes/cluster/drivetrain-ha/infra/config.yml
+++ b/classes/cluster/drivetrain-ha/infra/config.yml
@@ -1,5 +1,6 @@
classes:
- system.linux.system.repo.mcp.salt
+ - system.linux.system.repo.mcp.extra
- system.salt.master.pkg
- system.salt.master.api
- system.salt.minion.ca.salt_master
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/init.yml b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
index 38acf28..6e46f13 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
@@ -23,10 +23,10 @@
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.8.6-5
- kubernetes_virtlet_image: mirantis/virtlet:latest
- kubernetes_criproxy_version: v0.9.4
- kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
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"
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
index ccbd551..fdde5b2 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
@@ -16,7 +16,7 @@
etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
# component docker images
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
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-compact/kubernetes/init.yml b/classes/cluster/k8s-compact/kubernetes/init.yml
index 5c62919..9e8e135 100644
--- a/classes/cluster/k8s-compact/kubernetes/init.yml
+++ b/classes/cluster/k8s-compact/kubernetes/init.yml
@@ -32,9 +32,9 @@
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-local.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
- kubernetes_virtlet_image: mirantis/virtlet:latest
- kubernetes_criproxy_version: v0.9.4
- kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
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"
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
index a594585..4fa8ad2 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
@@ -10,7 +10,7 @@
kubernetes_calico_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.8.6-5
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
docker:
host:
pkgs:
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/.env b/classes/cluster/k8s-ha-calico-flannel-virtlet/.env
new file mode 100644
index 0000000..407e2d1
--- /dev/null
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/.env
@@ -0,0 +1 @@
+EXTRA_FORMULAS="ntp"
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/MAINTAINERS b/classes/cluster/k8s-ha-calico-flannel-virtlet/MAINTAINERS
new file mode 100644
index 0000000..458882c
--- /dev/null
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/MAINTAINERS
@@ -0,0 +1 @@
+Andrey Shestakov <ashestakov@mirantis.com>
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/config.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/config.yml
new file mode 100644
index 0000000..ef9ae97
--- /dev/null
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/config.yml
@@ -0,0 +1,81 @@
+classes:
+- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.salt
+- system.openssh.client.lab
+- system.salt.master.pkg
+- system.salt.minion.ca.salt_master
+- system.salt.master.api
+- system.salt.minion.cert.k8s_server
+- system.reclass.storage.salt
+- system.reclass.storage.system.kubernetes_control_cluster
+- cluster.k8s-ha-calico-flannel-virtlet
+parameters:
+ _param:
+ salt_master_base_environment: prd
+ reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab.git"
+ reclass_data_revision: master
+ reclass_config_master: ${_param:infra_config_deploy_address}
+ single_address: ${_param:infra_config_address}
+ 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
+ salt_master_environment_revision: master
+ salt_master_environment_repository: 'https://github.com/salt-formulas'
+ 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>>
+ deploy_address:
+ value_template: <<node_deploy_ip>>
+ infra_config:
+ expression: <<node_hostname>>__startswith__cfg
+ cluster_param:
+ infra_config_address:
+ value_template: <<node_control_ip>>
+ infra_config_deploy_address:
+ value_template: <<node_deploy_ip>>
+ cluster_domain:
+ value_template: <<node_domain>>
+ kubernetes_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ kubernetes_control_node01_address:
+ value_template: <<node_control_ip>>
+ kubernetes_control_node01_deploy_address:
+ value_template: <<node_deploy_ip>>
+ kubernetes_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ kubernetes_control_node02_address:
+ value_template: <<node_control_ip>>
+ kubernetes_control_node02_deploy_address:
+ value_template: <<node_deploy_ip>>
+ kubernetes_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ kubernetes_control_node03_address:
+ value_template: <<node_control_ip>>
+ kubernetes_control_node03_deploy_address:
+ value_template: <<node_deploy_ip>>
+ 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-ha-calico-flannel-virtlet/infra/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/init.yml
new file mode 100644
index 0000000..e7a02fa
--- /dev/null
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/infra/init.yml
@@ -0,0 +1,28 @@
+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.all
+parameters:
+ _param:
+ # infra service addresses
+ infra_config_hostname: cfg01
+ infra_config_address: 172.16.10.100
+ infra_config_deploy_address: 192.168.10.90
+
+ cluster_domain: k8s-ha-calico-flannel-virtlet.local
+ cluster_name: k8s-ha-calico-flannel-virtlet
+ apt_mk_version: nightly
+ primary_interface: ens3
+ linux:
+ network:
+ host:
+ cfg01:
+ address: ${_param:infra_config_address}
+ names:
+ - ${_param:infra_config_hostname}
+ - ${_param:infra_config_hostname}.${_param:cluster_domain}
+ system:
+ name: ${_param:infra_config_hostname}
+ domain: ${_param:cluster_domain}
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/init.yml
new file mode 100644
index 0000000..bbe3cbe
--- /dev/null
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/init.yml
@@ -0,0 +1,5 @@
+classes:
+- system.linux.network.dynamic_hosts
+- cluster.k8s-ha-calico-flannel-virtlet.kubernetes
+- cluster.k8s-ha-calico-flannel-virtlet.infra
+- cluster.overrides
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
new file mode 100644
index 0000000..1cd7106
--- /dev/null
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
@@ -0,0 +1,75 @@
+classes:
+- system.linux.system.repo.docker_legacy
+- system.kubernetes.pool.cluster
+- system.linux.network.hosts
+- system.salt.minion.cert.k8s_client
+- system.salt.minion.cert.etcd_client
+- cluster.k8s-ha-calico-flannel-virtlet
+parameters:
+ docker:
+ host:
+ pkgs:
+ - ${_param:kubernetes_docker_package}
+ - python-docker
+ options:
+ bip: 172.31.255.1/24
+ storage-driver: overlay2
+ kubernetes:
+ pool:
+ kubelet:
+ address: ${_param:single_address}
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
+ network:
+ genie:
+ enabled: true
+ default_plugin: calico
+ image: ${_param:kubernetes_genie_image}
+ flannel:
+ enabled: true
+ calico:
+ enabled: true
+ image: ${_param:kubernetes_calico_image}
+ calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
+ cni_image: ${_param:kubernetes_calico_cni_image}
+ etcd:
+ ssl:
+ enabled: true
+ common:
+ addons:
+ virtlet:
+ enabled: ${_param:kubernetes_virtlet_enabled}
+ namespace: ${_param:kubernetes_addon_namespace}
+ image: ${_param:kubernetes_virtlet_image}
+ criproxy_version: ${_param:kubernetes_criproxy_version}
+ criproxy_source: ${_param:kubernetes_criproxy_checksum}
+ hosts:
+ - ${_param:kubernetes_compute01_hostname}
+ hyperkube:
+ image: ${_param:kubernetes_hyperkube_image}
+ linux:
+ network:
+ resolv:
+ dns:
+ - 10.254.0.10
+ - 172.18.176.4
+ - 172.18.176.7
+ 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:deploy_address}
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: '255.255.255.0'
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
new file mode 100644
index 0000000..6f6229c
--- /dev/null
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -0,0 +1,80 @@
+classes:
+- service.etcd.server.cluster
+- service.kubernetes.control.cluster
+- service.kubernetes.control.cluster-admin
+- system.haproxy.proxy.listen.kubernetes.apiserver
+- system.linux.system.repo.docker_legacy
+- system.salt.minion.cert.etcd_server
+- system.kubernetes.master.cluster
+- cluster.k8s-ha-calico-flannel-virtlet.kubernetes.compute
+- cluster.k8s-ha-calico-flannel-virtlet
+parameters:
+ _param:
+ keepalived_vip_interface: ${_param:primary_interface}
+ keepalived_vip_virtual_router_id: 60
+ etcd:
+ server:
+ bind:
+ host: ${_param:deploy_address}
+ source:
+ engine: docker_hybrid
+ ssl:
+ enabled: true
+ setup:
+ calico:
+ key: /calico/v1/ipam/v4/pool/${_param:calico_private_network}-${_param:calico_private_netmask}
+ value: '{"masquerade":true,"cidr":"${_param:calico_private_network}/${_param:calico_private_netmask}"}'
+ kubernetes:
+ common:
+ addons:
+ dashboard:
+ enabled: ${_param:kubernetes_dashboard}
+ image: ${_param:kubernetes_dashboard_image}
+ helm:
+ enabled: ${_param:kubernetes_helm_enabled}
+ calico_policy:
+ enabled: ${_param:kubernetes_calico_policy_enabled}
+ image: ${_param:kubernetes_calico_policy_image}
+ netchecker:
+ enabled: ${_param:kubernetes_netchecker_enabled}
+ agent_image: ${_param:kubernetes_netchecker_agent_image}
+ server_image: ${_param:kubernetes_netchecker_server_image}
+ 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:
+ enabled: ${_param:kubernetes_externaldns_enabled}
+ image: ${_param:kubernetes_externaldns_image}
+ provider: ${_param:kubernetes_externaldns_provider}
+ master:
+ kubelet:
+ address: ${_param:single_address}
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
+ etcd:
+ ssl:
+ enabled: true
+ network:
+ genie:
+ enabled: true
+ default_plugin: calico
+ image: ${_param:kubernetes_genie_image}
+ flannel:
+ enabled: true
+ private_ip_range: 10.20.0.0/16
+ calico:
+ enabled: true
+ etcd:
+ ssl:
+ enabled: true
+ namespace:
+ netchecker:
+ enabled: true
+ auth:
+ mode: Node,RBAC
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
new file mode 100644
index 0000000..cd92306
--- /dev/null
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
@@ -0,0 +1,115 @@
+parameters:
+ _param:
+ salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+
+ # kubelet
+ kubelet_fail_on_swap: True
+
+ # kubernetes settings
+ kubernetes_admin_user: admin
+ kubernetes_admin_password: sbPfel23ZigJF3Bm
+ kubernetes_admin_token: PpP6Mm3pAoPVqcKOKUu0x1dh7b1959Fi
+ kubernetes_kubelet_token: JJ2PKHxjiU6EYvIt18BqwdSK1HvWh8pt
+ kubernetes_kube-proxy_token: jT0hJk9L6cIw5UpYDNhsRwcj3Z2n62B6
+ kubernetes_scheduler_token: VgkUHfrW07zNxrb0ucFyX7NBnSJN9Xp6
+ kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
+ kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
+ etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
+
+ # docker package version
+ kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
+
+ # component docker images
+ kubernetes_calico_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.8.11-9
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
+ 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"
+ kubernetes_genie_image: mirantis/cnigenie:latest
+
+ # 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
+
+ # 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_compute01_hostname: cmp0
+ kubernetes_control_node01_address: 172.16.10.101
+ kubernetes_control_node02_address: 172.16.10.102
+ kubernetes_control_node03_address: 172.16.10.103
+ kubernetes_control_node01_deploy_address: 192.168.10.101
+ kubernetes_control_node02_deploy_address: 192.168.10.102
+ kubernetes_control_node03_deploy_address: 192.168.10.103
+
+ cluster_vip_address: ${_param:kubernetes_control_address}
+ cluster_local_address: ${_param:deploy_address}
+
+ # etcd stuff
+ cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}
+ cluster_node01_address: ${_param:kubernetes_control_node01_deploy_address}
+ cluster_node01_port: 4001
+ cluster_node02_hostname: ${_param:kubernetes_control_node02_hostname}
+ cluster_node02_address: ${_param:kubernetes_control_node02_deploy_address}
+ cluster_node02_port: 4001
+ cluster_node03_hostname: ${_param:kubernetes_control_node03_hostname}
+ cluster_node03_address: ${_param:kubernetes_control_node03_deploy_address}
+ cluster_node03_port: 4001
+
+ # calico
+ calico_private_network: 192.168.0.0
+ calico_private_netmask: 16
+
+ # component docker images
+ kubernetes_externaldns_image: mirantis/external-dns:latest
+ kubernetes_externaldns_provider: coredns
+
+ # switches of addons
+ kubernetes_coredns_enabled: false
+ kubernetes_externaldns_enabled: false
+
+ linux:
+ network:
+ host:
+ ctl:
+ address: ${_param:kubernetes_control_address}
+ names:
+ - ${_param:kubernetes_control_hostname}
+ - ${_param:kubernetes_control_hostname}.${_param:cluster_domain}
+ ctl01:
+ address: ${_param:kubernetes_control_node01_address}
+ names:
+ - ${_param:kubernetes_control_node01_hostname}
+ - ${_param:kubernetes_control_node01_hostname}.${_param:cluster_domain}
+ ctl02:
+ address: ${_param:kubernetes_control_node02_address}
+ names:
+ - ${_param:kubernetes_control_node02_hostname}
+ - ${_param:kubernetes_control_node02_hostname}.${_param:cluster_domain}
+ ctl03:
+ address: ${_param:kubernetes_control_node03_address}
+ names:
+ - ${_param:kubernetes_control_node03_hostname}
+ - ${_param:kubernetes_control_node03_hostname}.${_param:cluster_domain}
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
index 2718fc1..9871b70 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
@@ -10,7 +10,7 @@
kubernetes_calico_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.8.6-5
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
docker:
host:
pkgs:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 67b29eb..7efad95 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -26,10 +26,10 @@
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.8.6-5
- kubernetes_virtlet_image: mirantis/virtlet:latest
- kubernetes_criproxy_version: v0.9.4
- kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
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
diff --git a/classes/cluster/k8s-ha-contrail/infra/config.yml b/classes/cluster/k8s-ha-contrail/infra/config.yml
index 3d7cbd0..d439773 100644
--- a/classes/cluster/k8s-ha-contrail/infra/config.yml
+++ b/classes/cluster/k8s-ha-contrail/infra/config.yml
@@ -1,11 +1,12 @@
classes:
+- system.linux.system.single
- system.linux.system.repo.ubuntu
- system.linux.system.repo.mcp.salt
- system.openssh.client.lab
- system.salt.master.pkg
-- system.salt.minion.ca.salt_master
- system.salt.master.api
- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
- system.salt.minion.cert.k8s_server
- system.reclass.storage.system.kubernetes_control_cluster
- system.reclass.storage.system.opencontrail_control_cluster
@@ -35,6 +36,15 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
+ pre_up_cmds:
+ - "iptables -t nat -A POSTROUTING -o ens3 -j MASQUERADE"
+ post_down_cmds:
+ - "iptables -t nat -F POSTROUTING"
+ system:
+ kernel:
+ sysctl:
+ net.ipv4.conf.ens3.forwarding: 1
+ net.ipv4.conf.ens3.send_redirects: 0
reclass:
storage:
class_mapping:
diff --git a/classes/cluster/k8s-ha-contrail/infra/init.yml b/classes/cluster/k8s-ha-contrail/infra/init.yml
index 5fbbbea..d5fe565 100644
--- a/classes/cluster/k8s-ha-contrail/infra/init.yml
+++ b/classes/cluster/k8s-ha-contrail/infra/init.yml
@@ -1,7 +1,3 @@
-classes:
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
parameters:
_param:
# infra service addresses
diff --git a/classes/cluster/k8s-ha-contrail/init.yml b/classes/cluster/k8s-ha-contrail/init.yml
index ee4126e..de3fa9b 100644
--- a/classes/cluster/k8s-ha-contrail/init.yml
+++ b/classes/cluster/k8s-ha-contrail/init.yml
@@ -1,6 +1,8 @@
classes:
- system.linux.network.dynamic_hosts
+- system.linux.system.repo.mcp.extra
- system.linux.system.single
+- system.rsyslog.client.single
- cluster.k8s-ha-contrail.kubernetes
- cluster.k8s-ha-contrail.opencontrail
- cluster.k8s-ha-contrail.infra
@@ -9,3 +11,16 @@
- system.openssh.server.team.mcp_qa
- system.openssh.server.team.k8s_team
- cluster.overrides
+parameters:
+ salt:
+ minion:
+ trusted_ca_minions:
+ - cfg01
+ linux:
+ network:
+ host:
+ vsrx1:
+ address: 172.16.10.131
+ names:
+ - vsrx1
+ - vsrx1.${_param:cluster_domain}
\ No newline at end of file
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index 67e7296..761da5c 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -24,10 +24,10 @@
# component docker images
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.8.6-5
- kubernetes_virtlet_image: mirantis/virtlet:latest
- kubernetes_criproxy_version: v0.9.4
- kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
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
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
index 0c101cc..50e7e6d 100644
--- a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
@@ -6,14 +6,15 @@
- 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.resource.global_vrouter_config
- system.haproxy.proxy.listen.opencontrail.analytics
+- system.rabbitmq.server.cluster
- cluster.k8s-ha-contrail
parameters:
_param:
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/init.yml b/classes/cluster/k8s-ha-contrail/opencontrail/init.yml
index cd3445a..7ed1b19 100644
--- a/classes/cluster/k8s-ha-contrail/opencontrail/init.yml
+++ b/classes/cluster/k8s-ha-contrail/opencontrail/init.yml
@@ -1,6 +1,7 @@
parameters:
_param:
opencontrail_version: 3.0
+ linux_repo_contrail_component: oc323
opencontrail_control_hostname: ntw
opencontrail_control_node01_hostname: ntw01
opencontrail_control_node02_hostname: ntw02
diff --git a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
index c3a531d..4a4fab2 100644
--- a/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-40/opencontrail/control.yml
@@ -20,6 +20,7 @@
- cluster.os-ha-contrail-40
parameters:
_param:
+ openstack_version: mitaka
keepalived_vip_interface: ${_param:opencontrail_control_interface_name}
cluster_vip_address: ${_param:opencontrail_control_address}
cluster_local_address: ${_param:single_address}
diff --git a/classes/cluster/os-ha-contrail/opencontrail/control.yml b/classes/cluster/os-ha-contrail/opencontrail/control.yml
index ff21331..239ecf9 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail/opencontrail/control.yml
@@ -1,10 +1,11 @@
classes:
- system.linux.system.lowmem
-- system.linux.system.repo.cassandra
- system.linux.system.repo.mcp.contrail
-- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo.mcp.apt_mirantis.cassandra
- system.opencontrail.client.resource.edge_router
- system.opencontrail.control.cluster
- system.opencontrail.client.cluster
diff --git a/classes/cluster/sl-k8s-calico/.env b/classes/cluster/sl-k8s-calico/.env
new file mode 100644
index 0000000..13e6475
--- /dev/null
+++ b/classes/cluster/sl-k8s-calico/.env
@@ -0,0 +1 @@
+FORMULAS_SALT_MASTER+=(fluentd git grafana linux nginx ntp openssh prometheus reclass rsyslog salt sphinx telegraf backupninja)
diff --git a/classes/cluster/sl-k8s-calico/infra/config.yml b/classes/cluster/sl-k8s-calico/infra/config.yml
index 8fbede6..88cc695 100644
--- a/classes/cluster/sl-k8s-calico/infra/config.yml
+++ b/classes/cluster/sl-k8s-calico/infra/config.yml
@@ -1,9 +1,7 @@
classes:
-- system.docker.client
-- system.docker.host
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.docker
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.minion.ca.salt_master
@@ -24,7 +22,7 @@
single_address: ${_param:infra_config_address}
linux_system_codename: xenial
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
- salt_master_host: 127.0.0.1
+ salt_master_host: ${_param:infra_config_deploy_address}
salt:
master:
reactor:
@@ -43,7 +41,7 @@
salt_master_host:
value_template: <<node_master_ip>>
infra_config:
- expression: <<node_hostname>>__startswith__cfg
+ expression: <<node_hostname>>__equals__cfg01
cluster_param:
infra_config_address:
value_template: <<node_control_ip>>
@@ -76,24 +74,36 @@
node_class:
value_template:
- cluster.<<node_cluster>>.kubernetes.compute
+ node_param:
+ deploy_address:
+ value_template: <<node_deploy_ip>>
stacklight_monitor01:
expression: <<node_hostname>>__equals__mon01
cluster_param:
- stacklight_monitor_node01_address:
+ stacklight_node01_address:
value_template: <<node_control_ip>>
stacklight_monitor02:
expression: <<node_hostname>>__equals__mon02
cluster_param:
- stacklight_monitor_node02_address:
+ stacklight_node02_address:
value_template: <<node_control_ip>>
stacklight_monitor03:
expression: <<node_hostname>>__equals__mon03
cluster_param:
- stacklight_monitor_node03_address:
+ stacklight_node03_address:
value_template: <<node_control_ip>>
node:
- stacklight_server_node01:
- name: ${_param:stacklight_monitor_node01_hostname}
+ prx_node:
+ name: ${_param:kubernetes_proxy_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.stacklight.proxy
+ params:
+ salt_master_host: ${_param:infra_config_deploy_address}
+ linux_system_codename: xenial
+ single_address: ${_param:kubernetes_proxy_node01_address}
+ stacklight_node01:
+ name: ${_param:stacklight_node01_hostname}
domain: ${_param:cluster_domain}
classes:
- service.galera.master.cluster
@@ -103,11 +113,11 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:stacklight_monitor_node01_address}
+ single_address: ${_param:stacklight_node01_address}
keepalived_vip_priority: 100
mysql_cluster_role: master
- stacklight_server_node02:
- name: ${_param:stacklight_monitor_node02_hostname}
+ stacklight_node02:
+ name: ${_param:stacklight_node02_hostname}
domain: ${_param:cluster_domain}
classes:
- service.galera.slave.cluster
@@ -116,11 +126,11 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:stacklight_monitor_node02_address}
+ single_address: ${_param:stacklight_node02_address}
keepalived_vip_priority: 101
mysql_cluster_role: slave
- stacklight_server_node03:
- name: ${_param:stacklight_monitor_node03_hostname}
+ stacklight_node03:
+ name: ${_param:stacklight_node03_hostname}
domain: ${_param:cluster_domain}
classes:
- service.galera.slave.cluster
@@ -129,7 +139,7 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:stacklight_monitor_node03_address}
+ single_address: ${_param:stacklight_node03_address}
keepalived_vip_priority: 102
mysql_cluster_role: slave
diff --git a/classes/cluster/sl-k8s-calico/infra/init.yml b/classes/cluster/sl-k8s-calico/infra/init.yml
index b585338..270fec0 100644
--- a/classes/cluster/sl-k8s-calico/infra/init.yml
+++ b/classes/cluster/sl-k8s-calico/infra/init.yml
@@ -2,20 +2,18 @@
- system.linux.system.single
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.openssh.server.team.all
- system.rsyslog.client.single
parameters:
- _jenkins:
- tests_enabled: false
_param:
# infra service addresses
infra_config_hostname: cfg01
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: sl-k8s-calico.local
+ cluster_name: sl-k8s-calico
apt_mk_version: nightly
primary_interface: ens3
linux:
@@ -26,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/sl-k8s-calico/init.yml b/classes/cluster/sl-k8s-calico/init.yml
index e21b7ee..55ea734 100644
--- a/classes/cluster/sl-k8s-calico/init.yml
+++ b/classes/cluster/sl-k8s-calico/init.yml
@@ -1,5 +1,11 @@
classes:
- system.linux.network.dynamic_hosts
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
+- system.linux.system.repo.fluentd
- cluster.sl-k8s-calico.kubernetes
- cluster.sl-k8s-calico.stacklight
- cluster.sl-k8s-calico.infra
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index ac2f555..3522796 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -1,33 +1,43 @@
classes:
-- system.linux.system.repo.docker_legacy
+- system.linux.system.repo.mcp.apt_mirantis.docker_legacy
- system.kubernetes.pool.cluster
-- system.linux.network.hosts
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
- cluster.sl-k8s-calico
parameters:
- _param:
- kubernetes_calico_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.8.6-5
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:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
calico:
enabled: true
image: ${_param:kubernetes_calico_image}
calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
cni_image: ${_param:kubernetes_calico_cni_image}
+ mtu: ${_param:kubernetes_mtu}
etcd:
ssl:
enabled: true
common:
+ addons:
+ virtlet:
+ enabled: ${_param:kubernetes_virtlet_enabled}
+ namespace: kube-system
+ image: ${_param:kubernetes_virtlet_image}
+ criproxy_version: ${_param:kubernetes_criproxy_version}
+ criproxy_source: ${_param:kubernetes_criproxy_checksum}
+ hosts:
+ - ${_param:kubernetes_compute_node01_hostname}
+ - ${_param:kubernetes_compute_node02_hostname}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
linux:
@@ -37,15 +47,23 @@
- 10.254.0.10
- 172.18.176.4
- 172.18.176.7
- domain: virtual-mcp11-k8s-calico.local
- options:
- - ndots:5
- - timeout:2
- - attempts:2
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}
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: '255.255.255.0'
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
index 1c0f9d1..9093496 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_legacy
+- system.linux.system.repo.mcp.apt_mirantis.docker_legacy
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
- cluster.sl-k8s-calico.kubernetes.compute
@@ -24,10 +24,15 @@
kubernetes:
common:
addons:
- netchecker:
- enabled: true
helm:
- enabled: true
+ enabled: ${_param:kubernetes_helm_enabled}
+ calico_policy:
+ enabled: ${_param:kubernetes_calico_policy_enabled}
+ image: ${_param:kubernetes_calico_policy_image}
+ netchecker:
+ enabled: ${_param:kubernetes_netchecker_enabled}
+ agent_image: ${_param:kubernetes_netchecker_agent_image}
+ server_image: ${_param:kubernetes_netchecker_server_image}
coredns:
enabled: ${_param:kubernetes_coredns_enabled}
externaldns:
@@ -35,6 +40,8 @@
image: ${_param:kubernetes_externaldns_image}
provider: ${_param:kubernetes_externaldns_provider}
master:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
etcd:
ssl:
enabled: true
@@ -46,4 +53,6 @@
enabled: true
namespace:
netchecker:
- enabled: true
+ enabled: ${_param:kubernetes_netchecker_enabled}
+ auth:
+ mode: Node,RBAC
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/init.yml b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
index d5cf684..79cccbe 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/init.yml
@@ -3,6 +3,9 @@
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
+ # kubelet
+ kubelet_fail_on_swap: True
+
# kubernetes settings
kubernetes_admin_user: admin
kubernetes_admin_password: sbPfel23ZigJF3Bm
@@ -12,8 +15,36 @@
kubernetes_scheduler_token: VgkUHfrW07zNxrb0ucFyX7NBnSJN9Xp6
kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
+ kubernetes_mtu: 1500
+ mcp_version: testing
etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
+ # docker package version
+ kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
+
+ # component docker images
+ kubernetes_calico_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.8.11-9
+ 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"
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
+ kubernetes_externaldns_image: mirantis/external-dns:latest
+ kubernetes_externaldns_provider: coredns
+
+ # switches of addons
+ kubernetes_helm_enabled: true
+ kubernetes_netchecker_enabled: true
+ kubernetes_calico_policy_enabled: false
+ kubernetes_virtlet_enabled: false
+ kubernetes_coredns_enabled: false
+ kubernetes_externaldns_enabled: false
+
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
kubernetes_control_hostname: ctl
@@ -49,14 +80,6 @@
calico_private_network: 192.168.0.0
calico_private_netmask: 16
- # component docker images
- kubernetes_externaldns_image: mirantis/external-dns:latest
- kubernetes_externaldns_provider: coredns
-
- # switches of addons
- kubernetes_coredns_enabled: false
- kubernetes_externaldns_enabled: false
-
linux:
network:
host:
@@ -96,16 +119,7 @@
- ${_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
+ user:
+ root:
+ name: root
+ password: false
diff --git a/classes/cluster/sl-k8s-calico/stacklight/client.yml b/classes/cluster/sl-k8s-calico/stacklight/client.yml
index a78a537..33b2cf0 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/client.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/client.yml
@@ -4,9 +4,6 @@
- system.grafana.client
- system.grafana.client.datasource.prometheus
- system.kibana.client.single
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
-- cluster.sl-k8s-calico
parameters:
_param:
# Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/sl-k8s-calico/stacklight/init.yml b/classes/cluster/sl-k8s-calico/stacklight/init.yml
index 2d4dc23..3910a1a 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/init.yml
@@ -1,22 +1,21 @@
classes:
- service.grafana.collector
- system.linux.system.repo.mcp.extra
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
- system.prometheus.collector
- system.telegraf.agent
parameters:
_param:
stacklight_monitor_address: 172.16.10.252
- stacklight_monitor_node01_hostname: mon01
- stacklight_monitor_node02_hostname: mon02
- stacklight_monitor_node03_hostname: mon03
- 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_node01_hostname: mon01
+ stacklight_node02_hostname: mon02
+ stacklight_node03_hostname: mon03
+ stacklight_node01_address: 172.16.10.107
+ stacklight_node02_address: 172.16.10.108
+ stacklight_node03_address: 172.16.10.109
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
+ stacklight_log_address: ${_param:stacklight_monitor_address}
mysql_admin_user: root
mysql_admin_password: workshop
@@ -26,10 +25,15 @@
galera_server_cluster_name: monitoring_cluster
galera_server_maintenance_password: workshop
galera_server_admin_password: workshop
+ galera_innodb_read_io_threads: 2
+ galera_innodb_write_io_threads: 2
+ galera_wsrep_slave_threads: 2
+ galera_xtrabackup_parallel: 1
+ galera_error_log_enabled: true
- heka_elasticsearch_host: ${_param:stacklight_monitor_address}
elasticsearch_port: 9200
stacklight_environment: ${_param:cluster_domain}
+ fluentd_elasticsearch_host: ${_param:stacklight_log_address}
linux:
network:
host:
@@ -39,20 +43,20 @@
- mon
- mon.${_param:cluster_domain}
mon01:
- address: ${_param:stacklight_monitor_node01_address}
+ address: ${_param:stacklight_node01_address}
names:
- - ${_param:stacklight_monitor_node01_hostname}
- - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_node01_hostname}
+ - ${_param:stacklight_node01_hostname}.${_param:cluster_domain}
mon02:
- address: ${_param:stacklight_monitor_node02_address}
+ address: ${_param:stacklight_node02_address}
names:
- - ${_param:stacklight_monitor_node02_hostname}
- - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_node02_hostname}
+ - ${_param:stacklight_node02_hostname}.${_param:cluster_domain}
mon03:
- address: ${_param:stacklight_monitor_node03_address}
+ address: ${_param:stacklight_node03_address}
names:
- - ${_param:stacklight_monitor_node03_hostname}
- - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
+ - ${_param:stacklight_node03_hostname}
+ - ${_param:stacklight_node03_hostname}.${_param:cluster_domain}
system:
name: ${_param:infra_config_hostname}
domain: ${_param:cluster_domain}
diff --git a/classes/cluster/sl-k8s-calico/stacklight/server.yml b/classes/cluster/sl-k8s-calico/stacklight/server.yml
index 439866e..7b91adf 100644
--- a/classes/cluster/sl-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/sl-k8s-calico/stacklight/server.yml
@@ -1,21 +1,21 @@
classes:
- system.docker.host
-- system.linux.system.repo.influxdb
-- system.linux.system.repo.elasticsearch.5
-- system.linux.system.repo.kibana.5
-- system.linux.system.repo.docker
+- system.linux.system.repo.mcp.apt_mirantis.elastic
+- system.linux.system.repo.mcp.apt_mirantis.kibana
+- system.linux.system.repo.mcp.apt_mirantis.influxdb
+- system.linux.system.repo.mcp.apt_mirantis.docker
# Needed to install Galera packages
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- 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
+- system.haproxy.proxy.listen.stacklight.kibana
- service.haproxy.proxy.single
+- system.influxdb.relay.cluster
- system.galera.server.cluster
- system.galera.server.database.grafana
-- system.influxdb.relay.cluster
- system.influxdb.server.single
- system.influxdb.database.prometheus
- system.salt.minion.cert.prometheus_server
@@ -30,8 +30,8 @@
parameters:
_param:
cluster_vip_address: ${_param:stacklight_monitor_address}
- cluster_local_address: ${_param:single_address}
cluster_public_host: mon
+ cluster_local_address: ${_param:single_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
@@ -45,25 +45,28 @@
keepalived_prometheus_vip_password: password
keepalived_prometheus_vip_interface: ens4
# Docker/Elasticsearch
- cluster_node01_hostname: ${_param:stacklight_monitor_node01_hostname}
- cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_hostname: ${_param:stacklight_monitor_node02_hostname}
- cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_hostname: ${_param:stacklight_monitor_node03_hostname}
- cluster_node03_address: ${_param:stacklight_monitor_node03_address}
- # Galera
- galera_innodb_buffer_pool_size: 1024M
- galera_max_connections: 200
+ cluster_elasticsearch_port: 9200
+ cluster_kibana_port: 5601
+ cluster_grafana_port: 3000
+ cluster_node01_hostname: ${_param:stacklight_node01_hostname}
+ cluster_node01_address: ${_param:stacklight_node01_address}
+ cluster_node02_hostname: ${_param:stacklight_node02_hostname}
+ cluster_node02_address: ${_param:stacklight_node02_address}
+ cluster_node03_hostname: ${_param:stacklight_node03_hostname}
+ cluster_node03_address: ${_param:stacklight_node03_address}
# Kibana
kibana_elasticsearch_host: ${_param:cluster_vip_address}
# Galera
openstack_version: newton
+ galera_innodb_buffer_pool_size: 1024M
+ galera_max_connections: 200
# Grafana
grafana_database_type: mysql
grafana_database_host: ${_param:cluster_vip_address}
grafana_database_password: ${_param:mysql_grafana_password}
- influxdb_port: 8086
+ # InfluxDB
influxdb_admin_password: password
+ influxdb_port: 15016
influxdb_stacklight_password: lmapass
influxdb_client_host: ${_param:stacklight_monitor_address}
influxdb_client_port: ${_param:influxdb_port}
@@ -72,8 +75,7 @@
prometheus_influxdb_db: prometheus
prometheus_influxdb_username: lma
prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
- rabbitmq_openstack_password: workshop
- heka_amqp_host: ${_param:kubernetes_control_address}
+ telegraf_remote_agent_influxdb_address: ${_param:stacklight_monitor_address}
elasticsearch:
server:
heap:
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
index f6898b3..9479081 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
@@ -16,7 +16,7 @@
etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
# component docker images
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
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-mitaka-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
index dd9f4c6..9e41e85 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/compute.yml
@@ -34,3 +34,28 @@
topics: "notifications,${_param:stacklight_notification_topic}"
notify_on:
state_change: vm_and_task_state
+ linux:
+ network:
+ bridge: openvswitch
+ interface:
+ primary_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:primary_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ tenant_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:tenant_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ external_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:external_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
index fb8b3e3..d7d93e8 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/gateway.yml
@@ -19,3 +19,28 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
+ linux:
+ network:
+ bridge: openvswitch
+ interface:
+ primary_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:primary_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ tenant_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:tenant_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ external_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:external_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/.env b/classes/cluster/virtual-mcp-mitaka-ovs/.env
index 047f7b5..49c1ca4 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/.env
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf collectd memcached"
+EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf"
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml b/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
index fdd6cdd..ca39912 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/infra/config.yml
@@ -3,7 +3,6 @@
- system.linux.system.single
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.ubuntu
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.master.api
@@ -11,15 +10,24 @@
- system.salt.minion.ca.salt_master
- system.salt.minion.cert.proxy
- system.sphinx.server.doc.reclass
-- system.keystone.client.single
+- system.keystone.client.core
- system.keystone.client.service.ceilometer
-- system.keystone.client.service.nova21
-- system.keystone.client.service.glare
-- system.keystone.client.service.cinder3
- system.keystone.client.service.designate
+- system.keystone.client.service.cinder
+- system.keystone.client.service.cinder2
+- system.keystone.client.service.cinder3
+- system.keystone.client.service.glance
+- system.keystone.client.service.glare
+- system.keystone.client.service.heat
+- system.keystone.client.service.heat-cfn
+- system.keystone.client.service.keystone
+- system.keystone.client.service.neutron
+- system.keystone.client.service.nova-ec2
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
- system.mysql.client.single
- system.reclass.storage.system.openstack_control_cluster
-- system.reclass.storage.system.stacklight_server_cluster
+- system.reclass.storage.system.stacklightv2_server_cluster
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.openstack_proxy_single
@@ -31,8 +39,6 @@
_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: ${_param:infra_config_deploy_address}
single_address: ${_param:infra_config_address}
salt_master_host: 127.0.0.1
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs/init.yml
index 784c46e..1cdd8e9 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/init.yml
@@ -1,12 +1,23 @@
classes:
- system.linux.network.dynamic_hosts
+- service.grafana.collector
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.single
-- cluster.virtual-mcp-mitaka-ovs.infra
-- cluster.virtual-mcp-mitaka-ovs.openstack
+- system.rsyslog.client.single
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.stacklight
- system.openssh.server.team.mcp_qa
+- system.prometheus.collector
+- system.telegraf.agent
+- cluster.virtual-mcp-mitaka-ovs.infra
+- cluster.virtual-mcp-mitaka-ovs.openstack
- cluster.virtual-mcp-mitaka-ovs.stacklight
-- cluster.virtual-mcp-mitaka-ovs.stacklight.client
- cluster.overrides
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
index e8c5eae..cbe05b2 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/compute.yml
@@ -6,6 +6,7 @@
- system.nova.compute.cluster
- system.neutron.compute.cluster
- system.heka.alarm.openstack_compute
+- system.prometheus.exporters.libvirt
- cluster.virtual-mcp-mitaka-ovs
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
index 894ea40..c06ed3d 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/control.yml
@@ -17,7 +17,7 @@
- system.glusterfs.server.volume.keystone
- system.glusterfs.server.cluster
- system.glance.control.cluster
-- system.heka.alarm.openstack_control
+- system.heka.ceilometer_collector.single
- system.nova.control.cluster
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/init.yml
index eb936cd..e0cf2f1 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/init.yml
@@ -143,6 +143,9 @@
mongodb_admin_password: cloudlab
mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
loopback_device_size: 20
+ ceilometer_influxdb_password: lmapass
+ openstack_log_appender: true
+ openstack_fluentd_handler_enabled: true
linux:
network:
purge_hosts: true
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/client.yml b/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/client.yml
index 04ac934..4988908 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/client.yml
@@ -1,6 +1,21 @@
classes:
-- system.collectd.client.output.heka
-- system.heka.log_collector.single
-- system.heka.metric_collector.single
-- cluster.virtual-mcp-mitaka-ovs.stacklight
-- service.grafana.collector
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+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-mitaka-ovs/stacklight/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/init.yml
index 0b04034..68c0524 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/init.yml
@@ -1,59 +1,42 @@
parameters:
_param:
- stacklight_monitor_hostname: mon
- stacklight_monitor_node01_hostname: mon01
- stacklight_monitor_node02_hostname: mon02
- stacklight_monitor_node03_hostname: mon03
stacklight_monitor_address: 172.16.10.253
stacklight_monitor_node01_address: 172.16.10.100
stacklight_monitor_node02_address: 172.16.10.101
stacklight_monitor_node03_address: 172.16.10.102
- stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
stacklight_log_address: ${_param:stacklight_monitor_address}
stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+ prometheus_control_address: ${_param:stacklight_monitor_address}
heka_elasticsearch_host: ${_param:stacklight_monitor_address}
- heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
- heka_aggregator_host: ${_param:stacklight_monitor_address}
- aggregator_port: 5565
- grafana_user: admin
- grafana_password: password
- grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
elasticsearch_port: 9200
- influxdb_stacklight_password: lmapass
- influxdb_admin_password: password
- influxdb_port: 8086
- influxdb_database: lma
- influxdb_user: lma
- influxdb_password: lmapass
- nagios_host: ${_param:stacklight_monitor_address}
- nagios_status_port: 8001
- nagios_username: nagiosadmin
- nagios_password: secret
- nagios_notification_smtp_server: 127.0.0.1
- nagios_notification_from: 'nagios@localhost'
- nagios_notification_email: 'root@localhost'
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}
+ fluentd_elasticsearch_host: ${_param:stacklight_log_address}
linux:
network:
host:
mon:
address: ${_param:stacklight_monitor_address}
names:
- - ${_param:stacklight_monitor_hostname}
- - ${_param:stacklight_monitor_hostname}.${_param:cluster_domain}
+ - mon
+ - mon.${_param:cluster_domain}
mon01:
address: ${_param:stacklight_monitor_node01_address}
names:
- - ${_param:stacklight_monitor_node01_hostname}
- - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
+ - mon01
+ - mon01.${_param:cluster_domain}
mon02:
address: ${_param:stacklight_monitor_node02_address}
names:
- - ${_param:stacklight_monitor_node02_hostname}
- - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
+ - mon02
+ - mon02.${_param:cluster_domain}
mon03:
address: ${_param:stacklight_monitor_node03_address}
names:
- - ${_param:stacklight_monitor_node03_hostname}
- - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
+ - mon03
+ - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/proxy.yml b/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/proxy.yml
index 26efcf7..7e9c488 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/proxy.yml
@@ -1,12 +1,14 @@
classes:
- system.nginx.server.single
-- system.nginx.server.proxy.grafana_web
-- system.nginx.server.proxy.kibana_web
-- system.nginx.server.proxy.nagios_web
+- 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-mitaka-ovs
parameters:
_param:
+ nginx_proxy_grafana_port: 15013
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/server.yml
index 758b09f..c37eaf6 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/stacklight/server.yml
@@ -1,40 +1,67 @@
classes:
-- system.collectd.remote_client.cluster
-- system.heka.remote_collector.cluster
+- system.docker.host
- system.linux.system.repo.influxdb
-- system.heka.remote_collector.input.amqp
-- system.heka.aggregator.cluster
+- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.elastic
- system.linux.system.repo.mcp.apt_mirantis.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.grafana.server.single
-- system.nagios.server.cluster
-- cluster.virtual-mcp-mitaka-ovs
- system.haproxy.proxy.listen.stacklight.elasticsearch
- system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.grafana
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
- service.haproxy.proxy.single
-- system.keepalived.cluster.instance.stacklight_monitor_vip
+- system.influxdb.relay.cluster
+- system.influxdb.server.single
+- system.influxdb.database.prometheus
+- 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.prometheus_global
+- system.docker.swarm.stack.monitoring.remote_collector
+- system.docker.swarm.stack.dashboard
+- cluster.virtual-mcp-mitaka-ovs
parameters:
_param:
- collectd_remote_collector_host: ${_param:stacklight_monitor_address}
heka_amqp_host: ${_param:openstack_control_address}
kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
- keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
- keepalived_stacklight_monitor_vip_password: 'password'
- keepalived_stacklight_monitor_vip_interface: ens4
+ 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_grafana_port: 3000
- cluster_node01_name: mon01
+ cluster_node01_hostname: mon01
cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_name: mon02
+ cluster_node02_hostname: mon02
cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_name: mon03
+ 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: prometheus
+ prometheus_influxdb_username: lma
+ prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+ remote_collector_telegraf_host: monitoring_remote_agent
linux:
network:
interface:
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
index c7e511f..85ffec0 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/compute.yml
@@ -34,3 +34,28 @@
topics: "notifications,${_param:stacklight_notification_topic}"
notify_on:
state_change: vm_and_task_state
+ linux:
+ network:
+ bridge: openvswitch
+ interface:
+ primary_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:primary_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ tenant_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:tenant_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ external_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:external_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
index 7fe5d4e..fe6c97d 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/gateway.yml
@@ -19,3 +19,28 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
+ linux:
+ network:
+ bridge: openvswitch
+ interface:
+ primary_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:primary_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ tenant_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:tenant_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
+ external_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:external_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
diff --git a/classes/cluster/virtual-mcp-newton-ovs/.env b/classes/cluster/virtual-mcp-newton-ovs/.env
index 047f7b5..49c1ca4 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/.env
+++ b/classes/cluster/virtual-mcp-newton-ovs/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp sphinx nginx heka grafana rsyslog prometheus telegraf collectd memcached"
+EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf"
diff --git a/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml b/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
index e1492eb..79d311d 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/infra/config.yml
@@ -3,7 +3,6 @@
- system.linux.system.single
- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.ubuntu
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.master.api
@@ -11,15 +10,24 @@
- system.salt.minion.ca.salt_master
- system.salt.minion.cert.proxy
- system.sphinx.server.doc.reclass
-- system.keystone.client.single
+- system.keystone.client.core
- system.keystone.client.service.ceilometer
-- system.keystone.client.service.nova21
-- system.keystone.client.service.glare
-- system.keystone.client.service.cinder3
- system.keystone.client.service.designate
+- system.keystone.client.service.cinder
+- system.keystone.client.service.cinder2
+- system.keystone.client.service.cinder3
+- system.keystone.client.service.glance
+- system.keystone.client.service.glare
+- system.keystone.client.service.heat
+- system.keystone.client.service.heat-cfn
+- system.keystone.client.service.keystone
+- system.keystone.client.service.neutron
+- system.keystone.client.service.nova-ec2
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
- system.mysql.client.single
- system.reclass.storage.system.openstack_control_cluster
-- system.reclass.storage.system.stacklight_server_cluster
+- system.reclass.storage.system.stacklightv2_server_cluster
- system.reclass.storage.system.openstack_compute_multi
- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.openstack_proxy_single
@@ -31,8 +39,6 @@
_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: ${_param:infra_config_deploy_address}
single_address: ${_param:infra_config_address}
salt_master_host: 127.0.0.1
diff --git a/classes/cluster/virtual-mcp-newton-ovs/init.yml b/classes/cluster/virtual-mcp-newton-ovs/init.yml
index 399b7b1..9ebef4f 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/init.yml
@@ -1,12 +1,23 @@
classes:
- system.linux.network.dynamic_hosts
+- service.grafana.collector
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.single
-- cluster.virtual-mcp-newton-ovs.infra
-- cluster.virtual-mcp-newton-ovs.openstack
+- system.rsyslog.client.single
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.stacklight
- system.openssh.server.team.mcp_qa
+- system.prometheus.collector
+- system.telegraf.agent
+- cluster.virtual-mcp-newton-ovs.infra
+- cluster.virtual-mcp-newton-ovs.openstack
- cluster.virtual-mcp-newton-ovs.stacklight
-- cluster.virtual-mcp-newton-ovs.stacklight.client
- cluster.overrides
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml
index e0fb238..59b6bc3 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/compute.yml
@@ -6,6 +6,7 @@
- system.nova.compute.cluster
- system.neutron.compute.cluster
- system.heka.alarm.openstack_compute
+- system.prometheus.exporters.libvirt
- cluster.virtual-mcp-newton-ovs
parameters:
_param:
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
index edd6528..37c9611 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/control.yml
@@ -17,7 +17,7 @@
- system.glusterfs.server.volume.keystone
- system.glusterfs.server.cluster
- system.glance.control.cluster
-- system.heka.alarm.openstack_control
+- system.heka.ceilometer_collector.single
- system.nova.control.cluster
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/init.yml
index c1f5167..a63682c 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/init.yml
@@ -143,6 +143,9 @@
mongodb_admin_password: cloudlab
mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
loopback_device_size: 20
+ ceilometer_influxdb_password: lmapass
+ openstack_log_appender: true
+ openstack_fluentd_handler_enabled: true
linux:
network:
purge_hosts: true
diff --git a/classes/cluster/virtual-mcp-newton-ovs/stacklight/client.yml b/classes/cluster/virtual-mcp-newton-ovs/stacklight/client.yml
index 4f56d87..4988908 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/stacklight/client.yml
@@ -1,6 +1,21 @@
classes:
-- system.collectd.client.output.heka
-- system.heka.log_collector.single
-- system.heka.metric_collector.single
-- cluster.virtual-mcp-newton-ovs.stacklight
-- service.grafana.collector
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+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-newton-ovs/stacklight/init.yml b/classes/cluster/virtual-mcp-newton-ovs/stacklight/init.yml
index 0b04034..68c0524 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/stacklight/init.yml
@@ -1,59 +1,42 @@
parameters:
_param:
- stacklight_monitor_hostname: mon
- stacklight_monitor_node01_hostname: mon01
- stacklight_monitor_node02_hostname: mon02
- stacklight_monitor_node03_hostname: mon03
stacklight_monitor_address: 172.16.10.253
stacklight_monitor_node01_address: 172.16.10.100
stacklight_monitor_node02_address: 172.16.10.101
stacklight_monitor_node03_address: 172.16.10.102
- stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
stacklight_log_address: ${_param:stacklight_monitor_address}
stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+ stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+ prometheus_control_address: ${_param:stacklight_monitor_address}
heka_elasticsearch_host: ${_param:stacklight_monitor_address}
- heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
- heka_aggregator_host: ${_param:stacklight_monitor_address}
- aggregator_port: 5565
- grafana_user: admin
- grafana_password: password
- grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
elasticsearch_port: 9200
- influxdb_stacklight_password: lmapass
- influxdb_admin_password: password
- influxdb_port: 8086
- influxdb_database: lma
- influxdb_user: lma
- influxdb_password: lmapass
- nagios_host: ${_param:stacklight_monitor_address}
- nagios_status_port: 8001
- nagios_username: nagiosadmin
- nagios_password: secret
- nagios_notification_smtp_server: 127.0.0.1
- nagios_notification_from: 'nagios@localhost'
- nagios_notification_email: 'root@localhost'
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}
+ fluentd_elasticsearch_host: ${_param:stacklight_log_address}
linux:
network:
host:
mon:
address: ${_param:stacklight_monitor_address}
names:
- - ${_param:stacklight_monitor_hostname}
- - ${_param:stacklight_monitor_hostname}.${_param:cluster_domain}
+ - mon
+ - mon.${_param:cluster_domain}
mon01:
address: ${_param:stacklight_monitor_node01_address}
names:
- - ${_param:stacklight_monitor_node01_hostname}
- - ${_param:stacklight_monitor_node01_hostname}.${_param:cluster_domain}
+ - mon01
+ - mon01.${_param:cluster_domain}
mon02:
address: ${_param:stacklight_monitor_node02_address}
names:
- - ${_param:stacklight_monitor_node02_hostname}
- - ${_param:stacklight_monitor_node02_hostname}.${_param:cluster_domain}
+ - mon02
+ - mon02.${_param:cluster_domain}
mon03:
address: ${_param:stacklight_monitor_node03_address}
names:
- - ${_param:stacklight_monitor_node03_hostname}
- - ${_param:stacklight_monitor_node03_hostname}.${_param:cluster_domain}
+ - mon03
+ - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp-newton-ovs/stacklight/proxy.yml b/classes/cluster/virtual-mcp-newton-ovs/stacklight/proxy.yml
index 8737b84..297e5ef 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/stacklight/proxy.yml
@@ -1,12 +1,14 @@
classes:
- system.nginx.server.single
-- system.nginx.server.proxy.grafana_web
-- system.nginx.server.proxy.kibana_web
-- system.nginx.server.proxy.nagios_web
+- 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-newton-ovs
parameters:
_param:
+ nginx_proxy_grafana_port: 15013
nginx_proxy_ssl:
enabled: true
authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/virtual-mcp-newton-ovs/stacklight/server.yml b/classes/cluster/virtual-mcp-newton-ovs/stacklight/server.yml
index 00d3868..06ad08d 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/stacklight/server.yml
@@ -1,40 +1,67 @@
classes:
-- system.collectd.remote_client.cluster
-- system.heka.remote_collector.cluster
+- system.docker.host
- system.linux.system.repo.influxdb
-- system.heka.remote_collector.input.amqp
-- system.heka.aggregator.cluster
+- system.linux.system.repo.mcp.salt
- system.linux.system.repo.mcp.apt_mirantis.elastic
- system.linux.system.repo.mcp.apt_mirantis.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.grafana.server.single
-- system.nagios.server.cluster
-- cluster.virtual-mcp-newton-ovs
- system.haproxy.proxy.listen.stacklight.elasticsearch
- system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.grafana
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
- service.haproxy.proxy.single
-- system.keepalived.cluster.instance.stacklight_monitor_vip
+- system.influxdb.relay.cluster
+- system.influxdb.server.single
+- system.influxdb.database.prometheus
+- 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.prometheus_global
+- system.docker.swarm.stack.monitoring.remote_collector
+- system.docker.swarm.stack.dashboard
+- cluster.virtual-mcp-newton-ovs
parameters:
_param:
- collectd_remote_collector_host: ${_param:stacklight_monitor_address}
heka_amqp_host: ${_param:openstack_control_address}
kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
- keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
- keepalived_stacklight_monitor_vip_password: 'password'
- keepalived_stacklight_monitor_vip_interface: ens4
+ 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_grafana_port: 3000
- cluster_node01_name: mon01
+ cluster_node01_hostname: mon01
cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_name: mon02
+ cluster_node02_hostname: mon02
cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_name: mon03
+ 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: prometheus
+ prometheus_influxdb_username: lma
+ prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+ remote_collector_telegraf_host: monitoring_remote_agent
linux:
network:
interface:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml
index c1ef8c6..f0ff1a4 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/init.yml
@@ -7,6 +7,7 @@
- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
- system.linux.system.single
+- system.linux.system.single.debian
- system.rsyslog.client.single
- system.prometheus.collector
- system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
index 582837d..1f70a17 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
@@ -5,6 +5,7 @@
- system.heka.log_collector.output.telegraf
- system.linux.system.repo.mcp.extra
- system.linux.system.single
+- system.linux.system.single.debian
- system.rsyslog.client.single
- system.prometheus.collector
- system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml
index 5affb23..d66af7f 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/init.yml
@@ -7,6 +7,7 @@
- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
- system.linux.system.single
+- system.linux.system.single.debian
- system.rsyslog.client.single
- system.prometheus.collector
- system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml
index 0d296ba..ead583b 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/init.yml
@@ -6,6 +6,7 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.single
- system.rsyslog.client.single
+- system.linux.system.single.debian
- system.prometheus.collector
- system.telegraf.agent
- system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
index aa01aec..ccef4f2 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
@@ -6,6 +6,7 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.single
- system.rsyslog.client.single
+- system.linux.system.single.debian
- system.prometheus.collector
- system.telegraf.agent
- system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
index c42e143..f4ac726 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/infra/config.yml
@@ -175,7 +175,7 @@
ceph_rgw_node02_address:
value_template: <<node_control_ip>>
ceph_rgw_node03:
- expression: <<node_hostname>>__equals__cmn03
+ expression: <<node_hostname>>__equals__rgw03
cluster_param:
ceph_rgw_node03_address:
value_template: <<node_control_ip>>
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml
index c99924a..68d37ba 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/init.yml
@@ -5,6 +5,7 @@
- system.heka.log_collector.output.telegraf
- system.linux.system.repo.mcp.extra
- system.linux.system.single
+- system.linux.system.single.debian
- system.rsyslog.client.single
- system.prometheus.collector
- system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
index 368b52b..9b5b609 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
@@ -112,6 +112,16 @@
value_template: <<node_tenant_ip>>
external_address:
value_template: <<node_external_ip>>
+ openstack_dns01:
+ expression: <<node_hostname>>__equals__dns01
+ cluster_param:
+ openstack_dns_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_dns02:
+ expression: <<node_hostname>>__equals__dns02
+ cluster_param:
+ openstack_dns_node02_address:
+ value_template: <<node_control_ip>>
openstack_gateway:
expression: <<node_hostname>>__startswith__gtw
node_class:
@@ -123,7 +133,7 @@
external_address:
value_template: <<node_external_ip>>
cluster_param:
- openstack_gateway_node01_address:
+ openstack_gateway_address:
value_template: <<node_control_ip>>
openstack_dashboard:
expression: <<node_hostname>>__startswith__prx
@@ -195,6 +205,10 @@
params:
tenant_address: 10.1.0.110
external_address: 10.16.0.110
+ openstack_share_node01:
+ params:
+ single_address: 172.16.10.130
+ tenant_address: 10.1.0.130
openstack_proxy_node01:
classes:
- cluster.virtual-mcp-pike-dvr-ssl-barbican.openstack.proxy
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
index 65bcbeb..16731e3 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
@@ -21,6 +21,12 @@
interface_mtu: 1500
linux_system_codename: xenial
loopback_device_size: 20
+ ceilometer:
+ agent:
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
@@ -34,15 +40,41 @@
protocol: https
image:
protocol: https
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
+ # Compute nodes on devcloud can have different CPUs, we need this
+ # to make sure live migration always work even when cmp VMs are on different computes
+ cpu_mode: custom
+ libvirt:
+ cpu_model: kvm64
neutron:
compute:
notification:
driver: messagingv2
topics: "notifications"
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
cinder:
volume:
barbican:
enabled: ${_param:barbican_integration_enabled}
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
linux:
network:
interface:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
index 5d20cee..cb8a506 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
@@ -1,5 +1,7 @@
classes:
- system.salt.minion.cert.proxy
+- system.salt.minion.cert.mysql.server
+- system.salt.minion.cert.rabbitmq_server
- system.linux.system.lowmem
- system.linux.system.repo.mcp.apt_mirantis.glusterfs
- system.linux.system.repo.mcp.apt_mirantis.openstack
@@ -7,13 +9,15 @@
- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
- system.memcached.server.single
- system.rabbitmq.server.cluster
+- service.rabbitmq.server.ssl
- system.rabbitmq.server.vhost.openstack
- system.apache.server.site.manila
- system.apache.server.site.barbican
+- system.apache.server.site.nova-placement
+- system.apache.server.site.cinder
- system.nginx.server.single
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack.designate
-- system.nginx.server.proxy.openstack.placement
- system.keystone.server.wsgi
- system.keystone.server.cluster
- system.glusterfs.client.cluster
@@ -29,6 +33,7 @@
- system.heat.server.cluster
- system.designate.server.cluster
- system.galera.server.cluster
+- service.galera.ssl
- system.galera.server.database.cinder
- system.galera.server.database.glance
- system.galera.server.database.heat
@@ -46,7 +51,6 @@
- system.ceilometer.client
- system.ceilometer.client.cinder_volume
- system.ceilometer.client.neutron
-- cluster.virtual-mcp-pike-dvr-ssl-barbican.openstack.dns
- system.haproxy.proxy.listen.openstack.placement
- system.haproxy.proxy.listen.openstack.manila
- system.manila.control.cluster
@@ -66,12 +70,10 @@
nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
nginx_proxy_openstack_keystone_host: 127.0.0.1
nginx_proxy_openstack_nova_host: 127.0.0.1
- nginx_proxy_openstack_cinder_host: 127.0.0.1
nginx_proxy_openstack_glance_host: 127.0.0.1
nginx_proxy_openstack_neutron_host: 127.0.0.1
nginx_proxy_openstack_heat_host: 127.0.0.1
nginx_proxy_openstack_designate_host: 127.0.0.1
- nginx_proxy_openstack_placement_host: 127.0.0.1
apache_manila_api_address: ${_param:single_address}
apache_manila_ssl: ${_param:nginx_proxy_ssl}
apache_keystone_api_host: ${_param:single_address}
@@ -79,8 +81,12 @@
apache_barbican_api_address: ${_param:cluster_local_address}
apache_barbican_api_host: ${_param:single_address}
apache_barbican_ssl: ${_param:nginx_proxy_ssl}
+ apache_nova_placement_api_address: ${_param:cluster_local_address}
+ apache_nova_placement_ssl: ${_param:nginx_proxy_ssl}
barbican_dogtag_nss_password: workshop
barbican_dogtag_host: ${_param:cluster_vip_address}
+ apache_cinder_api_address: ${_param:cluster_local_address}
+ apache_cinder_ssl: ${_param:nginx_proxy_ssl}
# dogtag listens on 8443 but there is no way to bind it to
# Specific IP, as on this setup dogtag installed on ctl nodes
# Change port on haproxy side to avoid binding conflict.
@@ -94,6 +100,10 @@
dogtag_pki_token_password: workshop
dogtag_pki_security_domain_password: workshop
dogtag_pki_clone_pkcs12_password: workshop
+ rabbitmq:
+ server:
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
nginx:
server:
site:
@@ -101,6 +111,8 @@
enabled: false
nginx_proxy_openstack_api_keystone_private:
enabled: false
+ nginx_proxy_openstack_api_cinder:
+ enabled: false
linux:
system:
package:
@@ -155,9 +167,23 @@
plugin:
dogtag:
port: ${_param:haproxy_dogtag_bind_port}
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
keystone:
server:
admin_email: ${_param:admin_email}
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
designate:
pool_manager:
enabled: ${_param:designate_pool_manager_enabled}
@@ -168,6 +194,13 @@
bind:
api:
address: 127.0.0.1
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
backend:
pdns4:
api_token: ${_param:designate_pdns_api_key}
@@ -206,6 +239,13 @@
protocol: https
registry:
protocol: https
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
heat:
server:
bind:
@@ -217,12 +257,26 @@
address: 127.0.0.1
identity:
protocol: https
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
neutron:
server:
bind:
address: 127.0.0.1
identity:
protocol: https
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
nova:
controller:
networking: dvr
@@ -231,6 +285,8 @@
enabled: ${_param:barbican_integration_enabled}
metadata:
password: ${_param:metadata_password}
+ bind:
+ address: ${_param:cluster_local_address}
bind:
public_address: ${_param:cluster_vip_address}
novncproxy_port: 6080
@@ -243,6 +299,16 @@
protocol: https
vncproxy_url: http://${_param:cluster_vip_address}:6080
workers: 1
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
+ notification:
+ notify_on:
+ state_change: vm_and_task_state
cinder:
controller:
controller:
@@ -254,10 +320,25 @@
host: 127.0.0.1
glance:
protocol: https
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
manila:
common:
identity:
protocol: https
+ default_share_type: default
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
salt:
minion:
cert:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/gateway.yml
index 81e8754..303ff44 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/gateway.yml
@@ -19,6 +19,13 @@
notification:
driver: messagingv2
topics: "notifications"
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
linux:
network:
interface:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
index 18ab132..02044b0 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
@@ -24,7 +24,7 @@
openstack_gateway_node01_address: ${_param:openstack_gateway_address}
openstack_dns_node01_address: 172.16.10.111
openstack_dns_node02_address: 172.16.10.112
- openstack_share_node01_address: 172.16.10.97
+ openstack_share_node01_address: 172.16.10.130
openstack_share_node01_share_address: ${_param:openstack_share_node01_address}
openstack_telemetry_address: 172.16.10.250
openstack_telemetry_node01_address: 172.16.10.45
@@ -209,13 +209,16 @@
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
horizon_identity_host: ${_param:cluster_vip_address}
- horizon_identity_encryption: none
+ horizon_identity_encryption: ssl
horizon_identity_version: 2
ceilometer_secret_key: workshop
ceilometer_agent_default_polling_interval: 15
ceilometer_agent_default_polling_meters:
- "*"
barbican_integration_enabled: true
+ galera_ssl_enabled: true
+ rabbitmq_ssl_enabled: true
+ rabbitmq_port: 5671 # for non-ssl use 5672 / for ssl 5671
linux:
network:
purge_hosts: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/share.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/share.yml
index 93a106e..13b4194 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/share.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/share.yml
@@ -13,4 +13,12 @@
manila:
common:
identity:
- protocol: https
\ No newline at end of file
+ protocol: https
+ default_share_type: default
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
index eee65de..b9ad851 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
@@ -31,7 +31,7 @@
salt_minion_ca_authority: salt_master_ca
keepalived_openstack_telemetry_vip_address: ${_param:openstack_telemetry_address}
keepalived_openstack_telemetry_vip_password: ${_param:openstack_telemetry_keepalived_password}
- keepalived_openstack_telemetry_vip_interface: ens3
+ keepalived_openstack_telemetry_vip_interface: ens4
cluster_vip_address: ${_param:openstack_telemetry_address}
cluster_local_address: ${_param:single_address}
nginx_proxy_openstack_api_host: ${_param:openstack_telemetry_address}
@@ -115,6 +115,8 @@
common:
database:
host: ${_param:openstack_database_address}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
server:
identity:
protocol: https
@@ -127,6 +129,9 @@
server:
identity:
protocol: https
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
aodh:
server:
bind:
@@ -136,6 +141,13 @@
identity:
protocol: https
host: ${_param:openstack_control_address}
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
ceilometer:
server:
bind:
@@ -145,6 +157,10 @@
identity:
protocol: https
host: ${_param:openstack_control_address}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
haproxy:
proxy:
listen:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
index e88a093..c41561f 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -103,6 +103,16 @@
value_template: <<node_tenant_ip>>
external_address:
value_template: <<node_external_ip>>
+ openstack_dns01:
+ expression: <<node_hostname>>__equals__dns01
+ cluster_param:
+ openstack_dns_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_dns02:
+ expression: <<node_hostname>>__equals__dns02
+ cluster_param:
+ openstack_dns_node02_address:
+ value_template: <<node_control_ip>>
openstack_gateway:
expression: <<node_hostname>>__startswith__gtw
node_class:
@@ -114,7 +124,7 @@
external_address:
value_template: <<node_external_ip>>
cluster_param:
- openstack_gateway_node01_address:
+ openstack_gateway_address:
value_template: <<node_control_ip>>
openstack_dashboard:
expression: <<node_hostname>>__startswith__prx
@@ -183,6 +193,10 @@
params:
tenant_address: 10.1.0.110
external_address: 10.16.0.110
+ openstack_share_node01:
+ params:
+ single_address: 172.16.10.130
+ tenant_address: 10.1.0.130
openstack_proxy_node01:
classes:
- cluster.virtual-mcp-pike-dvr-ssl.openstack.proxy
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
index f3ded54..5b47776 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
@@ -2,6 +2,7 @@
- system.linux.network.dynamic_hosts
- system.linux.system.repo.mcp.extra
- system.linux.system.single
+- system.linux.system.single.debian
- system.rsyslog.client.single
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
index 089a3cd..72c1133 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
@@ -26,6 +26,12 @@
ipflush_onchange: true
external_interface:
ipflush_onchange: true
+ ceilometer:
+ agent:
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
@@ -37,8 +43,39 @@
protocol: https
image:
protocol: https
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
+ # Compute nodes on devcloud can have different CPUs, we need this
+ # to make sure live migration always work even when cmp VMs are on different computes
+ cpu_mode: custom
+ libvirt:
+ cpu_model: kvm64
neutron:
compute:
notification:
driver: messagingv2
topics: "notifications"
+ bgp_vpn:
+ enabled: True
+ driver: bagpipe
+ bagpipe:
+ local_address: ${_param:tenant_address}
+ peers: 127.0.0.1
+ autonomous_system: 64512
+ enable_rtc: True
+ backend:
+ extension:
+ bagpipe_bgpvpn:
+ enabled: True
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index d254cdb..41cc920 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -1,5 +1,7 @@
classes:
- system.salt.minion.cert.proxy
+- system.salt.minion.cert.mysql.server
+- system.salt.minion.cert.rabbitmq_server
- system.linux.system.lowmem
- system.linux.system.repo.mcp.apt_mirantis.glusterfs
- system.linux.system.repo.mcp.apt_mirantis.openstack
@@ -7,12 +9,14 @@
- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
- system.memcached.server.single
- system.rabbitmq.server.cluster
+- service.rabbitmq.server.ssl
- system.rabbitmq.server.vhost.openstack
- system.apache.server.site.manila
+- system.apache.server.site.nova-placement
+- system.apache.server.site.cinder
- system.nginx.server.single
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack.designate
-- system.nginx.server.proxy.openstack.placement
- system.keystone.server.wsgi
- system.keystone.server.cluster
- system.glusterfs.client.cluster
@@ -28,6 +32,7 @@
- system.heat.server.cluster
- system.designate.server.cluster
- system.galera.server.cluster
+- service.galera.ssl
- system.galera.server.database.cinder
- system.galera.server.database.glance
- system.galera.server.database.heat
@@ -41,7 +46,6 @@
- system.ceilometer.client
- system.ceilometer.client.cinder_volume
- system.ceilometer.client.neutron
-- cluster.virtual-mcp-pike-dvr-ssl.openstack.dns
- system.haproxy.proxy.listen.openstack.placement
- system.haproxy.proxy.listen.openstack.manila
- system.manila.control.cluster
@@ -62,16 +66,22 @@
nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
nginx_proxy_openstack_keystone_host: 127.0.0.1
nginx_proxy_openstack_nova_host: 127.0.0.1
- nginx_proxy_openstack_cinder_host: 127.0.0.1
nginx_proxy_openstack_glance_host: 127.0.0.1
nginx_proxy_openstack_neutron_host: 127.0.0.1
nginx_proxy_openstack_heat_host: 127.0.0.1
nginx_proxy_openstack_designate_host: 127.0.0.1
- nginx_proxy_openstack_placement_host: 127.0.0.1
apache_manila_api_address: ${_param:single_address}
apache_manila_ssl: ${_param:nginx_proxy_ssl}
apache_keystone_api_host: ${_param:single_address}
apache_keystone_ssl: ${_param:nginx_proxy_ssl}
+ apache_nova_placement_api_address: ${_param:cluster_local_address}
+ apache_nova_placement_ssl: ${_param:nginx_proxy_ssl}
+ apache_cinder_api_address: ${_param:cluster_local_address}
+ apache_cinder_ssl: ${_param:nginx_proxy_ssl}
+ rabbitmq:
+ server:
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
nginx:
server:
site:
@@ -79,6 +89,8 @@
enabled: false
nginx_proxy_openstack_api_keystone_private:
enabled: false
+ nginx_proxy_openstack_api_cinder:
+ enabled: false
linux:
system:
package:
@@ -100,6 +112,13 @@
keystone:
server:
admin_email: ${_param:admin_email}
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
designate:
pool_manager:
enabled: ${_param:designate_pool_manager_enabled}
@@ -110,6 +129,13 @@
bind:
api:
address: 127.0.0.1
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
backend:
pdns4:
api_token: ${_param:designate_pdns_api_key}
@@ -146,6 +172,13 @@
protocol: https
registry:
protocol: https
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
heat:
server:
bind:
@@ -157,18 +190,36 @@
address: 127.0.0.1
identity:
protocol: https
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
neutron:
server:
bind:
address: 127.0.0.1
identity:
protocol: https
+ l2gw:
+ enabled: true
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
nova:
controller:
networking: dvr
cpu_allocation: 54
metadata:
password: ${_param:metadata_password}
+ bind:
+ address: ${_param:cluster_local_address}
bind:
public_address: ${_param:cluster_vip_address}
novncproxy_port: 6080
@@ -181,6 +232,16 @@
protocol: https
vncproxy_url: http://${_param:cluster_vip_address}:6080
workers: 1
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
+ notification:
+ notify_on:
+ state_change: vm_and_task_state
cinder:
controller:
identity:
@@ -189,10 +250,25 @@
host: 127.0.0.1
glance:
protocol: https
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
manila:
common:
identity:
protocol: https
+ default_share_type: default
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
salt:
minion:
cert:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml
index 5dbb948..373433c 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml
@@ -19,6 +19,17 @@
notification:
driver: messagingv2
topics: "notifications"
+ l2gw:
+ enabled: false
+ ovsdb_hosts:
+ ovsdbx: 127.0.0.1:6632
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
linux:
network:
interface:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
index 9a72e92..0e595dc 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
@@ -24,7 +24,7 @@
openstack_gateway_node01_address: ${_param:openstack_gateway_address}
openstack_dns_node01_address: 172.16.10.111
openstack_dns_node02_address: 172.16.10.112
- openstack_share_node01_address: 172.16.10.97
+ openstack_share_node01_address: 172.16.10.130
openstack_share_node01_share_address: ${_param:openstack_share_node01_address}
openstack_telemetry_address: 172.16.10.250
openstack_telemetry_node01_address: 172.16.10.45
@@ -69,6 +69,8 @@
neutron_compute_dvr: True
neutron_compute_agent_mode: dvr
neutron_compute_external_access: True
+ neutron_enable_bgp_vpn: True
+ neutron_bgp_vpn_driver: bagpipe
galera_server_cluster_name: openstack_cluster
galera_server_maintenance_password: workshop
galera_server_admin_password: workshop
@@ -204,12 +206,15 @@
horizon_version: ${_param:openstack_version}
horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
horizon_identity_host: ${_param:cluster_vip_address}
- horizon_identity_encryption: none
+ horizon_identity_encryption: ssl
horizon_identity_version: 2
ceilometer_secret_key: workshop
ceilometer_agent_default_polling_interval: 15
ceilometer_agent_default_polling_meters:
- "*"
+ galera_ssl_enabled: true
+ rabbitmq_ssl_enabled: true
+ rabbitmq_port: 5671 # for non-ssl use 5672 / for ssl 5671
linux:
network:
purge_hosts: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/share.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/share.yml
index a631079..26a0a51 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/share.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/share.yml
@@ -23,3 +23,11 @@
common:
identity:
protocol: https
+ default_share_type: default
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
index bd00035..0b6277f 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
@@ -31,7 +31,7 @@
salt_minion_ca_authority: salt_master_ca
keepalived_openstack_telemetry_vip_address: ${_param:openstack_telemetry_address}
keepalived_openstack_telemetry_vip_password: ${_param:openstack_telemetry_keepalived_password}
- keepalived_openstack_telemetry_vip_interface: ens3
+ keepalived_openstack_telemetry_vip_interface: ens4
cluster_vip_address: ${_param:openstack_telemetry_address}
cluster_local_address: ${_param:single_address}
nginx_proxy_openstack_api_host: ${_param:openstack_telemetry_address}
@@ -115,6 +115,8 @@
common:
database:
host: ${_param:openstack_database_address}
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
server:
identity:
protocol: https
@@ -127,6 +129,9 @@
server:
identity:
protocol: https
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
aodh:
server:
bind:
@@ -136,6 +141,13 @@
identity:
protocol: https
host: ${_param:openstack_control_address}
+ database:
+ ssl:
+ enabled: ${_param:galera_ssl_enabled}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
ceilometer:
server:
bind:
@@ -145,6 +157,10 @@
identity:
protocol: https
host: ${_param:openstack_control_address}
+ message_queue:
+ port: ${_param:rabbitmq_port}
+ ssl:
+ enabled: ${_param:rabbitmq_ssl_enabled}
haproxy:
proxy:
listen:
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index 56e9c28..5905d47 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -109,6 +109,16 @@
value_template: <<node_tenant_ip>>
external_address:
value_template: <<node_external_ip>>
+ openstack_dns01:
+ expression: <<node_hostname>>__equals__dns01
+ cluster_param:
+ openstack_dns_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_dns02:
+ expression: <<node_hostname>>__equals__dns02
+ cluster_param:
+ openstack_dns_node02_address:
+ value_template: <<node_control_ip>>
openstack_gateway:
expression: <<node_hostname>>__startswith__gtw
node_class:
@@ -120,7 +130,7 @@
external_address:
value_template: <<node_external_ip>>
cluster_param:
- openstack_gateway_node01_address:
+ openstack_gateway_address:
value_template: <<node_control_ip>>
openstack_dashboard:
expression: <<node_hostname>>__startswith__prx
@@ -191,6 +201,10 @@
params:
tenant_address: 10.1.0.110
external_address: 10.16.0.110
+ openstack_share_node01:
+ params:
+ single_address: 172.16.10.130
+ tenant_address: 10.1.0.130
openstack_proxy_node01:
classes:
- cluster.virtual-mcp-pike-dvr.openstack.proxy
diff --git a/classes/cluster/virtual-mcp-pike-dvr/init.yml b/classes/cluster/virtual-mcp-pike-dvr/init.yml
index d551411..cbf24f0 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/init.yml
@@ -2,6 +2,7 @@
- system.linux.network.dynamic_hosts
- system.linux.system.repo.mcp.extra
- system.linux.system.single
+- system.linux.system.single.debian
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
index deeb36d..3de11a6 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
@@ -5,6 +5,9 @@
- system.linux.network.hosts
- system.nova.compute.cluster
- system.neutron.compute.cluster
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
+- system.linux.storage.loopback
- system.ceilometer.client.nova_compute
- system.ceilometer.agent.cluster
- system.ceilometer.agent.polling.default
@@ -17,6 +20,7 @@
external_interface: ens6
interface_mtu: 1500
linux_system_codename: xenial
+ loopback_device_size: 20
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
@@ -25,6 +29,11 @@
- host: ${_param:openstack_control_node01_address}
- host: ${_param:openstack_control_node02_address}
- host: ${_param:openstack_control_node03_address}
+ # Compute nodes on devcloud can have different CPUs, we need this
+ # to make sure live migration always work even when cmp VMs are on different computes
+ cpu_mode: custom
+ libvirt:
+ cpu_model: kvm64
neutron:
compute:
notification:
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
index 625e906..3211628 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
@@ -21,6 +21,7 @@
- system.nova.control.cluster
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
+- system.cinder.control.backend.lvm
- system.heat.server.cluster
- system.designate.server.cluster
- system.galera.server.cluster
@@ -116,3 +117,9 @@
novncproxy_port: 6080
vncproxy_url: http://${_param:cluster_vip_address}:6080
workers: 1
+ notification:
+ notify_on:
+ state_change: vm_and_task_state
+ manila:
+ common:
+ default_share_type: default
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
index bcda365..934bf8f 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
@@ -24,7 +24,7 @@
openstack_gateway_node01_address: ${_param:openstack_gateway_address}
openstack_dns_node01_address: 172.16.10.111
openstack_dns_node02_address: 172.16.10.112
- openstack_share_node01_address: 172.16.10.97
+ openstack_share_node01_address: 172.16.10.130
openstack_share_node01_share_address: ${_param:openstack_share_node01_address}
openstack_telemetry_address: 172.16.10.250
openstack_telemetry_node01_address: 172.16.10.45
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
index 04de039..8cef3ce 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
@@ -19,3 +19,6 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
+ manila:
+ common:
+ default_share_type: default
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
index 64411da..09ae269 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
@@ -26,7 +26,7 @@
_param:
keepalived_openstack_telemetry_vip_address: ${_param:openstack_telemetry_address}
keepalived_openstack_telemetry_vip_password: ${_param:openstack_telemetry_keepalived_password}
- keepalived_openstack_telemetry_vip_interface: ens3
+ keepalived_openstack_telemetry_vip_interface: ens4
cluster_vip_address: ${_param:openstack_telemetry_address}
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ${_param:openstack_telemetry_node01_hostname}
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml
index 965e6c2..eb618fe 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/init.yml
@@ -5,6 +5,7 @@
- system.heka.log_collector.output.telegraf
- system.linux.system.repo.mcp.extra
- system.linux.system.single
+- system.linux.system.single.debian
- system.rsyslog.client.single
- system.prometheus.collector
- system.telegraf.agent
diff --git a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
index d1b2b88..697e6bd 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/infra/config.yml
@@ -119,7 +119,7 @@
external_address:
value_template: <<node_external_ip>>
cluster_param:
- openstack_gateway_node01_address:
+ openstack_gateway_address:
value_template: <<node_control_ip>>
openstack_dashboard:
expression: <<node_hostname>>__startswith__prx
@@ -190,6 +190,10 @@
params:
tenant_address: 10.1.0.110
external_address: 10.16.0.110
+ openstack_share_node01:
+ params:
+ single_address: 172.16.10.130
+ tenant_address: 10.1.0.130
openstack_proxy_node01:
classes:
- cluster.virtual-mcp-pike-ovs.openstack.proxy
diff --git a/classes/cluster/virtual-mcp-pike-ovs/init.yml b/classes/cluster/virtual-mcp-pike-ovs/init.yml
index d08e08f..6d75499 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/init.yml
@@ -2,6 +2,7 @@
- system.linux.network.dynamic_hosts
- system.linux.system.repo.mcp.extra
- system.linux.system.single
+- system.linux.system.single.debian
- system.openssh.server.team.lab
- system.openssh.server.team.tcpcloud
- system.openssh.server.team.mcp_qa
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
index 6613c2a..650743c 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
@@ -5,6 +5,9 @@
- system.linux.network.hosts
- system.nova.compute.cluster
- system.neutron.compute.cluster
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
+- system.linux.storage.loopback
- system.ceilometer.agent.cluster
- system.ceilometer.agent.polling.default
- cluster.virtual-mcp-pike-ovs
@@ -15,6 +18,21 @@
external_interface: ens6
interface_mtu: 1500
linux_system_codename: xenial
+ loopback_device_size: 20
+ neutron:
+ compute:
+ bgp_vpn:
+ enabled: True
+ driver: bagpipe
+ bagpipe:
+ local_address: ${_param:tenant_address}
+ peers: 127.0.0.1
+ autonomous_system: 64512
+ enable_rtc: True
+ backend:
+ extension:
+ bagpipe_bgpvpn:
+ enabled: True
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
@@ -23,6 +41,11 @@
- host: ${_param:openstack_control_node01_address}
- host: ${_param:openstack_control_node02_address}
- host: ${_param:openstack_control_node03_address}
+ # Compute nodes on devcloud can have different CPUs, we need this
+ # to make sure live migration always work even when cmp VMs are on different computes
+ cpu_mode: custom
+ libvirt:
+ cpu_model: kvm64
linux:
network:
bridge: openvswitch
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index e4923a0..1d044c0 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -21,6 +21,7 @@
- system.nova.control.cluster
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
+- system.cinder.control.backend.lvm
- system.heat.server.cluster
- system.designate.server.cluster
- system.designate.server.backend.bind
@@ -120,6 +121,10 @@
engine: file
images: []
workers: 1
+ neutron:
+ server:
+ l2gw:
+ enabled: true
nova:
controller:
networking: dvr
@@ -132,3 +137,9 @@
novncproxy_port: 6080
vncproxy_url: http://${_param:cluster_vip_address}:6080
workers: 1
+ notification:
+ notify_on:
+ state_change: vm_and_task_state
+ manila:
+ common:
+ default_share_type: default
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
index 4cb8093..b972747 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
@@ -11,6 +11,12 @@
external_interface: ens6
interface_mtu: 9000
linux_system_codename: xenial
+ neutron:
+ gateway:
+ l2gw:
+ enabled: false
+ ovsdb_hosts:
+ ovsdbx: 127.0.0.1:6632
linux:
network:
bridge: openvswitch
@@ -37,6 +43,7 @@
type: eth
external_interface:
enabled: true
+ ipflush_onchange: true
name: ${_param:external_interface}
mtu: ${_param:interface_mtu}
proto: manual
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
index 647c79f..487dd65 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
@@ -24,7 +24,7 @@
openstack_gateway_node01_address: ${_param:openstack_gateway_address}
openstack_dns_node01_address: 172.16.10.111
openstack_dns_node02_address: 172.16.10.112
- openstack_share_node01_address: 172.16.10.97
+ openstack_share_node01_address: 172.16.10.130
openstack_share_node01_share_address: ${_param:openstack_share_node01_address}
openstack_telemetry_address: 172.16.10.250
openstack_telemetry_node01_address: 172.16.10.45
@@ -56,6 +56,8 @@
neutron_compute_dvr: False
neutron_compute_agent_mode: legacy
neutron_compute_external_access: False
+ neutron_enable_bgp_vpn: True
+ neutron_bgp_vpn_driver: bagpipe
galera_server_cluster_name: openstack_cluster
galera_server_maintenance_password: workshop
galera_server_admin_password: workshop
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml
index 449310b..2ced095 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/share.yml
@@ -19,3 +19,6 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
+ manila:
+ common:
+ default_share_type: default
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
index 513ae52..62ded65 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
@@ -27,7 +27,7 @@
gnocchi_statsd_resource_id: 07f26121-5777-48ba-8a0b-d70468133dd9
keepalived_openstack_telemetry_vip_address: ${_param:openstack_telemetry_address}
keepalived_openstack_telemetry_vip_password: ${_param:openstack_telemetry_keepalived_password}
- keepalived_openstack_telemetry_vip_interface: ens3
+ keepalived_openstack_telemetry_vip_interface: ens4
cluster_vip_address: ${_param:openstack_telemetry_address}
cluster_local_address: ${_param:single_address}
cluster_node01_hostname: ${_param:openstack_telemetry_node01_hostname}
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 a769d1c..bf525a7 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.8.6-5
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
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/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
index e35f3c5..e7e5dd8 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_calico_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.8.6-5
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
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/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/init.yml
index 66a156f..c75a053 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/init.yml
@@ -5,7 +5,9 @@
- system.fluentd.label.default_metric.prometheus
- system.fluentd.label.default_output.elasticsearch
- system.fluentd.label.default_output.drop_event
-- system.linux.system.repo.fluentd
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- cluster.virtual-mcp11-k8s-calico.kubernetes
- cluster.virtual-mcp11-k8s-calico.stacklight
- cluster.virtual-mcp11-k8s-calico.infra
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index 18599c4..20bcfcf 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -27,13 +27,13 @@
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.8.6-5
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
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"
- kubernetes_virtlet_image: mirantis/virtlet:v0.7.0
- kubernetes_criproxy_version: v0.9.4
- kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
+ kubernetes_virtlet_image: mirantis/virtlet:v1.0.0
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
kubernetes_externaldns_image: mirantis/external-dns:latest
kubernetes_externaldns_provider: coredns
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
index 3910a1a..8f745af 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
@@ -13,6 +13,8 @@
stacklight_node02_address: 172.16.10.108
stacklight_node03_address: 172.16.10.109
+ openstack_version: pike
+
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
stacklight_log_address: ${_param:stacklight_monitor_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
index 1dc5e4c..72d6705 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/server.yml
@@ -66,7 +66,7 @@
grafana_database_password: ${_param:mysql_grafana_password}
# InfluxDB
influxdb_admin_password: password
- influxdb_port: 15016
+ influxdb_port: 8086
influxdb_stacklight_password: lmapass
influxdb_client_host: ${_param:stacklight_monitor_address}
influxdb_client_port: ${_param:influxdb_port}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/.env b/classes/cluster/virtual-mcp11-k8s-contrail/.env
index e5922db..49c1ca4 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/.env
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="heka"
+EXTRA_FORMULAS="fluentd grafana heka nginx ntp prometheus rsyslog sphinx telegraf"
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
index f6604a7..717aa88 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/config.yml
@@ -1,15 +1,21 @@
classes:
-- system.linux.system.repo.ubuntu
+- system.linux.system.single
+- system.linux.system.single.debian
- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
- system.openssh.client.lab
- system.salt.master.pkg
-- system.salt.minion.ca.salt_master
- system.salt.master.api
-- system.reclass.storage.salt
+- system.salt.minion.ca.salt_master
- system.salt.minion.cert.k8s_server
+- system.mysql.client
+- system.mysql.client.database.grafana
+- system.reclass.storage.salt
- system.reclass.storage.system.kubernetes_control_cluster
- system.reclass.storage.system.opencontrail_control_cluster
-- cluster.virtual-mcp11-k8s-contrail.infra
+- system.sphinx.server.doc.reclass
+- cluster.virtual-mcp11-k8s-contrail
parameters:
_param:
salt_master_base_environment: prd
@@ -17,9 +23,16 @@
reclass_data_revision: master
reclass_config_master: ${_param:infra_config_deploy_address}
single_address: ${_param:infra_config_address}
+ deploy_address: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
salt_master_host: ${_param:infra_config_deploy_address}
+ openstack_version: pike
+ salt:
+ master:
+ reactor:
+ reclass/minion/classify:
+ - salt://reclass/reactor/node_register.sls
linux:
network:
interface:
@@ -29,11 +42,15 @@
proto: static
address: ${_param:single_address}
netmask: 255.255.255.0
- salt:
- master:
- reactor:
- reclass/minion/classify:
- - salt://reclass/reactor/node_register.sls
+ pre_up_cmds:
+ - "iptables -t nat -A POSTROUTING -o ens3 -j MASQUERADE"
+ post_down_cmds:
+ - "iptables -t nat -F POSTROUTING"
+ system:
+ kernel:
+ sysctl:
+ net.ipv4.conf.ens3.forwarding: 1
+ net.ipv4.conf.ens3.send_redirects: 0
reclass:
storage:
class_mapping:
@@ -46,6 +63,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>>__equals__cfg01
cluster_param:
@@ -53,6 +72,8 @@
value_template: <<node_control_ip>>
infra_config_deploy_address:
value_template: <<node_deploy_ip>>
+ cluster_domain:
+ value_template: <<node_domain>>
infra_proxy:
expression: <<node_hostname>>__startswith__prx
node_class:
@@ -63,16 +84,37 @@
cluster_param:
kubernetes_control_node01_address:
value_template: <<node_control_ip>>
+ kubernetes_control_node01_deploy_address:
+ value_template: <<node_deploy_ip>>
kubernetes_control02:
expression: <<node_hostname>>__equals__ctl02
cluster_param:
kubernetes_control_node02_address:
value_template: <<node_control_ip>>
+ kubernetes_control_node02_deploy_address:
+ value_template: <<node_deploy_ip>>
kubernetes_control03:
expression: <<node_hostname>>__equals__ctl03
cluster_param:
kubernetes_control_node03_address:
value_template: <<node_control_ip>>
+ kubernetes_control_node03_deploy_address:
+ value_template: <<node_deploy_ip>>
+ etcd_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ etcd_control_node01_address:
+ value_template: <<node_deploy_ip>>
+ etcd_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ etcd_control_node02_address:
+ value_template: <<node_deploy_ip>>
+ etcd_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ etcd_control_node03_address:
+ value_template: <<node_deploy_ip>>
kubernetes_compute:
expression: <<node_hostname>>__startswith__cmp
node_class:
@@ -169,4 +211,4 @@
params:
salt_master_host: ${_param:infra_config_deploy_address}
linux_system_codename: xenial
- single_address: ${_param:kubernetes_compute_node02_address}
\ No newline at end of file
+ single_address: ${_param:kubernetes_compute_node02_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
index 6594f9c..9b30986 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/infra/init.yml
@@ -1,26 +1,10 @@
-classes:
-- system.linux.system.single
-- system.linux.system.single.debian
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.ubuntu
-- system.openssh.server.team.all
-- system.rsyslog.client.single
-- system.heka.log_collector.single
-- system.heka.log_collector.output.telegraf
-- system.telegraf.agent
-- system.prometheus.collector
-- service.grafana.collector
-- cluster.virtual-mcp11-k8s-contrail.kubernetes
-- cluster.virtual-mcp11-k8s-contrail.opencontrail
-- cluster.virtual-mcp11-k8s-contrail.stacklight
-- cluster.overrides
parameters:
_param:
# infra service addresses
infra_config_hostname: cfg01
infra_config_address: 172.16.10.100
infra_config_deploy_address: 192.168.10.90
+ cluster_public_host: 172.16.10.254
cluster_domain: virtual-mcp11-k8s-contrail.local
cluster_name: virtual-mcp11-k8s-contrail
@@ -28,6 +12,11 @@
linux:
network:
host:
+ self:
+ address: ${_param:single_address}
+ names:
+ - ${linux:system:name}
+ - ${linux:system:name}.${linux:system:domain}
cfg01:
address: ${_param:infra_config_address}
names:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/init.yml
new file mode 100644
index 0000000..3577228
--- /dev/null
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/init.yml
@@ -0,0 +1,38 @@
+classes:
+- service.grafana.collector
+- system.linux.network.dynamic_hosts
+- system.linux.system.single
+- system.linux.system.single.debian
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.apt_mirantis.fluentd
+- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.fluentd
+- system.fluentd.label.default_metric
+- system.fluentd.label.default_metric.prometheus
+- system.fluentd.label.default_output.elasticsearch
+- system.fluentd.label.default_output.drop_event
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- system.openssh.server.team.k8s_team
+- system.rsyslog.client.single
+- system.prometheus.collector
+- system.telegraf.agent
+- cluster.virtual-mcp11-k8s-contrail.infra
+- cluster.virtual-mcp11-k8s-contrail.opencontrail
+- cluster.virtual-mcp11-k8s-contrail.kubernetes
+- cluster.virtual-mcp11-k8s-contrail.stacklight
+- cluster.overrides
+parameters:
+ salt:
+ minion:
+ trusted_ca_minions:
+ - cfg01
+ linux:
+ network:
+ host:
+ vsrx1:
+ address: 172.16.10.131
+ names:
+ - vsrx1
+ - vsrx1.${_param:cluster_domain}
\ No newline at end of file
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index f8f568b..3f1d2c3 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -1,11 +1,11 @@
classes:
- system.linux.system.repo.docker_legacy
- system.kubernetes.pool.cluster
+- system.linux.network.hosts
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
-- cluster.virtual-mcp11-k8s-contrail.infra
- cluster.virtual-mcp11-k8s-contrail.opencontrail.compute
-- cluster.overrides
+- cluster.virtual-mcp11-k8s-contrail
parameters:
linux:
network:
@@ -14,6 +14,7 @@
enabled: true
type: eth
proto: manual
+ ipflush_onchange: true
vhost0:
enabled: true
type: eth
@@ -34,6 +35,7 @@
kubernetes:
pool:
kubelet:
+ address: ${_param:single_address}
fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
opencontrail:
@@ -46,12 +48,11 @@
addons:
virtlet:
enabled: ${_param:kubernetes_virtlet_enabled}
- namespace: kube-system
+ namespace: ${_param:kubernetes_addon_namespace}
image: ${_param:kubernetes_virtlet_image}
criproxy_version: ${_param:kubernetes_criproxy_version}
criproxy_source: ${_param:kubernetes_criproxy_checksum}
hosts:
- - ${_param:kubernetes_compute_node01_hostname}
- - ${_param:kubernetes_compute_node02_hostname}
+ - ${linux:system:name}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index ddfd347..552047c 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -7,13 +7,16 @@
- system.salt.minion.cert.etcd_server
- system.kubernetes.master.cluster
- cluster.virtual-mcp11-k8s-contrail.kubernetes.compute
-- cluster.overrides
+- cluster.virtual-mcp11-k8s-contrail
parameters:
_param:
- keepalived_vip_interface: ens3
+ keepalived_vip_interface: vhost0
keepalived_vip_virtual_router_id: 60
+ cluster_local_address: ${_param:deploy_address}
etcd:
server:
+ bind:
+ host: ${_param:deploy_address}
source:
engine: docker_hybrid
ssl:
@@ -22,7 +25,8 @@
common:
addons:
dashboard:
- enabled: false
+ enabled: ${_param:kubernetes_dashboard}
+ image: ${_param:kubernetes_dashboard_image}
helm:
enabled: ${_param:kubernetes_helm_enabled}
netchecker:
@@ -30,9 +34,16 @@
agent_image: ${_param:kubernetes_netchecker_agent_image}
server_image: ${_param:kubernetes_netchecker_server_image}
contrail_network_controller:
- namespace: kube-system
- enabled: true
+ 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:
@@ -41,15 +52,13 @@
provider: ${_param:kubernetes_externaldns_provider}
master:
kubelet:
+ address: ${_param:single_address}
fail_on_swap: ${_param:kubelet_fail_on_swap}
etcd:
ssl:
enabled: true
namespace:
netchecker:
- enabled: true
- namespace:
- netchecker:
enabled: ${_param:kubernetes_netchecker_enabled}
network:
opencontrail:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index 0cc1a00..40af122 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -1,6 +1,7 @@
parameters:
_param:
+ openstack_version: pike
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
@@ -24,28 +25,37 @@
# component docker images
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.8.6-5
- kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
- kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11-9
+ kubernetes_criproxy_version: v0.10.0
+ kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da
+ 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"
+ kubernetes_virtlet_image: mirantis/virtlet:v0.9.4
kubernetes_externaldns_image: mirantis/external-dns:latest
kubernetes_externaldns_provider: coredns
- kubernetes_criproxy_version: v0.9.4
- kubernetes_criproxy_checksum: md5=f1a08e16e15f61240ea324f6b335e013
# switches of addons
+ kubernetes_addon_namespace: kube-system
+ kubernetes_dns: true
+ kubernetes_dashboard: false
kubernetes_helm_enabled: true
kubernetes_netchecker_enabled: true
kubernetes_calico_policy_enabled: false
kubernetes_virtlet_enabled: false
- kubernetes_virtlet_image: mirantis/virtlet:latest
+ kubernetes_contrail_network_controller: true
kubernetes_coredns_enabled: false
kubernetes_externaldns_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_address: 172.16.10.253
kubernetes_control_node01_hostname: ctl01
kubernetes_control_node02_hostname: ctl02
kubernetes_control_node03_hostname: ctl03
@@ -54,28 +64,32 @@
kubernetes_control_node01_address: 172.16.10.101
kubernetes_control_node02_address: 172.16.10.102
kubernetes_control_node03_address: 172.16.10.103
+ kubernetes_control_node01_deploy_address: 192.168.10.101
+ kubernetes_control_node02_deploy_address: 192.168.10.102
+ kubernetes_control_node03_deploy_address: 192.168.10.103
kubernetes_compute_node01_address: 172.16.10.105
kubernetes_compute_node02_address: 172.16.10.106
+ etcd_control_node01_address: 192.168.10.101
+ etcd_control_node02_address: 192.168.10.102
+ etcd_control_node03_address: 192.168.10.103
kubernetes_proxy_node01_hostname: prx01
kubernetes_proxy_node01_address: 172.16.10.121
cluster_vip_address: ${_param:kubernetes_control_address}
- cluster_local_address: ${_param:single_address}
# etcd stuff
cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}
- cluster_node01_address: ${_param:kubernetes_control_node01_address}
+ cluster_node01_address: ${_param:etcd_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_address: ${_param:etcd_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_address: ${_param:etcd_control_node03_address}
cluster_node03_port: 4001
linux:
network:
- purge_hosts: true
host:
ctl:
address: ${_param:kubernetes_control_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
index 35cead0..0945af2 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
@@ -1,10 +1,10 @@
classes:
- system.linux.system.lowmem
-- system.linux.system.repo.cassandra
- system.linux.system.repo.mcp.contrail
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.cassandra
+- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
- system.opencontrail.client.resource.edge_router
- system.rabbitmq.server.cluster
- system.opencontrail.control.cluster
@@ -13,11 +13,13 @@
- system.opencontrail.client.resource.config_node
- system.opencontrail.client.resource.database_node
- system.opencontrail.client.resource.analytics_node
+- system.opencontrail.client.resource.global_vrouter_config
- system.haproxy.proxy.listen.opencontrail.analytics
- system.prometheus.exporters.jmx
-- cluster.virtual-mcp11-k8s-contrail.infra
+- cluster.virtual-mcp11-k8s-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-k8s-contrail/opencontrail/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
index ad264cb..3ad59f2 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
@@ -1,6 +1,7 @@
parameters:
_param:
opencontrail_version: 3.0
+ linux_repo_contrail_component: oc323
opencontrail_control_hostname: ntw
opencontrail_control_node01_hostname: ntw01
opencontrail_control_node02_hostname: ntw02
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
index fbdcd1f..6d10dd1 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
@@ -1,5 +1,7 @@
parameters:
_param:
+ openstack_version: pike
+
stacklight_monitor_address: 172.16.10.251
stacklight_node01_hostname: mon01
stacklight_node02_hostname: mon02
@@ -9,6 +11,7 @@
stacklight_node03_address: 172.16.10.109
# Prometheus
prometheus_control_address: ${_param:stacklight_monitor_address}
+ stacklight_log_address: ${_param:stacklight_monitor_address}
mysql_admin_user: root
mysql_admin_password: workshop
@@ -24,9 +27,9 @@
galera_xtrabackup_parallel: 1
galera_error_log_enabled: true
- heka_elasticsearch_host: ${_param:stacklight_monitor_address}
elasticsearch_port: 9200
stacklight_environment: ${_param:cluster_domain}
+ fluentd_elasticsearch_host: ${_param:stacklight_log_address}
linux:
network:
host:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
index 52b8fbf..5bea43d 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/proxy.yml
@@ -5,7 +5,7 @@
- system.nginx.server.proxy.monitoring.prometheus_server
- system.nginx.server.proxy.monitoring.prometheus_alertmanager
- system.salt.minion.cert.proxy
-- cluster.virtual-mcp11-k8s-contrail.infra
+- cluster.virtual-mcp11-k8s-contrail
parameters:
_param:
nginx_proxy_grafana_port: 15013
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
index ef53609..2c33d30 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/server.yml
@@ -26,7 +26,7 @@
- system.prometheus.server.target.dns
- system.docker.swarm.stack.monitoring.prometheus_global
- system.docker.swarm.stack.dashboard
-- cluster.virtual-mcp11-k8s-contrail.infra
+- cluster.virtual-mcp11-k8s-contrail
parameters:
_param:
cluster_public_host: mon
@@ -44,7 +44,7 @@
keepalived_prometheus_vip_password: password
keepalived_prometheus_vip_interface: ens4
# Galera
- openstack_version: newton
+ openstack_version: pike
galera_innodb_buffer_pool_size: 1024M
galera_max_connections: 200
# Grafana
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
index 0dade38..0861260 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
@@ -7,6 +7,8 @@
- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
- system.linux.system.single
+- system.linux.system.single.debian
+- system.watchdog.server
- system.rsyslog.client.single
- system.prometheus.collector
- system.telegraf.agent
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
index b74e2ca..db6c5c0 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
@@ -47,6 +47,20 @@
- host: ${_param:openstack_control_node01_address}
- host: ${_param:openstack_control_node02_address}
- host: ${_param:openstack_control_node03_address}
+ neutron:
+ compute:
+ bgp_vpn:
+ enabled: True
+ driver: bagpipe
+ bagpipe:
+ local_address: ${_param:tenant_address}
+ peers: 127.0.0.1
+ autonomous_system: 64512
+ enable_rtc: True
+ backend:
+ extension:
+ bagpipe_bgpvpn:
+ enabled: True
linux:
network:
bridge: openvswitch
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
index 1f8adb0..20d0dea 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
@@ -133,6 +133,8 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
+ l2gw:
+ enabled: true
nova:
controller:
networking: dvr
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
index 028c83d..fb39eb4 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
@@ -11,6 +11,12 @@
external_interface: ens6
interface_mtu: 9000
linux_system_codename: xenial
+ neutron:
+ gateway:
+ l2gw:
+ enabled: false
+ ovsdb_hosts:
+ ovsdbx: 127.0.0.1:6632
linux:
network:
bridge: openvswitch
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
index 2f132ed..3e5bf97 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
@@ -19,6 +19,8 @@
neutron_compute_dvr: False
neutron_compute_agent_mode: legacy
neutron_compute_external_access: False
+ neutron_enable_bgp_vpn: True
+ neutron_bgp_vpn_driver: bagpipe
galera_server_cluster_name: openstack_cluster
galera_server_maintenance_password: workshop
galera_server_admin_password: workshop
diff --git a/classes/cluster/virtual-offline-pike-ovs/init.yml b/classes/cluster/virtual-offline-pike-ovs/init.yml
index 959ed0b..470680c 100644
--- a/classes/cluster/virtual-offline-pike-ovs/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/init.yml
@@ -8,6 +8,8 @@
- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
- system.linux.system.single
- system.rsyslog.client.single
+- system.linux.system.single.debian
+- system.watchdog.server
- system.prometheus.collector
- system.telegraf.agent
- system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-offline-ssl/.env b/classes/cluster/virtual-offline-ssl/.env
new file mode 100644
index 0000000..11849f2
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/.env
@@ -0,0 +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 iptables fluentd dogtag barbican)
diff --git a/classes/cluster/virtual-offline-ssl/infra/backup/client_common.yml b/classes/cluster/virtual-offline-ssl/infra/backup/client_common.yml
new file mode 100644
index 0000000..79b8f6b
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/infra/backup/client_common.yml
@@ -0,0 +1,40 @@
+classes:
+- system.backupninja.client.single
+- system.openssh.client.root
+parameters:
+ _param:
+ backupninja_backup_host: ${_param:openstack_control_node03_address}
+ root_private_key: |
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
+ k0C6AYpJnIyEm93pMj5cLm08qRqMW+2pdOhYjcH69yg5MrX5SkRk8jCmIHIYoIbh
+ Qnwbnj3dd3I39ZdfU2FO7u2vlbglVou6ZoQxlJDItuLNtzq6EG+w9eF19e7+OsC6
+ 6iUItp618zfw1l3J/8nKvCGe2RYDf7mJW6XwCl/DwryJmwwzvPgYJ3QMuDD8/HFj
+ lrJ3xjFTXj4b4Ws1XIoy78fFbtiLr4OwqCYkho03u2E5rOOP1qZxZB63sivHMLMO
+ MM5bOAQKbulFNoyALADGYfc7sf0bZ4u9XXDXxQIDAQABAoIBAQCfmc2MJRT97KW1
+ yqpCpX9BrAiymuiNHf+cjEcSZxEUyHkjIRFmJt+9WB0W7ba1anM92vCUiPDojSzH
+ dig9Oi578JxR20NrK8uqv4jUHzrknynzLveVI3CUEcOSnglfJQijbxDFKfOCFPvV
+ FUyE1UATMNBh6+LNfMprgu+exuMWOPnDyUiYQ+WZ0JfuZY8fuaZte4woJJOb9LUu
+ 5rsMG/smIzjpgZ0Z9ZVDMurfq565qhpaXRAqKeIuyht8pacTo31iMQdHB78AvY/3
+ g0z21Gk8k3z0Kr/YFKr2r4FmXY5m/gAUvZly2ZrVQM5XsbTVCzq/JpI5fssNvSbU
+ AKmXzf4RAoGBAOO3d4/cstxERzW6hyOTjZIN1ppR52CsnZTsVPbfd0pCtmzmVZce
+ CtHKdcXSbTwZvvkK09QSWAp3MoSpd0gIOiLU8Wx/R/RIZsu9BlhTS3r3EQLnk72d
+ H/1TTA+j4T/LIYLSojQ1RxvIrHetAD44j732aTwKAHj/SybEAVqNkOB/AoGBAN0u
+ gLcrgqIHGrk4VjWSvlCGymfF40equcx+ud7XhfZDGETUOSahW4dPZ52cjPAkrCBQ
+ MMfcDwSVGsOAjd+mNt11BHUKobnhXwFaWWuyqyn9NmWFbjMbICVh7E3Of5aVN38o
+ lrmo/7LuKMVG7XRwphCv5NkaJmQG4njDyUQWlaW7AoGADCd8wDb9bPhP/LQqBmIX
+ ylXmwHHisaxE9O/wUQT4bwREjGd25gv6c9wkkRx8LBsLsGs9hzI7dMOL9Ly+2x9l
+ SvqmsC3S/1zl77X1Ir2/Z57MT6Vgo1xBmtnZU3Rhz2/eKAdqFPNLClaZrgGT475N
+ HcyLLWMzR0IJFtabY+Puea0CgYA8Zb5wRkldxWLewSuJZZDinGwY+kieAVjLJq/K
+ 0j+ah6fQ48LXcah0wpIgz+cMjHcUO9GWQdk3/x9X03rqX5EL2DBnZYfUIl63F9zj
+ M97ZkHOSNWVqPzX//0Vv2butewG0j3jZKfTo/2/SrxOYgEpYtC9huWpSVi7xm0US
+ erhSkQKBgFIf9JEsfgE57ANhvITZ3ZI0uZXNxZkXQaVg8jvScDi79IIhy9iPzhKC
+ aIIQoDNIlWv1ftCRZ5AlBvVXgvQ/QNrwy48JiQTzWZlb9Ezg8w+olQmSbG6fq7Y+
+ 7r3i+QUZ7RBdOb24QcQ618q54ozNTCB7OywY78ptFzeoBeptiNr1
+ -----END RSA PRIVATE KEY-----
+ # for salt-master backup
+ backupninja:
+ client:
+ target:
+ home_dir: /srv/volumes/backup/backupninja
+ engine_opts: "-av --delete --recursive --safe-links"
diff --git a/classes/cluster/virtual-offline-ssl/infra/backup/client_mysql.yml b/classes/cluster/virtual-offline-ssl/infra/backup/client_mysql.yml
new file mode 100644
index 0000000..18cabd8
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/infra/backup/client_mysql.yml
@@ -0,0 +1,38 @@
+classes:
+- system.xtrabackup.client.single
+parameters:
+ _param:
+ xtrabackup_remote_server: ${_param:openstack_control_node03_address}
+ xtrabackup_qpress_source_name: http://${_param:aptly_server_address}:8078/qpress-11-linux-x64.tar
+ root_private_key: |
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEowIBAAKCAQEAxL6/rVgCetsETpZaUmXmkj8cZ1WN0eubH1FvMDOi/La9ZJyT
+ k0C6AYpJnIyEm93pMj5cLm08qRqMW+2pdOhYjcH69yg5MrX5SkRk8jCmIHIYoIbh
+ Qnwbnj3dd3I39ZdfU2FO7u2vlbglVou6ZoQxlJDItuLNtzq6EG+w9eF19e7+OsC6
+ 6iUItp618zfw1l3J/8nKvCGe2RYDf7mJW6XwCl/DwryJmwwzvPgYJ3QMuDD8/HFj
+ lrJ3xjFTXj4b4Ws1XIoy78fFbtiLr4OwqCYkho03u2E5rOOP1qZxZB63sivHMLMO
+ MM5bOAQKbulFNoyALADGYfc7sf0bZ4u9XXDXxQIDAQABAoIBAQCfmc2MJRT97KW1
+ yqpCpX9BrAiymuiNHf+cjEcSZxEUyHkjIRFmJt+9WB0W7ba1anM92vCUiPDojSzH
+ dig9Oi578JxR20NrK8uqv4jUHzrknynzLveVI3CUEcOSnglfJQijbxDFKfOCFPvV
+ FUyE1UATMNBh6+LNfMprgu+exuMWOPnDyUiYQ+WZ0JfuZY8fuaZte4woJJOb9LUu
+ 5rsMG/smIzjpgZ0Z9ZVDMurfq565qhpaXRAqKeIuyht8pacTo31iMQdHB78AvY/3
+ g0z21Gk8k3z0Kr/YFKr2r4FmXY5m/gAUvZly2ZrVQM5XsbTVCzq/JpI5fssNvSbU
+ AKmXzf4RAoGBAOO3d4/cstxERzW6hyOTjZIN1ppR52CsnZTsVPbfd0pCtmzmVZce
+ CtHKdcXSbTwZvvkK09QSWAp3MoSpd0gIOiLU8Wx/R/RIZsu9BlhTS3r3EQLnk72d
+ H/1TTA+j4T/LIYLSojQ1RxvIrHetAD44j732aTwKAHj/SybEAVqNkOB/AoGBAN0u
+ gLcrgqIHGrk4VjWSvlCGymfF40equcx+ud7XhfZDGETUOSahW4dPZ52cjPAkrCBQ
+ MMfcDwSVGsOAjd+mNt11BHUKobnhXwFaWWuyqyn9NmWFbjMbICVh7E3Of5aVN38o
+ lrmo/7LuKMVG7XRwphCv5NkaJmQG4njDyUQWlaW7AoGADCd8wDb9bPhP/LQqBmIX
+ ylXmwHHisaxE9O/wUQT4bwREjGd25gv6c9wkkRx8LBsLsGs9hzI7dMOL9Ly+2x9l
+ SvqmsC3S/1zl77X1Ir2/Z57MT6Vgo1xBmtnZU3Rhz2/eKAdqFPNLClaZrgGT475N
+ HcyLLWMzR0IJFtabY+Puea0CgYA8Zb5wRkldxWLewSuJZZDinGwY+kieAVjLJq/K
+ 0j+ah6fQ48LXcah0wpIgz+cMjHcUO9GWQdk3/x9X03rqX5EL2DBnZYfUIl63F9zj
+ M97ZkHOSNWVqPzX//0Vv2butewG0j3jZKfTo/2/SrxOYgEpYtC9huWpSVi7xm0US
+ erhSkQKBgFIf9JEsfgE57ANhvITZ3ZI0uZXNxZkXQaVg8jvScDi79IIhy9iPzhKC
+ aIIQoDNIlWv1ftCRZ5AlBvVXgvQ/QNrwy48JiQTzWZlb9Ezg8w+olQmSbG6fq7Y+
+ 7r3i+QUZ7RBdOb24QcQ618q54ozNTCB7OywY78ptFzeoBeptiNr1
+ -----END RSA PRIVATE KEY-----
+ xtrabackup:
+ server:
+ enabled: false
+ backup_dir: /srv/volumes/backup/xtrabackup
diff --git a/classes/cluster/virtual-offline-ssl/infra/backup/server.yml b/classes/cluster/virtual-offline-ssl/infra/backup/server.yml
new file mode 100644
index 0000000..8f84903
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/infra/backup/server.yml
@@ -0,0 +1,15 @@
+classes:
+- system.backupninja.server.single
+- system.xtrabackup.server.single
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.backup
+parameters:
+ _param:
+ backupninja_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+ xtrabackup_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEvr+tWAJ62wROllpSZeaSPxxnVY3R65sfUW8wM6L8tr1knJOTQLoBikmcjISb3ekyPlwubTypGoxb7al06FiNwfr3KDkytflKRGTyMKYgchighuFCfBuePd13cjf1l19TYU7u7a+VuCVWi7pmhDGUkMi24s23OroQb7D14XX17v46wLrqJQi2nrXzN/DWXcn/ycq8IZ7ZFgN/uYlbpfAKX8PCvImbDDO8+BgndAy4MPz8cWOWsnfGMVNePhvhazVcijLvx8Vu2Iuvg7CoJiSGjTe7YTms44/WpnFkHreyK8cwsw4wzls4BApu6UU2jIAsAMZh9zux/Rtni71dcNfF
+ backupninja:
+ server:
+ home_dir: /srv/volumes/backup/backupninja
+ xtrabackup:
+ server:
+ backup_dir: /srv/volumes/backup/xtrabackup
\ No newline at end of file
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-ssl/infra/config.yml
similarity index 70%
rename from classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
rename to classes/cluster/virtual-offline-ssl/infra/config.yml
index f895a17..31d00aa 100644
--- a/classes/cluster/virtual-pike-ovs-dpdk/infra/config.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/config.yml
@@ -2,42 +2,50 @@
- service.git.client
- system.linux.system.single
- system.linux.system.single.debian
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.salt
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.openssh.client.lab
- system.salt.master.pkg
- system.salt.master.api
+- system.salt.master.formula.pkg.manila
+- system.salt.master.formula.pkg.gnocchi
+- system.salt.master.formula.pkg.panko
+# Add when reclass bumped
+#-salt/master/formula/pkg/dogtag.yml
- system.reclass.storage.salt
- system.salt.minion.ca.salt_master
-- system.salt.minion.cert.proxy
- system.sphinx.server.doc.reclass
- system.keystone.client.single
-- system.keystone.client.service.ceilometer
- system.keystone.client.service.nova21
-- system.keystone.client.service.glare
+- system.keystone.client.service.nova-placement
- system.keystone.client.service.cinder3
- system.keystone.client.service.designate
-- system.mysql.client.single
+- system.keystone.client.service.manila
+- system.keystone.client.service.manila2
+- system.keystone.client.service.aodh
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.panko
+- system.keystone.client.service.gnocchi
+- system.keystone.client.service.barbican
+- system.reclass.storage.system.openstack_dns_cluster
- system.reclass.storage.system.openstack_control_cluster
-- system.reclass.storage.system.stacklight_server_cluster
- system.reclass.storage.system.openstack_compute_multi
-- system.reclass.storage.system.openstack_dashboard_single
- system.reclass.storage.system.openstack_gateway_single
-- cluster.virtual-pike-ovs-dpdk.openstack.proxy
-- cluster.virtual-pike-ovs-dpdk.stacklight.proxy
-- cluster.virtual-pike-ovs-dpdk
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.openstack_share_single
+- system.reclass.storage.system.openstack_telemetry_cluster
+- cluster.virtual-offline-ssl
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
+ salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
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:
@@ -47,19 +55,17 @@
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
+ environment:
+ prd:
+ formula:
+ dogtag:
+ source: pkg
+ name: salt-formula-dogtag
reclass:
storage:
class_mapping:
@@ -119,21 +125,6 @@
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>>
openstack_dashboard:
expression: <<node_hostname>>__startswith__prx
node_class:
@@ -143,40 +134,60 @@
cluster_param:
openstack_proxy_node01_address:
value_template: <<node_control_ip>>
+ openstack_share:
+ expression: <<node_hostname>>__startswith__share
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.share
+ cluster_param:
+ openstack_share_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_share_node01_share_address:
+ value_template: <<node_tenant_ip>>
+ openstack_telemetry01:
+ expression: <<node_hostname>>__equals__mdb01
+ cluster_param:
+ openstack_telemetry_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_telemetry02:
+ expression: <<node_hostname>>__equals__mdb02
+ cluster_param:
+ openstack_telemetry_node02_address:
+ value_template: <<node_control_ip>>
+ openstack_telemetry03:
+ expression: <<node_hostname>>__equals__mdb03
+ cluster_param:
+ openstack_telemetry_node03_address:
+ value_template: <<node_control_ip>>
node:
openstack_control_node01:
classes:
- service.galera.master.cluster
+ - service.dogtag.server.cluster.master
params:
mysql_cluster_role: master
linux_system_codename: xenial
openstack_control_node02:
classes:
- service.galera.slave.cluster
+ - service.dogtag.server.cluster.slave
params:
mysql_cluster_role: slave
linux_system_codename: xenial
openstack_control_node03:
classes:
- service.galera.slave.cluster
+ - service.dogtag.server.cluster.slave
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:
- dpdk0_name: ens5
- dpdk0_pci: '"0000:00:05.0"'
single_address: 172.16.10.105
tenant_address: 10.1.0.105
external_address: 10.16.0.105
openstack_compute_node02:
params:
- dpdk0_name: ens5
- dpdk0_pci: '"0000:00:05.0"'
single_address: 172.16.10.106
tenant_address: 10.1.0.106
external_address: 10.16.0.106
@@ -186,6 +197,18 @@
external_address: 10.16.0.110
openstack_proxy_node01:
classes:
- - cluster.virtual-pike-ovs-dpdk.openstack.proxy
+ - cluster.virtual-offline-ssl.openstack.proxy
params:
linux_system_codename: xenial
+ openstack_telemetry_node01:
+ params:
+ # create resources only from 1 controller
+ # to prevent race conditions
+ ceilometer_create_gnocchi_resources: true
+ redis_cluster_role: 'master'
+ openstack_telemetry_node02:
+ params:
+ redis_cluster_role: 'slave'
+ openstack_telemetry_node03:
+ params:
+ redis_cluster_role: 'slave'
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/infra/init.yml b/classes/cluster/virtual-offline-ssl/infra/init.yml
similarity index 100%
rename from classes/cluster/virtual-pike-ovs-dpdk/infra/init.yml
rename to classes/cluster/virtual-offline-ssl/infra/init.yml
diff --git a/classes/cluster/virtual-offline-ssl/init.yml b/classes/cluster/virtual-offline-ssl/init.yml
new file mode 100644
index 0000000..fb3c853
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/init.yml
@@ -0,0 +1,78 @@
+classes:
+- system.linux.network.dynamic_hosts
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
+- system.linux.system.single
+- system.linux.system.single.debian
+- system.rsyslog.client.single
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- cluster.virtual-offline-ssl.infra
+- cluster.virtual-offline-ssl.openstack
+parameters:
+ _param:
+ cluster_domain: virtual-offline-ssl.local
+ cluster_name: virtual-offline-ssl
+ salt_minion_ca_host: cfg01.${linux:system:domain}
+ # infra service addresses
+ infra_config_hostname: cfg01
+ infra_config_address: 172.16.10.100
+ local_repos: true
+ local_repo_url: mirror.mcp.mirantis.local.test
+ linux_repo_refresh_db: true
+ aptly_server_address: 10.170.0.226
+ remote_rsyslog_host: 127.0.0.3
+ remote_rsyslog_port: 10514
+ salt:
+ minion:
+ trusted_ca_minions:
+ - cfg01.${linux:system:domain}
+ rsyslog:
+ client:
+ run_user: syslog
+ run_group: adm
+ enabled: true
+ rainerscript:
+ module:
+ imfile: {}
+ input:
+ imfile:
+ nginx:
+ File: "/var/log/nginx/*.log"
+ Tag: "nginx__"
+ Severity: "notice"
+ Facility: "local0"
+ PersistStateInterval: "0"
+ Ruleset: "myapp_logs"
+ apache2:
+ File: "/var/log/apache2/*.log"
+ Tag: "apache2__"
+ Severity: "notice"
+ Facility: "local0"
+ Ruleset: "myapp_logs"
+ PersistStateInterval: "0"
+ rabbitmq:
+ File: "/var/log/rabbitmq/*.log"
+ Tag: "rabbitmq__"
+ Severity: "notice"
+ Facility: "local0"
+ PersistStateInterval: "0"
+ Ruleset: "myapp_logs"
+ template:
+ ImfileFilePath:
+ parameter:
+ type: string
+ string: "<%PRI%>%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag:1:32%%$.suffix%%msg:::sp-if-no-1st-sp%%msg%\n"
+ ruleset:
+ remote_logs:
+ description: 'action(type="omfwd" Target="${_param:remote_rsyslog_host}" Port="${_param:remote_rsyslog_port}" Protocol="udp" Template="ImfileFilePath")'
+ myapp_logs:
+ description: 'set $.suffix=re_extract($!metadata!filename, "(.*)/([^/]*[^/.log])", 0, 2, "all.log"); call remote_logs'
+ output:
+ remote:
+ somehost.domain:
+ action: "@${_param:remote_rsyslog_host}:${_param:remote_rsyslog_port}"
+ filter: "*.*"
+ enabled: true
diff --git a/classes/cluster/virtual-offline-ssl/openstack/compute.yml b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
new file mode 100644
index 0000000..5a5710a
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/openstack/compute.yml
@@ -0,0 +1,99 @@
+classes:
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.linux.network.hosts
+- system.linux.storage.loopback
+- system.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.ceilometer.client.nova_compute
+- system.ceilometer.agent.cluster
+- system.ceilometer.agent.polling.default
+- service.cinder.volume.single
+- system.cinder.volume.backend.lvm
+- system.nova.compute.nfv.cpu_pinning
+- system.nova.compute.nfv.sriov
+- system.neutron.compute.nfv.dpdk
+- system.neutron.compute.nfv.sriov
+- cluster.virtual-offline-ssl
+parameters:
+ _param:
+ primary_interface: ens4
+ tenant_interface: ens5
+ external_interface: ens6
+ interface_mtu: 1500
+ linux_system_codename: xenial
+ sriov_nic01_device_name: enp5s0f1
+ sriov_nic01_numvfs: 16
+ sriov_nic01_physical_network: physnet3
+ sriov_unsafe_interrupts: False
+ dpdk0_pci: '"0000:04:00"'
+ nova_cpu_pinning: 0,1,2
+ compute_dpdk_driver: uio
+ compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
+ compute_ovs_pmd_cpu_mask: "0x6"
+ compute_ovs_dpdk_socket_mem: "1024"
+ compute_ovs_dpdk_lcore_mask: "0x400"
+ compute_ovs_memory_channels: "2"
+ loopback_device_size: 20
+ nova:
+ compute:
+ vncproxy_url: http://${_param:cluster_vip_address}:6080
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ identity:
+ protocol: https
+ network:
+ protocol: https
+ glance:
+ protocol: https
+ image:
+ protocol: https
+ neutron:
+ compute:
+ notification:
+ driver: messagingv2
+ topics: "notifications"
+ cinder:
+ volume:
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ 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}
diff --git a/classes/cluster/virtual-offline-ssl/openstack/control.yml b/classes/cluster/virtual-offline-ssl/openstack/control.yml
new file mode 100644
index 0000000..9eb601a
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/openstack/control.yml
@@ -0,0 +1,316 @@
+classes:
+- system.salt.minion.cert.proxy
+- system.linux.system.lowmem
+- system.linux.system.repo_local.mcp.apt_mirantis.glusterfs
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.memcached.server.single
+- system.rabbitmq.server.cluster
+- system.rabbitmq.server.vhost.openstack
+- system.apache.server.site.manila
+- system.apache.server.site.barbican
+- system.apache.server.site.nova-placement
+- system.apache.server.site.cinder
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack_api
+- system.nginx.server.proxy.openstack.designate
+- 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.cinder.control.cluster
+- system.heat.server.cluster
+- system.designate.server.cluster
+- system.galera.server.cluster
+- system.galera.server.database.cinder
+- system.galera.server.database.glance
+- system.galera.server.database.heat
+- system.galera.server.database.keystone
+- system.galera.server.database.nova
+- system.galera.server.database.designate
+- system.galera.server.database.manila
+- system.galera.server.database.aodh
+- system.galera.server.database.panko
+- system.galera.server.database.gnocchi
+- system.galera.server.database.barbican
+- system.dogtag.server.cluster
+- system.barbican.server.cluster
+- service.barbican.server.plugin.dogtag
+- system.ceilometer.client
+- system.ceilometer.client.cinder_volume
+- system.ceilometer.client.neutron
+- system.haproxy.proxy.listen.openstack.placement
+- system.haproxy.proxy.listen.openstack.manila
+- system.manila.control.cluster
+- cluster.virtual-offline-ssl.openstack.dns
+- cluster.virtual-offline-ssl
+parameters:
+ _param:
+ keepalived_vip_interface: ens4
+ salt_minion_ca_authority: salt_master_ca
+ ### nginx ssl sites settings
+ nginx_proxy_ssl:
+ enabled: true
+ engine: salt
+ authority: "${_param:salt_minion_ca_authority}"
+ key_file: "/etc/ssl/private/internal_proxy.key"
+ cert_file: "/etc/ssl/certs/internal_proxy.crt"
+ chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+ nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
+ nginx_proxy_openstack_keystone_host: 127.0.0.1
+ nginx_proxy_openstack_nova_host: 127.0.0.1
+ nginx_proxy_openstack_glance_host: 127.0.0.1
+ nginx_proxy_openstack_neutron_host: 127.0.0.1
+ nginx_proxy_openstack_heat_host: 127.0.0.1
+ nginx_proxy_openstack_designate_host: 127.0.0.1
+ apache_manila_api_address: ${_param:single_address}
+ apache_manila_ssl: ${_param:nginx_proxy_ssl}
+ apache_keystone_api_host: ${_param:single_address}
+ apache_keystone_ssl: ${_param:nginx_proxy_ssl}
+ apache_barbican_api_address: ${_param:cluster_local_address}
+ apache_barbican_api_host: ${_param:single_address}
+ apache_barbican_ssl: ${_param:nginx_proxy_ssl}
+ apache_nova_placement_api_address: ${_param:cluster_local_address}
+ apache_nova_placement_ssl: ${_param:nginx_proxy_ssl}
+ barbican_dogtag_nss_password: workshop
+ barbican_dogtag_host: ${_param:cluster_vip_address}
+ apache_cinder_api_address: ${_param:cluster_local_address}
+ apache_cinder_ssl: ${_param:nginx_proxy_ssl}
+ # dogtag listens on 8443 but there is no way to bind it to
+ # Specific IP, as on this setup dogtag installed on ctl nodes
+ # Change port on haproxy side to avoid binding conflict.
+ haproxy_dogtag_bind_port: 8444
+ cluster_dogtag_port: 8443
+ dogtag_master_host: ctl01.${linux:system:domain}
+ dogtag_pki_admin_password: workshop
+ dogtag_pki_client_database_password: workshop
+ dogtag_pki_client_pkcs12_password: workshop
+ dogtag_pki_ds_password: workshop
+ dogtag_pki_token_password: workshop
+ dogtag_pki_security_domain_password: workshop
+ dogtag_pki_clone_pkcs12_password: workshop
+ nginx:
+ server:
+ site:
+ nginx_proxy_openstack_api_keystone:
+ enabled: false
+ nginx_proxy_openstack_api_keystone_private:
+ enabled: false
+ nginx_proxy_openstack_api_cinder:
+ enabled: false
+ 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
+ dogtag:
+ server:
+ ldap_hostname: ${linux:network:fqdn}
+ ldap_dn_password: workshop
+ ldap_admin_password: workshop
+ export_pem_file_path: /etc/dogtag/kra_admin_cert.pem
+ # TODO drop this once reclass bumped, missing part in current version
+ apache:
+ server:
+ site:
+ barbican_admin:
+ host:
+ address: ${_param:apache_barbican_api_address}
+ name: ${_param:apache_barbican_api_host}
+ port: 9312
+ log:
+ custom:
+ format: 'combined'
+ file: '/var/log/barbican/barbican-api.log'
+ error:
+ enabled: true
+ file: '/var/log/barbican/barbican-api.log'
+ barbican:
+ server:
+ enabled: true
+ dogtag_admin_cert:
+ engine: mine
+ minion: ${_param:dogtag_master_host}
+ ks_notifications_enable: True
+ store:
+ software:
+ store_plugin: dogtag_crypto
+ global_default: True
+ plugin:
+ dogtag:
+ port: ${_param:haproxy_dogtag_bind_port}
+ keystone:
+ server:
+ admin_email: ${_param:admin_email}
+ designate:
+ pool_manager:
+ enabled: ${_param:designate_pool_manager_enabled}
+ periodic_sync_interval: ${_param:designate_pool_manager_periodic_sync_interval}
+ server:
+ identity:
+ protocol: https
+ bind:
+ api:
+ address: 127.0.0.1
+ backend:
+ pdns4:
+ api_token: ${_param:designate_pdns_api_key}
+ api_endpoint: ${_param:designate_pdns_api_endpoint}
+ mdns:
+ address: ${_param:designate_mdns_address}
+ port: ${_param:designate_mdns_port}
+ pools:
+ default:
+ description: 'test pool'
+ targets:
+ default:
+ description: 'test target1'
+ default1:
+ type: ${_param:designate_pool_target_type}
+ description: 'test target2'
+ masters: ${_param:designate_pool_target_masters}
+ options:
+ host: ${_param:openstack_dns_node02_address}
+ port: 53
+ api_endpoint: "http://${_param:openstack_dns_node02_address}:${_param:powerdns_webserver_port}"
+ api_token: ${_param:designate_pdns_api_key}
+ quota:
+ zones: ${_param:designate_quota_zones}
+ glance:
+ server:
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ storage:
+ engine: file
+ images: []
+ workers: 1
+ bind:
+ address: 127.0.0.1
+ identity:
+ protocol: https
+ registry:
+ protocol: https
+ heat:
+ server:
+ bind:
+ api:
+ address: 127.0.0.1
+ api_cfn:
+ address: 127.0.0.1
+ api_cloudwatch:
+ address: 127.0.0.1
+ identity:
+ protocol: https
+ neutron:
+ server:
+ bind:
+ address: 127.0.0.1
+ identity:
+ protocol: https
+ nova:
+ controller:
+ networking: dvr
+ cpu_allocation: 54
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ metadata:
+ password: ${_param:metadata_password}
+ bind:
+ address: ${_param:cluster_local_address}
+ bind:
+ public_address: ${_param:cluster_vip_address}
+ novncproxy_port: 6080
+ private_address: 127.0.0.1
+ identity:
+ protocol: https
+ network:
+ protocol: https
+ glance:
+ protocol: https
+ vncproxy_url: http://${_param:cluster_vip_address}:6080
+ workers: 1
+ cinder:
+ controller:
+ controller:
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ identity:
+ protocol: https
+ osapi:
+ host: 127.0.0.1
+ glance:
+ protocol: https
+ manila:
+ common:
+ identity:
+ protocol: https
+ default_share_type: default
+ salt:
+ minion:
+ cert:
+ internal_proxy:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: internal_proxy
+ signing_policy: cert_open
+ alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:cluster_public_host},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_local_address},DNS:${_param:cluster_public_host}
+ key_file: "/etc/ssl/private/internal_proxy.key"
+ cert_file: "/etc/ssl/certs/internal_proxy.crt"
+ all_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+ haproxy:
+ proxy:
+ listen:
+ barbican-api:
+ type: ~
+ barbican-admin-api:
+ type: ~
+ designate_api:
+ type: ~
+ keystone_public_api:
+ type: ~
+ keystone_admin_api:
+ type: ~
+ manila_api:
+ type: ~
+ nova_api:
+ type: ~
+ nova_metadata_api:
+ type: ~
+ cinder_api:
+ type: ~
+ glance_api:
+ type: ~
+ glance_registry_api:
+ type: ~
+ heat_cloudwatch_api:
+ type: ~
+ heat_api:
+ type: ~
+ heat_cfn_api:
+ type: ~
+ neutron_api:
+ type: ~
+ placement_api:
+ type: ~
diff --git a/classes/cluster/virtual-offline-ssl/openstack/dashboard.yml b/classes/cluster/virtual-offline-ssl/openstack/dashboard.yml
new file mode 100644
index 0000000..24fbe16
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/openstack/dashboard.yml
@@ -0,0 +1,19 @@
+classes:
+- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.horizon.server.single
+- cluster.virtual-offline-ssl
+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-offline-ssl/openstack/dns.yml b/classes/cluster/virtual-offline-ssl/openstack/dns.yml
new file mode 100644
index 0000000..fbb7291
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/openstack/dns.yml
@@ -0,0 +1,35 @@
+classes:
+- system.powerdns.server.single
+- cluster.virtual-offline-ssl
+
+parameters:
+ powerdns:
+ server:
+ api:
+ enabled: True
+ key: ${_param:designate_pdns_api_key}
+ axfr_ips:
+ ${_param:powerdns_axfr_ips}
+ bind:
+ address: ${_param:single_address}
+ overwrite_supermasters: True
+ supermasters:
+ ${_param:powerdns_supermasters}
+ webserver:
+ enabled: True
+ address: ${_param:single_address}
+ password: ${_param:powerdns_webserver_password}
+ port: ${_param:powerdns_webserver_port}
+ 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
diff --git a/classes/cluster/virtual-offline-ssl/openstack/dogtag.yml b/classes/cluster/virtual-offline-ssl/openstack/dogtag.yml
new file mode 100644
index 0000000..a5b376e
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/openstack/dogtag.yml
@@ -0,0 +1,67 @@
+classes:
+#- system.apache.server.site.barbican
+- system.dogtag.server.cluster
+- system.barbican.server.cluster
+- cluster.virtual-offline-ssl
+parameters:
+ _param:
+ apache_barbican_api_address: ${_param:cluster_local_address}
+ apache_barbican_ssl: ${_param:nginx_proxy_ssl}
+ apache_manila_ssl: ${_param:nginx_proxy_ssl}
+ barbican_dogtag_nss_password: workshop
+ barbican_dogtag_host: ${_param:cluster_vip_address}
+ # dogtag listens on 8443 but there is no way to bind it to
+ # Specific IP, as on this setup dogtag installed on ctl nodes
+ # Change port on haproxy side to avoid binding conflict.
+ haproxy_dogtag_bind_port: 8444
+ cluster_dogtag_port: 8443
+ dogtag_master_host: ctl01.${linux:system:domain}
+ dogtag:
+ server:
+ ldap_hostname: ${linux:network:fqdn}
+ ldap_dn_password: workshop
+ export_pem_file_path: /etc/dogtag/kra_admin_cert.pem
+ default_config_options:
+ pki_ds_hostname: ${linux:network:fqdn}
+ pki_admin_password: workshop
+ pki_backup_password: workshop
+ pki_client_database_password: workshop
+ pki_client_pkcs12_password: workshop
+ pki_clone_pkcs12_password: workshop
+ pki_ds_password: workshop
+ pki_token_password: workshop
+ pki_security_domain_name: EXAMPLE
+ pki_security_domain_password: workshop
+ barbican:
+ server:
+ enabled: true
+ dogtag_admin_cert:
+ engine: mine
+ minion: ${_param:dogtag_master_host}
+ ks_notifications_enable: True
+ store:
+ software:
+ store_plugin: dogtag_crypto
+ global_default: True
+ plugin:
+ dogtag:
+ port: ${_param:haproxy_dogtag_bind_port}
+ glance:
+ server:
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ nova:
+ controller:
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ cinder:
+ controller:
+ barbican:
+ enabled: ${_param:barbican_integration_enabled}
+ haproxy:
+ proxy:
+ listen:
+ barbican-api:
+ type: ~
+ barbican-admin-api:
+ type: ~
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-offline-ssl/openstack/gateway.yml
similarity index 70%
rename from classes/cluster/virtual-pike-ovs-dpdk/openstack/gateway.yml
rename to classes/cluster/virtual-offline-ssl/openstack/gateway.yml
index 65ad393..831cc6a 100644
--- a/classes/cluster/virtual-pike-ovs-dpdk/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/gateway.yml
@@ -1,16 +1,23 @@
classes:
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
- system.neutron.gateway.cluster
-- cluster.virtual-pike-ovs-dpdk
+- cluster.virtual-offline-ssl
parameters:
_param:
primary_interface: ens4
tenant_interface: ens5
external_interface: ens6
interface_mtu: 9000
+ neutron_gateway_dvr: True
+ neutron_gateway_agent_mode: dvr_snat
linux_system_codename: xenial
+ neutron:
+ gateway:
+ notification:
+ driver: messagingv2
+ topics: "notifications"
linux:
network:
bridge: openvswitch
@@ -28,12 +35,13 @@
mtu: ${_param:interface_mtu}
proto: manual
type: eth
- # tenant_interface:
- # enabled: true
- # name: ${_param:tenant_interface}
- # mtu: ${_param:interface_mtu}
- # proto: manual
- # type: eth
+ tenant_interface:
+ enabled: true
+ ipflush_onchange: true
+ name: ${_param:tenant_interface}
+ mtu: ${_param:interface_mtu}
+ proto: manual
+ type: eth
external_interface:
enabled: true
ipflush_onchange: true
@@ -54,23 +62,15 @@
mtu: ${_param:interface_mtu}
use_interfaces:
- ${_param:primary_interface}
- br-prv:
+ br-mesh:
enabled: true
- type: ovs_bridge
+ type: bridge
+ mtu: ${_param:interface_mtu}
+ proto: static
address: ${_param:tenant_address}
netmask: 255.255.255.0
- floating-to-prv:
- enabled: true
- type: ovs_port
- port_type: patch
- bridge: br-floating
- peer: prv-to-floating
- prv-to-floating:
- enabled: true
- type: ovs_port
- port_type: patch
- bridge: br-prv
- peer: floating-to-prv
+ use_interfaces:
+ - ${_param:tenant_interface}
float-to-ex:
enabled: true
type: ovs_port
@@ -85,4 +85,4 @@
use_interfaces:
- ${_param:external_interface}
use_ovs_ports:
- - float-to-ex
+ - float-to-ex
\ No newline at end of file
diff --git a/classes/cluster/virtual-offline-ssl/openstack/init.yml b/classes/cluster/virtual-offline-ssl/openstack/init.yml
new file mode 100644
index 0000000..77c4add
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/openstack/init.yml
@@ -0,0 +1,282 @@
+parameters:
+ _param:
+ # openstack service addresses
+ openstack_database_address: 172.16.10.254
+ 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_hostname: ctl01
+ openstack_control_node02_hostname: ctl02
+ openstack_control_node03_hostname: ctl03
+ openstack_share_node01_hostname: share01
+ 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_database_address: ${_param:openstack_control_address}
+ openstack_database_node01_address: ${_param:openstack_control_node01_address}
+ openstack_database_node02_address: ${_param:openstack_control_node02_address}
+ openstack_database_node03_address: ${_param:openstack_control_node03_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}
+ openstack_gateway_address: 172.16.10.110
+ openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+ openstack_dns_node01_address: 172.16.10.111
+ openstack_dns_node02_address: 172.16.10.112
+ openstack_share_node01_address: 172.16.10.97
+ openstack_share_node01_share_address: ${_param:openstack_share_node01_address}
+ openstack_telemetry_address: 172.16.10.250
+ openstack_telemetry_node01_address: 172.16.10.45
+ openstack_telemetry_node02_address: 172.16.10.46
+ openstack_telemetry_node03_address: 172.16.10.47
+ openstack_telemetry_system_codename: xenial
+ openstack_telemetry_hostname: mdb
+ openstack_telemetry_node01_hostname: mdb01
+ openstack_telemetry_node02_hostname: mdb02
+ openstack_telemetry_node03_hostname: mdb03
+ openstack_telemetry_keepalived_password: hf9GQOjG2uPhkJ2Q
+
+ openstack_version: pike
+ apt_mk_version: nightly
+ cinder_version: ${_param:openstack_version}
+ mcp_repo_version: 1.1
+ openstack_region: RegionOne
+ admin_email: root@localhost
+ cluster_public_host: 172.16.10.254
+ telemetry_public_host: ${_param:openstack_telemetry_address}
+ cluster_public_protocol: https
+ cluster_internal_protocol: https
+ keystone_service_protocol: ${_param:cluster_internal_protocol}
+ glance_service_protocol: ${_param:cluster_internal_protocol}
+ nova_service_protocol: ${_param:cluster_internal_protocol}
+ neutron_service_protocol: ${_param:cluster_internal_protocol}
+ heat_service_protocol: ${_param:cluster_internal_protocol}
+ cinder_service_protocol: ${_param:cluster_internal_protocol}
+ designate_service_protocol: ${_param:cluster_internal_protocol}
+ manila_service_protocol: ${_param:cluster_internal_protocol}
+ ceilometer_service_protocol: ${_param:cluster_internal_protocol}
+ panko_service_protocol: ${_param:cluster_internal_protocol}
+ aodh_service_protocol: ${_param:cluster_internal_protocol}
+ gnocchi_service_protocol: ${_param:cluster_internal_protocol}
+ barbican_service_protocol: ${_param:cluster_internal_protocol}
+ neutron_control_dvr: True
+ neutron_tenant_network_types: "flat,vxlan"
+ neutron_l3_ha: False
+ neutron_global_physnet_mtu: 1500
+ neutron_external_mtu: 1500
+ neutron_gateway_dvr: True
+ neutron_gateway_agent_mode: dvr_snat
+ neutron_compute_dvr: True
+ neutron_compute_agent_mode: dvr
+ neutron_compute_external_access: True
+ galera_server_cluster_name: openstack_cluster
+ galera_server_maintenance_password: workshop
+ galera_server_admin_password: workshop
+ galera_innodb_read_io_threads: 2
+ galera_innodb_write_io_threads: 2
+ galera_wsrep_slave_threads: 2
+ galera_xtrabackup_parallel: 1
+ galera_error_log_enabled: true
+ cluster_vip_address: ${_param:openstack_control_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_node01_hostname: ${_param:openstack_control_node01_hostname}
+ cluster_node01_address: ${_param:openstack_control_node01_address}
+ cluster_node02_hostname: ${_param:openstack_control_node02_hostname}
+ cluster_node02_address: ${_param:openstack_control_node02_address}
+ cluster_node03_hostname: ${_param:openstack_control_node03_hostname}
+ cluster_node03_address: ${_param:openstack_control_node03_address}
+ rabbitmq_secret_key: workshop
+ rabbitmq_admin_password: workshop
+ rabbitmq_openstack_password: workshop
+ rabbitmq_cold_password: workshop
+ powerdns_axfr_ips:
+ - ${_param:openstack_control_node01_address}
+ - ${_param:openstack_control_node02_address}
+ - ${_param:openstack_control_node03_address}
+ - 127.0.0.1
+ powerdns_supermasters:
+ - ip: ${_param:openstack_control_node01_address}
+ nameserver: ns1.example.org
+ account: master
+ - ip: ${_param:openstack_control_node02_address}
+ nameserver: ns2.example.org
+ account: master
+ - ip: ${_param:openstack_control_node03_address}
+ nameserver: ns3.example.org
+ account: master
+ powerdns_overwrite_supermasters: True
+ powerdns_webserver_password: gJ6n3gVaYP8eS
+ powerdns_webserver_port: 8081
+ designate_admin_api_enabled: true
+ designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_mdns_address: 0.0.0.0
+ designate_mdns_port: 53
+ designate_pdns_api_key: VxK9cMlFL5Ae
+ designate_pdns_api_endpoint: "http://${_param:openstack_dns_node01_address}:${_param:powerdns_webserver_port}"
+ designate_pool_manager_enabled: True
+ designate_pool_manager_periodic_sync_interval: '120'
+ designate_pool_ns_records:
+ - hostname: 'ns1.example.org.'
+ priority: 10
+ - hostname: 'ns2.example.org.'
+ priority: 20
+ - hostname: 'ns3.example.org.'
+ priority: 30
+ designate_pool_nameservers:
+ - host: ${_param:openstack_dns_node01_address}
+ port: 53
+ - host: ${_param:openstack_dns_node02_address}
+ port: 53
+ designate_pool_target_type: pdns4
+ designate_pool_target_masters:
+ - host: ${_param:openstack_control_node01_address}
+ port: 53
+ - host: ${_param:openstack_control_node02_address}
+ port: 53
+ - host: ${_param:openstack_control_node03_address}
+ port: 53
+ designate_pool_target_options:
+ host: ${_param:openstack_dns_node01_address}
+ port: 53
+ api_token: ${_param:designate_pdns_api_key}
+ api_endpoint: ${_param:designate_pdns_api_endpoint}
+ designate_quota_zones: 40
+ designate_version: ${_param:openstack_version}
+ 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
+ cinder_version: ${_param:openstack_version}
+ cinder_service_host: ${_param:cluster_vip_address}
+ manila_version: ${_param:openstack_version}
+ manila_service_host: ${_param:cluster_vip_address}
+ panko_version: ${_param:openstack_version}
+ panko_service_host: ${_param:openstack_telemetry_address}
+ ceilometer_version: ${_param:openstack_version}
+ ceilometer_service_host: ${_param:openstack_telemetry_address}
+ barbican_service_host: ${_param:cluster_vip_address}
+ barbican_version: ${_param:openstack_version}
+ aodh_version: ${_param:openstack_version}
+ aodh_service_host: ${_param:openstack_telemetry_address}
+ gnocchi_version: 4.0
+ gnocchi_service_host: ${_param:openstack_telemetry_address}
+ gnocchi_public_host: ${_param:telemetry_public_host}
+ aodh_public_host: ${_param:telemetry_public_host}
+ ceilometer_public_host: ${_param:telemetry_public_host}
+ panko_public_host: ${_param:telemetry_public_host}
+ 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}
+ designate_service_host: ${_param:cluster_vip_address}
+ metadata_password: password
+ mysql_admin_user: root
+ mysql_admin_password: workshop
+ mysql_cinder_password: workshop
+ mysql_glance_password: workshop
+ mysql_heat_password: workshop
+ mysql_keystone_password: workshop
+ mysql_neutron_password: workshop
+ mysql_nova_password: workshop
+ mysql_designate_password: workshop
+ mysql_manila_password: workshop
+ mysql_ceilometer_password: workshop
+ mysql_panko_password: workshop
+ mysql_aodh_password: workshop
+ mysql_gnocchi_password: workshop
+ mysql_barbican_password: workshop
+ keystone_service_token: workshop
+ keystone_admin_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
+ keystone_designate_password: workshop
+ keystone_manila_password: workshop
+ keystone_aodh_password: workshop
+ keystone_panko_password: workshop
+ keystone_ceilometer_password: workshop
+ keystone_gnocchi_password: workshop
+ keystone_barbican_password: workshop
+ horizon_version: ${_param:openstack_version}
+ horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
+ horizon_identity_host: ${_param:cluster_vip_address}
+ horizon_identity_encryption: ssl
+ horizon_identity_version: 2
+ ceilometer_secret_key: workshop
+ ceilometer_agent_default_polling_interval: 15
+ ceilometer_agent_default_polling_meters:
+ - "*"
+ barbican_integration_enabled: true
+ 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}
+ dns01:
+ address: ${_param:openstack_dns_node01_address}
+ names:
+ - dns01
+ - dns01.${_param:cluster_domain}
+ dns02:
+ address: ${_param:openstack_dns_node02_address}
+ names:
+ - dns02
+ - dns02.${_param:cluster_domain}
+ system:
+ user:
+ root:
+ name: root
+ password: false
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/openstack/proxy.yml b/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
similarity index 79%
rename from classes/cluster/virtual-pike-ovs-dpdk/openstack/proxy.yml
rename to classes/cluster/virtual-offline-ssl/openstack/proxy.yml
index 55c8561..b1c9686 100644
--- a/classes/cluster/virtual-pike-ovs-dpdk/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
@@ -4,7 +4,7 @@
- system.nginx.server.proxy.openstack_vnc
- system.nginx.server.proxy.openstack_web
- system.salt.minion.cert.proxy
-- cluster.virtual-pike-ovs-dpdk
+- cluster.virtual-offline-ssl
parameters:
_param:
nginx_proxy_ssl:
@@ -12,4 +12,4 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${linux:system:domain}
diff --git a/classes/cluster/virtual-offline-ssl/openstack/share.yml b/classes/cluster/virtual-offline-ssl/openstack/share.yml
new file mode 100644
index 0000000..dc8eaaf
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/openstack/share.yml
@@ -0,0 +1,20 @@
+classes:
+- system.linux.system.lowmem
+- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.storage.loopback_manila
+- system.manila.share
+- system.manila.share.backend.lvm
+- cluster.virtual-offline-ssl
+parameters:
+ _param:
+ manila_lvm_devices:
+ - /dev/loop0
+ loopback_device1_size: 20
+ manila:
+ common:
+ identity:
+ protocol: https
+ default_share_type: default
\ No newline at end of file
diff --git a/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml b/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
new file mode 100644
index 0000000..9649872
--- /dev/null
+++ b/classes/cluster/virtual-offline-ssl/openstack/telemetry.yml
@@ -0,0 +1,160 @@
+classes:
+- system.salt.minion.cert.proxy
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.glusterfs
+- system.linux.system.repo_local.mcp.apt_mirantis.ceph
+- system.memcached.server.single
+- system.apache.server.single
+- system.apache.server.site.gnocchi
+- system.apache.server.site.panko
+- system.glusterfs.server.cluster
+- system.glusterfs.client.cluster
+- system.glusterfs.client.volume.gnocchi
+- system.glusterfs.server.volume.gnocchi
+- service.redis.server.single
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack.aodh
+- system.nginx.server.proxy.openstack.ceilometer
+- system.gnocchi.server.cluster
+- system.gnocchi.common.storage.incoming.redis
+- system.gnocchi.common.storage.file
+- system.gnocchi.common.coordination.redis
+- system.ceilometer.server.cluster
+- system.ceilometer.server.coordination.redis
+- system.aodh.server.cluster
+- system.aodh.server.coordination.redis
+- system.panko.server.cluster
+- system.ceilometer.server.backend.default
+- cluster.virtual-offline-ssl
+parameters:
+ _param:
+ salt_minion_ca_authority: salt_master_ca
+ keepalived_openstack_telemetry_vip_address: ${_param:openstack_telemetry_address}
+ keepalived_openstack_telemetry_vip_password: ${_param:openstack_telemetry_keepalived_password}
+ keepalived_openstack_telemetry_vip_interface: ens4
+ cluster_vip_address: ${_param:openstack_telemetry_address}
+ cluster_local_address: ${_param:single_address}
+ nginx_proxy_openstack_api_host: ${_param:openstack_telemetry_address}
+ nginx_proxy_openstack_api_address: ${_param:cluster_local_address}
+ nginx_proxy_openstack_ceilometer_host: 127.0.0.1
+ nginx_proxy_openstack_aodh_host: 127.0.0.1
+ nginx_proxy_ssl:
+ enabled: true
+ engine: salt
+ authority: "${_param:salt_minion_ca_authority}"
+ key_file: "/etc/ssl/private/internal_proxy.key"
+ cert_file: "/etc/ssl/certs/internal_proxy.crt"
+ chain_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+ apache_gnocchi_api_address: ${_param:single_address}
+ apache_panko_api_address: ${_param:single_address}
+ apache_gnocchi_ssl: ${_param:nginx_proxy_ssl}
+ apache_panko_ssl: ${_param:nginx_proxy_ssl}
+ cluster_node01_hostname: ${_param:openstack_telemetry_node01_hostname}
+ cluster_node01_address: ${_param:openstack_telemetry_node01_address}
+ cluster_node02_hostname: ${_param:openstack_telemetry_node02_hostname}
+ cluster_node02_address: ${_param:openstack_telemetry_node02_address}
+ cluster_node03_hostname: ${_param:openstack_telemetry_node03_hostname}
+ cluster_node03_address: ${_param:openstack_telemetry_node03_address}
+ glusterfs_service_host: ${_param:openstack_telemetry_address}
+ gnocchi_glusterfs_service_host: ${_param:glusterfs_service_host}
+ redis_sentinel_node01_address: ${_param:openstack_telemetry_node01_address}
+ redis_sentinel_node02_address: ${_param:openstack_telemetry_node02_address}
+ redis_sentinel_node03_address: ${_param:openstack_telemetry_node03_address}
+ openstack_telemetry_redis_url: redis://${_param:redis_sentinel_node01_address}:26379?sentinel=master_1&sentinel_fallback=${_param:redis_sentinel_node02_address}:26379&sentinel_fallback=${_param:redis_sentinel_node03_address}:26379
+ gnocchi_coordination_url: ${_param:openstack_telemetry_redis_url}
+ gnocchi_storage_incoming_redis_url: ${_param:openstack_telemetry_redis_url}
+ glusterfs_node01_address: ${_param:cluster_node01_address}
+ glusterfs_node02_address: ${_param:cluster_node02_address}
+ glusterfs_node03_address: ${_param:cluster_node03_address}
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ salt:
+ minion:
+ cert:
+ internal_proxy:
+ host: ${_param:salt_minion_ca_host}
+ authority: ${_param:salt_minion_ca_authority}
+ common_name: internal_proxy
+ signing_policy: cert_open
+ alternative_names: IP:127.0.0.1,IP:${_param:cluster_local_address},IP:${_param:openstack_telemetry_address},DNS:${linux:system:name},DNS:${linux:network:fqdn},DNS:${_param:cluster_local_address},DNS:${_param:openstack_telemetry_address}
+ key_file: "/etc/ssl/private/internal_proxy.key"
+ cert_file: "/etc/ssl/certs/internal_proxy.crt"
+ all_file: "/etc/ssl/certs/internal_proxy-with-chain.crt"
+ keepalived:
+ cluster:
+ instance:
+ VIP:
+ virtual_router_id: 160
+ redis:
+ server:
+ version: 3.0
+ bind:
+ address: ${_param:single_address}
+ cluster:
+ enabled: True
+ mode: sentinel
+ role: ${_param:redis_cluster_role}
+ quorum: 2
+ master:
+ host: ${_param:cluster_node01_address}
+ port: 6379
+ sentinel:
+ address: ${_param:single_address}
+ apache:
+ server:
+ modules:
+ - wsgi
+ gnocchi:
+ common:
+ database:
+ host: ${_param:openstack_database_address}
+ server:
+ identity:
+ protocol: https
+ pkgs:
+ # TODO: move python-memcache installation to formula
+ - gnocchi-api
+ - gnocchi-metricd
+ - python-memcache
+ panko:
+ server:
+ identity:
+ protocol: https
+ aodh:
+ server:
+ bind:
+ host: 127.0.0.1
+ coordination_backend:
+ url: ${_param:openstack_telemetry_redis_url}
+ identity:
+ protocol: https
+ host: ${_param:openstack_control_address}
+ ceilometer:
+ server:
+ bind:
+ host: 127.0.0.1
+ coordination_backend:
+ url: ${_param:openstack_telemetry_redis_url}
+ identity:
+ protocol: https
+ host: ${_param:openstack_control_address}
+ haproxy:
+ proxy:
+ listen:
+ panko_api:
+ type: ~
+ ceilometer_api:
+ type: ~
+ gnocchi_api:
+ type: ~
+ aodh-api:
+ type: ~
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/init.yml
deleted file mode 100644
index 1fd9136..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/init.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-classes:
-- system.linux.network.dynamic_hosts
-- system.linux.system.single
-- cluster.virtual-pike-ovs-dpdk.infra
-- cluster.virtual-pike-ovs-dpdk.openstack
-- system.openssh.server.team.lab
-- system.openssh.server.team.tcpcloud
-- system.openssh.server.team.stacklight
-- system.openssh.server.team.mcp_qa
-- cluster.virtual-pike-ovs-dpdk.stacklight
-- cluster.virtual-pike-ovs-dpdk.stacklight.client
-
-parameters:
- _param:
- cluster_domain: virtual-pike-ovs-dpdk.local
- cluster_name: virtual-pike-ovs-dpdk
- # infra service addresses
- infra_config_hostname: cfg01
- 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_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}
\ No newline at end of file
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/compute.yml
deleted file mode 100644
index ace5f15..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/openstack/compute.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-classes:
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
-- system.linux.network.hosts
-- system.nova.compute.cluster
-- system.neutron.compute.cluster
-- system.heka.alarm.openstack_compute
-- system.nova.compute.nfv.hugepages
-- system.nova.compute.nfv.cpu_pinning
-- system.neutron.compute.nfv.dpdk
-
-- cluster.virtual-pike-ovs-dpdk
-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}
-###
- # dpdkbond1:
- # enabled: true
- # bridge: br-prv
- # type: dpdk_ovs_bond
- # mode: active-backup
- dpdk0:
- name: ${_param:dpdk0_name}
- pci: ${_param:dpdk0_pci}
- driver: igb_uio
- bridge: br-prv
-# bond: dpdkbond1
- enabled: true
- type: dpdk_ovs_port
- n_rxq: 2
- br-prv:
- enabled: true
- type: dpdk_ovs_bridge
- address: ${_param:tenant_address}
- netmask: 255.255.255.0
\ No newline at end of file
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/control.yml
deleted file mode 100644
index 11a048c..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/openstack/control.yml
+++ /dev/null
@@ -1,149 +0,0 @@
-classes:
-- system.linux.system.lowmem
-- system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
-- 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.heka.alarm.openstack_control
-- system.nova.control.cluster
-- system.neutron.control.openvswitch.cluster
-- system.cinder.control.cluster
-- system.heat.server.cluster
-- system.designate.server.cluster
-- system.designate.server.backend.bind
-- system.galera.server.cluster
-- 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.galera.server.database.designate
-- cluster.virtual-pike-ovs-dpdk
-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
- bind:
- server:
- control:
- mgmt:
- enabled: true
- bind:
- address: ${_param:single_address}
- port: 953
- allow:
- - ${_param:openstack_control_node01_address}
- - ${_param:openstack_control_node02_address}
- - ${_param:openstack_control_node03_address}
- keys:
- - designate
- keystone:
- server:
- admin_email: ${_param:admin_email}
- notification:
- driver: messagingv2
- topics: "notifications,${_param:stacklight_notification_topic}"
- designate:
- server:
- pools:
- default:
- description: 'test pool'
- targets:
- default:
- description: 'test target1'
- default1:
- type: ${_param:designate_pool_target_type}
- description: 'test target2'
- masters: ${_param:designate_pool_target_masters}
- options:
- host: ${_param:openstack_control_node02_address}
- port: 53
- rndc_host: ${_param:openstack_control_node02_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
- default2:
- type: ${_param:designate_pool_target_type}
- description: 'test target3'
- masters: ${_param:designate_pool_target_masters}
- options:
- host: ${_param:openstack_control_node03_address}
- port: 53
- rndc_host: ${_param:openstack_control_node03_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
- worker:
- enabled: ${_param:designate_worker_enabled}
- 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}
- bind:
- private_address: ${_param:cluster_local_address}
- public_address: ${_param:cluster_vip_address}
- novncproxy_port: 6080
- 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-pike-ovs-dpdk/openstack/dashboard.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/dashboard.yml
deleted file mode 100644
index 73233a2..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/openstack/dashboard.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-classes:
-- system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo.mcp.apt_mirantis.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
-- system.horizon.server.single
-- system.horizon.server.plugin.theme
-- cluster.virtual-pike-ovs-dpdk
-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-pike-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/init.yml
deleted file mode 100644
index 5c618c8..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/openstack/init.yml
+++ /dev/null
@@ -1,188 +0,0 @@
-parameters:
- _param:
- openstack_version: pike
- apt_mk_version: nightly
- cinder_version: ${_param:openstack_version}
- 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"
- neutron_l3_ha: True
- 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
- galera_innodb_read_io_threads: 2
- galera_innodb_write_io_threads: 2
- galera_wsrep_slave_threads: 2
- galera_xtrabackup_parallel: 1
- galera_error_log_enabled: true
- cluster_vip_address: 172.16.10.254
- cluster_local_address: ${_param:single_address}
-
- nova_cpu_pinning: "3"
- compute_hugepages_size: 2M
- compute_hugepages_count: 600
- compute_hugepages_mount: /mnt/hugepages_2M
- compute_kernel_isolcpu: ${_param:nova_cpu_pinning}
- compute_dpdk_driver: uio
- compute_ovs_pmd_cpu_mask: "0x2"
- compute_ovs_dpdk_socket_mem: "1024"
- compute_ovs_dpdk_lcore_mask: "0x1"
- compute_ovs_memory_channels: "1"
-
- 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
- designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8
- designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
- designate_pool_ns_records:
- - hostname: 'ns1.example.org.'
- priority: 10
- designate_pool_nameservers:
- - host: ${_param:openstack_control_node01_address}
- port: 53
- - host: ${_param:openstack_control_node02_address}
- port: 53
- - host: ${_param:openstack_control_node03_address}
- port: 53
- designate_pool_target_type: bind9
- designate_pool_target_masters:
- - host: ${_param:openstack_control_node01_address}
- port: 5354
- - host: ${_param:openstack_control_node02_address}
- port: 5354
- - host: ${_param:openstack_control_node03_address}
- port: 5354
- designate_pool_target_options:
- host: ${_param:openstack_control_node01_address}
- port: 53
- rndc_host: ${_param:openstack_control_node01_address}
- rndc_port: 953
- rndc_key_file: /etc/designate/rndc.key
- designate_version: ${_param:openstack_version}
- designate_worker_enabled: true
- 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: 172.16.10.108
- cinder_version: ${_param:openstack_version}
- cinder_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}
- designate_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_designate_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_cinder_password: workshop
- keystone_glance_password: workshop
- keystone_heat_password: workshop
- keystone_keystone_password: workshop
- keystone_neutron_password: workshop
- keystone_nova_password: workshop
- keystone_designate_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
- 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-pike-ovs-dpdk/stacklight/client.yml b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/client.yml
deleted file mode 100644
index a5d04ef..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/client.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-classes:
-- system.collectd.client.output.heka
-- system.heka.log_collector.single
-- system.heka.metric_collector.single
-- cluster.virtual-pike-ovs-dpdk.stacklight
-- service.grafana.collector
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/init.yml
deleted file mode 100644
index 48bffdc..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/init.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-parameters:
- _param:
- heka_elasticsearch_host: ${_param:stacklight_monitor_address}
- heka_influxdb_host: ${_param:stacklight_monitor_node01_address}
- heka_aggregator_host: ${_param:stacklight_monitor_address}
- aggregator_port: 5565
- grafana_user: admin
- grafana_password: password
- grafana_influxdb_host: ${_param:stacklight_monitor_node01_address}
- elasticsearch_port: 9200
- influxdb_stacklight_password: lmapass
- influxdb_admin_password: password
- influxdb_port: 8086
- influxdb_database: lma
- influxdb_user: lma
- influxdb_password: lmapass
- nagios_host: ${_param:stacklight_monitor_address}
- nagios_status_port: 8001
- nagios_username: nagiosadmin
- nagios_password: secret
- nagios_notification_smtp_server: 127.0.0.1
- nagios_notification_from: 'nagios@localhost'
- nagios_notification_email: 'root@localhost'
- stacklight_environment: ${_param:cluster_domain}
- stacklight_notification_topic: stacklight_notifications
- 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-pike-ovs-dpdk/stacklight/proxy.yml b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/proxy.yml
deleted file mode 100644
index ffec6cd..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/proxy.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-classes:
-- system.nginx.server.single
-- system.nginx.server.proxy.grafana_web
-- system.nginx.server.proxy.kibana_web
-- system.nginx.server.proxy.nagios_web
-- system.salt.minion.cert.proxy
-- cluster.virtual-pike-ovs-dpdk
-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}
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/server.yml b/classes/cluster/virtual-pike-ovs-dpdk/stacklight/server.yml
deleted file mode 100644
index df7f95e..0000000
--- a/classes/cluster/virtual-pike-ovs-dpdk/stacklight/server.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-classes:
-- system.collectd.remote_client.cluster
-- system.heka.remote_collector.cluster
-- system.linux.system.repo.mcp.apt_mirantis.influxdb
-- system.linux.system.repo.mcp.apt_mirantis.elastic
-- system.linux.system.repo.mcp.apt_mirantis.kibana
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.docker
-- system.heka.remote_collector.input.amqp
-- system.heka.aggregator.cluster
-- system.elasticsearch.server.cluster
-- system.elasticsearch.server.curator
-- system.kibana.server.single
-- system.grafana.server.single
-- system.nagios.server.cluster
-- cluster.virtual-pike-ovs-dpdk
-- system.haproxy.proxy.listen.stacklight.elasticsearch
-- system.haproxy.proxy.listen.stacklight.kibana
-- system.haproxy.proxy.listen.stacklight.grafana
-- service.haproxy.proxy.single
-- system.keepalived.cluster.instance.stacklight_monitor_vip
-parameters:
- _param:
- collectd_remote_collector_host: ${_param:stacklight_monitor_address}
- heka_amqp_host: ${_param:openstack_control_address}
- kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
- keepalived_stacklight_monitor_vip_address: ${_param:stacklight_monitor_address}
- keepalived_stacklight_monitor_vip_password: 'password'
- keepalived_stacklight_monitor_vip_interface: ens4
- cluster_vip_address: ${_param:stacklight_monitor_address}
- cluster_elasticsearch_port: 9200
- cluster_kibana_port: 5601
- cluster_grafana_port: 3000
- cluster_node01_name: mon01
- cluster_node01_address: ${_param:stacklight_monitor_node01_address}
- cluster_node02_name: mon02
- cluster_node02_address: ${_param:stacklight_monitor_node02_address}
- cluster_node03_name: mon03
- cluster_node03_address: ${_param:stacklight_monitor_node03_address}
- linux:
- network:
- interface:
- ens4:
- enabled: true
- type: eth
- proto: static
- address: ${_param:single_address}
- netmask: 255.255.255.0
diff --git a/classes/system b/classes/system
index ad28e21..00b52f8 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit ad28e212e503c42a20dd8ca7ebf2daaf22939dba
+Subproject commit 00b52f8b45f69f9d76c08c550319251b10c08284