Merge "Adding SSL connections for nova"
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
index 9da4945..6c4495f 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/compute.yml
@@ -19,14 +19,15 @@
kubelet:
address: ${_param:single_address}
network:
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
+ cnis:
+ - calico
+ calico:
+ 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:
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/control.yml b/classes/cluster/k8s-aio-calico/kubernetes/control.yml
index a26ab0a..0616a0f 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/control.yml
@@ -51,9 +51,12 @@
kubelet:
address: ${_param:single_address}
network:
- etcd:
- ssl:
- enabled: true
+ cnis:
+ - calico
+ calico:
+ etcd:
+ ssl:
+ enabled: true
namespace:
netchecker:
enabled: true
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/init.yml b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
index 42fc07e..38acf28 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
@@ -18,7 +18,7 @@
kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
# component docker images
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ kubernetes_calico_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
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
index 70d5ee6..e8803e5 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/compute.yml
@@ -36,17 +36,8 @@
kubernetes:
pool:
network:
- engine: opencontrail
- opencontrail:
- address: ${_param:opencontrail_control_address}
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
+ cnis:
+ - opencontrail
common:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
index 2cbdba3..72a8dba 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/control.yml
@@ -17,10 +17,6 @@
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:
@@ -40,17 +36,13 @@
etcd:
ssl:
enabled: true
- network:
- etcd:
- ssl:
- enabled: true
namespace:
netchecker:
enabled: true
network:
- engine: opencontrail
- public_ip_range: 185.22.97.128/26
- public_network: default-domain:default-project:Public
- private_ip_range: 10.150.0.0/16
- opencontrail:
- address: ${_param:opencontrail_control_address}
+ cnis:
+ - opencontrail
+ contrail:
+ public_ip_range: 185.22.97.128/26
+ public_network: default-domain:default-project:Public
+ private_ip_range: 10.150.0.0/16
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
index 7a7e9c3..ccbd551 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
@@ -16,9 +16,6 @@
etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
# component docker images
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
- kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
- kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
@@ -60,10 +57,6 @@
cluster_node03_address: ${_param:kubernetes_control_node03_address}
cluster_node03_port: 4001
- # calico
- calico_private_network: 192.168.0.0
- calico_private_netmask: 16
-
linux:
network:
host:
diff --git a/classes/cluster/k8s-compact/kubernetes/compute.yml b/classes/cluster/k8s-compact/kubernetes/compute.yml
index 198c172..624f709 100644
--- a/classes/cluster/k8s-compact/kubernetes/compute.yml
+++ b/classes/cluster/k8s-compact/kubernetes/compute.yml
@@ -13,14 +13,15 @@
kubelet:
address: ${_param:single_address}
network:
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
+ cnis:
+ - calico
+ calico:
+ 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:
diff --git a/classes/cluster/k8s-compact/kubernetes/control.yml b/classes/cluster/k8s-compact/kubernetes/control.yml
index d64e5c3..82bd0a9 100644
--- a/classes/cluster/k8s-compact/kubernetes/control.yml
+++ b/classes/cluster/k8s-compact/kubernetes/control.yml
@@ -55,9 +55,12 @@
ssl:
enabled: true
network:
- etcd:
- ssl:
- enabled: true
+ cnis:
+ - calico
+ calico:
+ etcd:
+ ssl:
+ enabled: true
namespace:
netchecker:
enabled: true
diff --git a/classes/cluster/k8s-compact/kubernetes/init.yml b/classes/cluster/k8s-compact/kubernetes/init.yml
index d0c3740..5c62919 100644
--- a/classes/cluster/k8s-compact/kubernetes/init.yml
+++ b/classes/cluster/k8s-compact/kubernetes/init.yml
@@ -27,7 +27,7 @@
kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ 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
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
index 77b7cc9..6a22893 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
@@ -7,7 +7,7 @@
- cluster.k8s-ha-calico-cloudprovider
parameters:
_param:
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ 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
@@ -21,14 +21,15 @@
kubernetes:
pool:
network:
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
+ cnis:
+ - calico
+ calico:
+ image: ${_param:kubernetes_calico_image}
+ calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
+ cni_image: ${_param:kubernetes_calico_cni_image}
+ etcd:
+ ssl:
+ enabled: true
common:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
index 306fb15..7f8560d 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/control.yml
@@ -49,9 +49,12 @@
ssl:
enabled: true
network:
- etcd:
- ssl:
- enabled: true
+ cnis:
+ - calico
+ calico:
+ etcd:
+ ssl:
+ enabled: true
namespace:
netchecker:
enabled: true
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
index 2a6126f..cddee62 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
@@ -7,7 +7,7 @@
- cluster.k8s-ha-calico-syndic
parameters:
_param:
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ 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
@@ -19,14 +19,15 @@
kubernetes:
pool:
network:
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
+ cnis:
+ - calico
+ calico:
+ image: ${_param:kubernetes_calico_image}
+ calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
+ cni_image: ${_param:kubernetes_calico_cni_image}
+ etcd:
+ ssl:
+ enabled: true
common:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
index a7dda44..3bb63dc 100644
--- a/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/kubernetes/control.yml
@@ -38,9 +38,12 @@
ssl:
enabled: true
network:
- etcd:
- ssl:
- enabled: true
+ cnis:
+ - calico
+ calico:
+ etcd:
+ ssl:
+ enabled: true
namespace:
netchecker:
enabled: true
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index e18d628..2b91e0d 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -20,14 +20,15 @@
address: ${_param:single_address}
fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
+ cnis:
+ - calico
+ calico:
+ 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:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index c57e955..6629e13 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -59,9 +59,12 @@
ssl:
enabled: true
network:
- etcd:
- ssl:
- enabled: true
+ cnis:
+ - calico
+ calico:
+ etcd:
+ ssl:
+ enabled: true
namespace:
netchecker:
enabled: true
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 1afffc1..67b29eb 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -21,7 +21,7 @@
kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
# component docker images
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ kubernetes_calico_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
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index db900d2..3f5af94 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -38,20 +38,13 @@
address: ${_param:single_address}
fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
- engine: opencontrail
- config:
- api:
- host: ${_param:opencontrail_control_address}
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
- contrail_cni:
- image: ${_param:kubernetes_opencontrail_cni_image}
+ cnis:
+ - opencontrail
+ contrail:
+ config:
+ api:
+ host: ${_param:opencontrail_control_address}
+ cni_image: ${_param:kubernetes_opencontrail_cni_image}
common:
addons:
virtlet:
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 012a0d0..116cd82 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -18,10 +18,6 @@
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:
@@ -58,18 +54,16 @@
etcd:
ssl:
enabled: true
- network:
- etcd:
- ssl:
- enabled: true
namespace:
netchecker:
enabled: true
network:
- engine: opencontrail
- public_ip_range: 185.22.97.128/26
- public_network: default-domain:default-project:Public
- private_ip_range: 10.150.0.0/16
- config:
- api:
- host: ${_param:opencontrail_control_address}
+ cnis:
+ - opencontrail
+ contrail:
+ public_ip_range: 185.22.97.128/26
+ public_network: default-domain:default-project:Public
+ private_ip_range: 10.150.0.0/16
+ config:
+ api:
+ host: ${_param:opencontrail_control_address}
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index 2a341ba..67e7296 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -22,9 +22,6 @@
kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
# component docker images
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
- kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
- kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_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
@@ -88,10 +85,6 @@
cluster_node03_address: ${_param:etcd_control_node03_address}
cluster_node03_port: 4001
- # calico
- calico_private_network: 192.168.0.0
- calico_private_netmask: 16
-
linux:
network:
host:
diff --git a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
index 34b32de..0c101cc 100644
--- a/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail/opencontrail/control.yml
@@ -4,7 +4,7 @@
- system.linux.system.repo.mcp.contrail
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo.saltstack.trusty
- system.opencontrail.client.resource.edge_router
- system.rabbitmq.server.cluster
- system.opencontrail.control.cluster
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index 7faf456..b78a930 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -7,7 +7,7 @@
- cluster.sl-k8s-calico
parameters:
_param:
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ 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
@@ -19,14 +19,15 @@
kubernetes:
pool:
network:
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
+ cnis:
+ - calico
+ calico:
+ image: ${_param:kubernetes_calico_image}
+ calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
+ cni_image: ${_param:kubernetes_calico_cni_image}
+ etcd:
+ ssl:
+ enabled: true
common:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/control.yml b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
index 7afdd01..6ffe418 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/control.yml
@@ -39,9 +39,12 @@
ssl:
enabled: true
network:
- etcd:
- ssl:
- enabled: true
+ cnis:
+ - calico
+ calico:
+ etcd:
+ ssl:
+ enabled: true
namespace:
netchecker:
enabled: true
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
index 8a508c4..9365431 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/compute.yml
@@ -32,17 +32,8 @@
kubernetes:
pool:
network:
- engine: opencontrail
- opencontrail:
- address: ${_param:opencontrail_control_address}
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
+ cnis:
+ - opencontrail
common:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
index 04d188a..24de888 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/control.yml
@@ -16,10 +16,6 @@
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:
@@ -39,17 +35,13 @@
etcd:
ssl:
enabled: true
- network:
- etcd:
- ssl:
- enabled: true
namespace:
netchecker:
enabled: true
network:
- engine: opencontrail
- public_ip_range: 185.22.97.128/26
- public_network: default-domain:default-project:Public
- private_ip_range: 10.150.0.0/16
- opencontrail:
- address: ${_param:opencontrail_control_address}
+ cnis:
+ - opencontrail
+ contrail:
+ public_ip_range: 185.22.97.128/26
+ public_network: default-domain:default-project:Public
+ private_ip_range: 10.150.0.0/16
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
index 37b89f9..f6898b3 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
@@ -16,9 +16,6 @@
etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
# component docker images
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
- kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
- kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
@@ -56,10 +53,6 @@
cluster_node03_address: ${_param:kubernetes_control_node03_address}
cluster_node03_port: 4001
- # calico
- calico_private_network: 192.168.0.0
- calico_private_netmask: 16
-
linux:
network:
host:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/init.yml
index a0a25d4..1cf3b8f 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/init.yml
@@ -22,6 +22,11 @@
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}
cluster_node01_hostname: ctl01
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 94e135b..4d24b2a 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
@@ -53,6 +53,11 @@
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}
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
index 370626d..4a7ef7e 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
@@ -22,6 +22,11 @@
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}
cluster_node01_hostname: ctl01
diff --git a/classes/cluster/virtual-mcp-pike-dvr/stacklight/client.yml b/classes/cluster/virtual-mcp-pike-dvr/stacklight/client.yml
index 6c7badd..4988908 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/stacklight/client.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/stacklight/client.yml
@@ -4,7 +4,6 @@
- system.grafana.client
- system.grafana.client.datasource.prometheus
- system.kibana.client.single
-- cluster.virtual-mcp-pike-dvr
parameters:
_param:
# Elasticsearch/Kibana client parameters
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/init.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/init.yml
index 2c253cc..0c92a6b 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/init.yml
@@ -21,6 +21,11 @@
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}
cluster_node01_hostname: ctl01
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
index 77cf4da..3325580 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
@@ -21,6 +21,11 @@
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}
cluster_node01_hostname: ctl01
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
index 6ee687b..b90bbe1 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/compute.yml
@@ -14,15 +14,16 @@
kubernetes:
pool:
network:
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
- mtu: ${_param:kubernetes_mtu}
+ cnis:
+ - calico
+ calico:
+ 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:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
index 87ebedb..813c28a 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/control.yml
@@ -44,9 +44,12 @@
ssl:
enabled: true
network:
- etcd:
- ssl:
- enabled: true
+ cnis:
+ - calico
+ calico:
+ etcd:
+ ssl:
+ enabled: true
namespace:
netchecker:
enabled: ${_param:kubernetes_netchecker_enabled}
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 c1cc38f..a769d1c 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
@@ -19,7 +19,7 @@
kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
# component docker images
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ kubernetes_calico_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
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
index c84a223..7ee7b30 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/compute.yml
@@ -14,15 +14,16 @@
kubernetes:
pool:
network:
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
- mtu: ${_param:kubernetes_mtu}
+ cnis:
+ - calico
+ calico:
+ 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:
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
index c03d2c2..1640fb7 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/control.yml
@@ -45,9 +45,12 @@
ssl:
enabled: true
network:
- etcd:
- ssl:
- enabled: true
+ cnis:
+ - calico
+ calico:
+ etcd:
+ ssl:
+ enabled: true
namespace:
netchecker:
enabled: ${_param:kubernetes_netchecker_enabled}
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 044be55..e35f3c5 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
@@ -19,7 +19,7 @@
kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
# component docker images
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ kubernetes_calico_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
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index b4eee22..4408379 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -15,15 +15,16 @@
kubelet:
fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
- mtu: ${_param:kubernetes_mtu}
+ cnis:
+ - calico
+ calico:
+ 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:
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 9ba031c..3718aa4 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -46,9 +46,12 @@
ssl:
enabled: true
network:
- etcd:
- ssl:
- enabled: true
+ cnis:
+ - calico
+ calico:
+ etcd:
+ ssl:
+ enabled: true
namespace:
netchecker:
enabled: ${_param:kubernetes_netchecker_enabled}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index 8736a3d..18599c4 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -23,7 +23,7 @@
kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
# component docker images
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+ kubernetes_calico_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
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
index 9737df7..3910a1a 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/stacklight/init.yml
@@ -25,6 +25,11 @@
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
elasticsearch_port: 9200
stacklight_environment: ${_param:cluster_domain}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 5cc9124..60c2328 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -36,20 +36,13 @@
kubelet:
fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
- engine: opencontrail
- config:
- api:
- host: ${_param:opencontrail_control_address}
- etcd:
- ssl:
- enabled: true
- image: ${_param:kubernetes_calico_image}
- calicoctl:
- image: ${_param:kubernetes_calicoctl_image}
- cni:
- image: ${_param:kubernetes_calico_cni_image}
- contrail_cni:
- image: ${_param:kubernetes_opencontrail_cni_image}
+ cnis:
+ - opencontrail
+ contrail:
+ config:
+ api:
+ host: ${_param:opencontrail_control_address}
+ cni_image: ${_param:kubernetes_opencontrail_cni_image}
common:
addons:
virtlet:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index 71cbf9c..0968833 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -16,10 +16,6 @@
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:
@@ -47,10 +43,6 @@
etcd:
ssl:
enabled: true
- network:
- etcd:
- ssl:
- enabled: true
namespace:
netchecker:
enabled: true
@@ -58,10 +50,12 @@
netchecker:
enabled: ${_param:kubernetes_netchecker_enabled}
network:
- engine: opencontrail
- public_ip_range: 185.22.97.128/26
- public_network: default-domain:default-project:Public
- private_ip_range: 10.150.0.0/16
- config:
- api:
- host: ${_param:opencontrail_control_address}
+ cnis:
+ - opencontrail
+ contrail:
+ public_ip_range: 185.22.97.128/26
+ public_network: default-domain:default-project:Public
+ private_ip_range: 10.150.0.0/16
+ config:
+ api:
+ host: ${_param:opencontrail_control_address}
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index ff8a2fe..0cc1a00 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -22,10 +22,6 @@
kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
# component docker images
- kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
- kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
- kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
- kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
kubernetes_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
@@ -77,10 +73,6 @@
cluster_node03_address: ${_param:kubernetes_control_node03_address}
cluster_node03_port: 4001
- # calico
- calico_private_network: 192.168.0.0
- calico_private_netmask: 16
-
linux:
network:
purge_hosts: true
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
index 832bcdd..fbdcd1f 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/stacklight/init.yml
@@ -18,6 +18,11 @@
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
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
new file mode 100644
index 0000000..f72467c
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/config.yml
@@ -0,0 +1,188 @@
+classes:
+- service.git.client
+- system.linux.system.single
+- system.linux.system.repo_local.mcp.salt
+- system.linux.system.repo_local.mcp.apt_mirantis.openstack
+- system.openssh.client.lab
+- system.salt.master.api
+- system.salt.master.pkg
+- 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.aodh
+- system.keystone.client.service.ceilometer
+- system.keystone.client.service.nova21
+- system.keystone.client.service.nova-placement
+- system.keystone.client.service.glare
+- system.keystone.client.service.cinder3
+- system.keystone.client.service.designate
+- system.mysql.client.single
+- system.reclass.storage.system.openstack_control_cluster
+- system.reclass.storage.system.openstack_compute_multi
+- system.reclass.storage.system.openstack_gateway_single
+- system.reclass.storage.system.openstack_dashboard_single
+- system.reclass.storage.system.stacklightv2_server_cluster
+- cluster.virtual-offline-pike-ovs-dpdk.openstack.proxy
+- cluster.virtual-offline-pike-ovs-dpdk.stacklight.proxy
+- cluster.virtual-offline-pike-ovs-dpdk
+parameters:
+ _param:
+ reclass_data_repository: https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab
+ reclass_data_revision: master
+ salt_master_environment_repository: "https://github.com/tcpcloud"
+ salt_master_environment_revision: master
+ reclass_config_master: 192.168.10.90
+ single_address: 172.16.10.100
+ salt_master_host: 127.0.0.1
+ salt_master_base_environment: prd
+ salt_minion_ca_host: ${linux:network:fqdn}
+ salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ nginx:
+ server:
+ site:
+ nginx_proxy_openstack_web:
+ proxy:
+ host: prx
+ nginx_proxy_openstack_api_heat_cfn:
+ enabled: false
+ salt:
+ master:
+ reactor:
+ reclass/minion/classify:
+ - salt://reclass/reactor/node_register.sls
+ reclass:
+ storage:
+ class_mapping:
+ common_node:
+ expression: all
+ node_param:
+ single_address:
+ value_template: <<node_control_ip>>
+ linux_system_codename:
+ value_template: <<node_os>>
+ salt_master_host:
+ value_template: <<node_master_ip>>
+ infra_config:
+ expression: <<node_hostname>>__startswith__cfg
+ cluster_param:
+ infra_config_address:
+ value_template: <<node_control_ip>>
+ infra_config_deploy_address:
+ value_template: <<node_deploy_ip>>
+ cluster_domain:
+ value_template: <<node_domain>>
+ openstack_control01:
+ expression: <<node_hostname>>__equals__ctl01
+ cluster_param:
+ openstack_control_node01_address:
+ value_template: <<node_control_ip>>
+ openstack_control02:
+ expression: <<node_hostname>>__equals__ctl02
+ cluster_param:
+ openstack_control_node02_address:
+ value_template: <<node_control_ip>>
+ openstack_control03:
+ expression: <<node_hostname>>__equals__ctl03
+ cluster_param:
+ openstack_control_node03_address:
+ value_template: <<node_control_ip>>
+ openstack_compute:
+ expression: <<node_hostname>>__startswith__cmp
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.compute
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
+ openstack_gateway:
+ expression: <<node_hostname>>__startswith__gtw
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.gateway
+ node_param:
+ tenant_address:
+ value_template: <<node_tenant_ip>>
+ external_address:
+ value_template: <<node_external_ip>>
+ cluster_param:
+ openstack_gateway_node01_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node01:
+ expression: <<node_hostname>>__equals__mon01
+ cluster_param:
+ stacklight_monitor_node01_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node02:
+ expression: <<node_hostname>>__equals__mon02
+ cluster_param:
+ stacklight_monitor_node02_address:
+ value_template: <<node_control_ip>>
+ stacklight_monitor_node03:
+ expression: <<node_hostname>>__equals__mon03
+ cluster_param:
+ stacklight_monitor_node03_address:
+ value_template: <<node_control_ip>>
+ openstack_dashboard:
+ expression: <<node_hostname>>__startswith__prx
+ node_class:
+ value_template:
+ - cluster.<<node_cluster>>.openstack.dashboard
+ - cluster.<<node_cluster>>.openstack.proxy
+ cluster_param:
+ openstack_proxy_node01_address:
+ value_template: <<node_control_ip>>
+ node:
+ openstack_control_node01:
+ classes:
+ - service.galera.master.cluster
+ params:
+ mysql_cluster_role: master
+ linux_system_codename: xenial
+ openstack_control_node02:
+ classes:
+ - service.galera.slave.cluster
+ params:
+ mysql_cluster_role: slave
+ linux_system_codename: xenial
+ openstack_control_node03:
+ classes:
+ - service.galera.slave.cluster
+ params:
+ mysql_cluster_role: slave
+ linux_system_codename: xenial
+ stacklight_server_node01:
+ classes:
+ - system.influxdb.server.single
+ - system.influxdb.database.stacklight
+ openstack_compute_node01:
+ params:
+ single_address: 172.16.10.105
+ tenant_address: 10.1.0.105
+ external_address: 10.16.0.105
+ openstack_compute_node02:
+ params:
+ single_address: 172.16.10.106
+ tenant_address: 10.1.0.106
+ external_address: 10.16.0.106
+ openstack_gateway_node01:
+ params:
+ tenant_address: 10.1.0.110
+ external_address: 10.16.0.110
+ openstack_proxy_node01:
+ classes:
+ - cluster.virtual-offline-pike-ovs-dpdk.openstack.proxy
+ params:
+ linux_system_codename: xenial
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml
new file mode 100644
index 0000000..b01723d
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml
@@ -0,0 +1,14 @@
+parameters:
+ linux:
+ network:
+ host:
+ cfg01:
+ address: ${_param:infra_config_address}
+ names:
+ - ${_param:infra_config_hostname}
+ - ${_param:infra_config_hostname}.${_param:cluster_domain}
+ cfg:
+ address: ${_param:infra_config_address}
+ names:
+ - cfg
+ - cfg.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
new file mode 100644
index 0000000..808d64f
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
@@ -0,0 +1,54 @@
+classes:
+- system.linux.network.dynamic_hosts
+- service.grafana.collector
+- system.heka.log_collector.single
+- system.heka.log_collector.output.telegraf
+- 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.rsyslog.client.single
+- system.prometheus.collector
+- system.telegraf.agent
+- system.openssh.server.team.lab
+- system.openssh.server.team.tcpcloud
+- system.openssh.server.team.mcp_qa
+- cluster.virtual-offline-pike-ovs-dpdk.infra
+- cluster.virtual-offline-pike-ovs-dpdk.openstack
+- cluster.virtual-offline-pike-ovs-dpdk.stacklight
+
+parameters:
+ _param:
+ cluster_domain: virtual-offline-pike-ovs-dpdk.local
+ cluster_name: virtual-offline-pike-ovs-dpdk
+ infra_config_hostname: cfg01
+ local_repos: true
+ local_repo_url: mirror.mcp.mirantis.local.test
+ linux_repo_refresh_db: true
+ aptly_server_address: 10.170.0.226
+ # infra service addresses
+ infra_config_address: 172.16.10.100
+ # openstack service addresses
+ openstack_proxy_address: 172.16.10.121
+ openstack_proxy_node01_address: 172.16.10.121
+ openstack_control_address: 172.16.10.254
+ openstack_control_node01_address: 172.16.10.101
+ openstack_control_node02_address: 172.16.10.102
+ openstack_control_node03_address: 172.16.10.103
+ openstack_gateway_address: 172.16.10.110
+ openstack_database_address: ${_param:openstack_control_address}
+ openstack_message_queue_address: ${_param:openstack_control_address}
+ openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
+ openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
+ openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
+ # stacklight service addresses
+ stacklight_monitor_address: 172.16.10.253
+ stacklight_monitor_node01_address: 172.16.10.107
+ stacklight_monitor_node02_address: 172.16.10.108
+ stacklight_monitor_node03_address: 172.16.10.109
+ stacklight_telemetry_node01_address: ${_param:stacklight_monitor_node01_address}
+ stacklight_log_address: ${_param:stacklight_monitor_address}
+ openstack_gateway_address: 172.16.10.110
+ openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+ stacklight_telemetry_address: ${_param:stacklight_monitor_address}
+
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
new file mode 100644
index 0000000..b74e2ca
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/compute.yml
@@ -0,0 +1,87 @@
+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.nova.compute.cluster
+- system.neutron.compute.cluster
+- system.ceilometer.agent.cluster
+- system.prometheus.exporters.libvirt
+- cluster.virtual-offline-pike-ovs-dpdk
+- system.nova.compute.nfv.cpu_pinning
+- system.nova.compute.nfv.sriov
+- system.neutron.compute.nfv.dpdk
+- system.neutron.compute.nfv.sriov
+
+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"
+
+ 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}
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
new file mode 100644
index 0000000..75a6a48
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
@@ -0,0 +1,158 @@
+classes:
+- 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.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.ceilometer.server.cluster
+- system.ceilometer.server.backend.influxdb
+- system.aodh.server.cluster
+- system.heka.ceilometer_collector.single
+- system.designate.server.cluster
+- system.designate.server.backend.bind
+- system.bind.server.single
+- system.galera.server.cluster
+- system.galera.server.database.aodh
+- system.galera.server.database.ceilometer
+- system.galera.server.database.cinder
+- system.galera.server.database.glance
+- system.galera.server.database.grafana
+- system.galera.server.database.heat
+- system.galera.server.database.keystone
+- system.galera.server.database.nova
+- system.galera.server.database.designate
+- system.haproxy.proxy.listen.openstack.nova-placement
+- cluster.virtual-offline-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
+ quota:
+ zones: ${_param:designate_quota_zones}
+ 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-offline-pike-ovs-dpdk/openstack/dashboard.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/dashboard.yml
new file mode 100644
index 0000000..ca5df8d
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/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-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-offline-pike-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
new file mode 100644
index 0000000..028c83d
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
@@ -0,0 +1,81 @@
+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.neutron.gateway.cluster
+- cluster.virtual-offline-pike-ovs-dpdk
+parameters:
+ _param:
+ primary_interface: ens4
+ tenant_interface: ens5
+ external_interface: ens6
+ interface_mtu: 9000
+ linux_system_codename: xenial
+ linux:
+ network:
+ bridge: openvswitch
+ interface:
+ dhcp_int:
+ enabled: true
+ name: ens3
+ proto: dhcp
+ type: eth
+ mtu: ${_param:interface_mtu}
+ primary_interface:
+ enabled: true
+ 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
+ br-floating:
+ enabled: true
+ type: ovs_bridge
+ mtu: ${_param:interface_mtu}
+ br-mgmt:
+ enabled: true
+ type: bridge
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ mtu: ${_param:interface_mtu}
+ use_interfaces:
+ - ${_param:primary_interface}
+ br-mesh:
+ enabled: true
+ type: bridge
+ mtu: ${_param:interface_mtu}
+ proto: static
+ address: ${_param:tenant_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - ${_param:tenant_interface}
+ float-to-ex:
+ enabled: true
+ type: ovs_port
+ mtu: ${_param:interface_mtu}
+ bridge: br-floating
+ br-ex:
+ enabled: true
+ type: bridge
+ mtu: ${_param:interface_mtu}
+ address: ${_param:external_address}
+ netmask: 255.255.255.0
+ use_interfaces:
+ - ${_param:external_interface}
+ use_ovs_ports:
+ - float-to-ex
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
new file mode 100644
index 0000000..c18b5bd
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
@@ -0,0 +1,177 @@
+parameters:
+ _param:
+ openstack_version: pike
+ cinder_version: ${_param:openstack_version}
+ apt_mk_version: testing
+ mcp_version: 2018.1
+ openstack_region: RegionOne
+ admin_email: root@localhost
+ cluster_public_protocol: http
+ cluster_public_host: 172.16.10.254
+ neutron_public_protocol: http
+ neutron_control_dvr: False
+ neutron_tenant_network_types: "flat,vxlan"
+ neutron_l3_ha: False
+ neutron_global_physnet_mtu: 1500
+ neutron_external_mtu: 1500
+ neutron_gateway_dvr: False
+ neutron_gateway_agent_mode: legacy
+ neutron_compute_dvr: False
+ neutron_compute_agent_mode: legacy
+ neutron_compute_external_access: False
+ galera_server_cluster_name: openstack_cluster
+ galera_server_maintenance_password: workshop
+ galera_server_admin_password: workshop
+ cluster_vip_address: 172.16.10.254
+ cluster_local_address: ${_param:single_address}
+ cluster_node01_hostname: ctl01
+ cluster_node01_address: 172.16.10.101
+ cluster_node02_hostname: ctl02
+ cluster_node02_address: 172.16.10.102
+ cluster_node03_hostname: ctl03
+ cluster_node03_address: 172.16.10.103
+ rabbitmq_secret_key: workshop
+ rabbitmq_admin_password: workshop
+ rabbitmq_openstack_password: workshop
+ rabbitmq_cold_password: workshop
+ designate_admin_api_enabled: true
+ designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
+ designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_quota_zones: 40
+ designate_pool_ns_records:
+ - hostname: 'ns1.example.org.'
+ priority: 10
+ 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: ${_param:cluster_vip_address}
+ cinder_version: ${_param:openstack_version}
+ cinder_service_host: ${_param:cluster_vip_address}
+ aodh_version: ${_param:openstack_version}
+ aodh_service_host: ${_param:cluster_vip_address}
+ ceilometer_graphite_publisher_host: 172.16.10.107
+ ceilometer_graphite_publisher_port: 2013
+ nova_version: ${_param:openstack_version}
+ nova_service_host: ${_param:cluster_vip_address}
+ nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
+ neutron_version: ${_param:openstack_version}
+ neutron_service_host: ${_param:cluster_vip_address}
+ glusterfs_service_host: ${_param:cluster_vip_address}
+ 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_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
+ mysql_designate_password: workshop
+ keystone_service_token: workshop
+ keystone_admin_password: workshop
+ keystone_ceilometer_password: workshop
+ keystone_aodh_password: workshop
+ keystone_cinder_password: workshop
+ keystone_glance_password: workshop
+ keystone_heat_password: workshop
+ keystone_keystone_password: workshop
+ keystone_neutron_password: workshop
+ keystone_nova_password: workshop
+ 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
+ ceilometer_influxdb_password: lmapass
+ 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-offline-pike-ovs-dpdk/openstack/proxy.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml
new file mode 100644
index 0000000..fe5783a
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml
@@ -0,0 +1,15 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.openstack_api
+- system.nginx.server.proxy.openstack_vnc
+- system.nginx.server.proxy.openstack_web
+- system.salt.minion.cert.proxy
+- cluster.virtual-offline-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}
\ No newline at end of file
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/client.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/client.yml
new file mode 100644
index 0000000..4f06868
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/client.yml
@@ -0,0 +1,22 @@
+classes:
+- system.docker.client
+- system.elasticsearch.client.single
+- system.grafana.client
+- system.grafana.client.datasource.prometheus
+- system.kibana.client.single
+- cluster.virtual-offline-pike-ovs-dpdk
+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-offline-pike-ovs-dpdk/stacklight/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/init.yml
new file mode 100644
index 0000000..883bad0
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/init.yml
@@ -0,0 +1,35 @@
+parameters:
+ _param:
+ linux_system_codename: xenial
+ prometheus_control_address: ${_param:stacklight_monitor_address}
+ heka_elasticsearch_host: ${_param:stacklight_monitor_address}
+ elasticsearch_port: 9200
+ stacklight_environment: ${_param:cluster_domain}
+ stacklight_notification_topic: stacklight_notifications
+ grafana_admin_password: admin
+ grafana_database_type: mysql
+ grafana_database_host: ${_param:openstack_database_address}
+ grafana_database_password: ${_param:mysql_grafana_password}
+ linux:
+ network:
+ host:
+ mon:
+ address: ${_param:stacklight_monitor_address}
+ names:
+ - mon
+ - mon.${_param:cluster_domain}
+ mon01:
+ address: ${_param:stacklight_monitor_node01_address}
+ names:
+ - mon01
+ - mon01.${_param:cluster_domain}
+ mon02:
+ address: ${_param:stacklight_monitor_node02_address}
+ names:
+ - mon02
+ - mon02.${_param:cluster_domain}
+ mon03:
+ address: ${_param:stacklight_monitor_node03_address}
+ names:
+ - mon03
+ - mon03.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/proxy.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/proxy.yml
new file mode 100644
index 0000000..18cfdd7
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/proxy.yml
@@ -0,0 +1,17 @@
+classes:
+- system.nginx.server.single
+- system.nginx.server.proxy.stacklight.grafana
+- system.nginx.server.proxy.stacklight.kibana
+- system.nginx.server.proxy.monitoring.prometheus_server
+- system.nginx.server.proxy.monitoring.prometheus_alertmanager
+- system.salt.minion.cert.proxy
+- cluster.virtual-offline-pike-ovs-dpdk
+parameters:
+ _param:
+ nginx_proxy_grafana_port: 15013
+ nginx_proxy_ssl:
+ enabled: true
+ authority: ${_param:salt_minion_ca_authority}
+ engine: salt
+ mode: secure
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/server.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/server.yml
new file mode 100644
index 0000000..4b2f516
--- /dev/null
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/stacklight/server.yml
@@ -0,0 +1,73 @@
+classes:
+- system.docker.host
+- system.linux.system.repo_local.mcp.apt_mirantis.influxdb
+- system.linux.system.repo_local.mcp.extra
+- system.linux.system.repo_local.mcp.apt_mirantis.elastic
+- system.linux.system.repo_local.mcp.apt_mirantis.kibana
+- system.linux.system.repo_local.mcp.apt_mirantis.docker
+- system.heka.remote_collector.container
+- system.heka.remote_collector.input.amqp
+- system.heka.remote_collector.output.elasticsearch
+- system.heka.remote_collector.output.telegraf
+- system.elasticsearch.server.cluster
+- system.elasticsearch.server.curator
+- system.kibana.server.single
+- system.haproxy.proxy.listen.stacklight.elasticsearch
+- system.haproxy.proxy.listen.stacklight.kibana
+- system.haproxy.proxy.listen.stacklight.influxdb_relay
+- service.haproxy.proxy.single
+- system.influxdb.relay.cluster
+- system.influxdb.server.single
+- system.influxdb.database.stacklight
+- system.influxdb.database.ceilometer
+- system.keepalived.cluster.instance.prometheus_server_vip
+- system.telegraf.agent.remote
+- system.prometheus.server.remote_write.docker
+- system.prometheus.server.alertmanager.dns
+- system.prometheus.server.target.dns
+- system.docker.swarm.stack.monitoring.prometheus_global
+- system.docker.swarm.stack.monitoring.remote_collector
+- system.docker.swarm.stack.dashboard
+- cluster.virtual-offline-pike-ovs-dpdk
+parameters:
+ _param:
+ heka_amqp_host: ${_param:openstack_control_address}
+ kibana_elasticsearch_host: ${_param:stacklight_monitor_address}
+ keepalived_prometheus_vip_address: ${_param:stacklight_monitor_address}
+ keepalived_prometheus_vip_password: 'password'
+ keepalived_prometheus_vip_interface: ens4
+ cluster_vip_address: ${_param:stacklight_monitor_address}
+ cluster_local_address: ${_param:single_address}
+ cluster_elasticsearch_port: 9200
+ cluster_kibana_port: 5601
+ cluster_node01_hostname: mon01
+ cluster_node01_address: ${_param:stacklight_monitor_node01_address}
+ cluster_node02_hostname: mon02
+ cluster_node02_address: ${_param:stacklight_monitor_node02_address}
+ cluster_node03_hostname: mon03
+ cluster_node03_address: ${_param:stacklight_monitor_node03_address}
+ docker_image_alertmanager: apt:5000/alertmanager:${_param:apt_mk_version}
+ docker_image_pushgateway: apt:5000/pushgateway:${_param:apt_mk_version}
+ docker_image_prometheus: apt:5000/prometheus:${_param:apt_mk_version}
+ docker_image_remote_agent: apt:5000/telegraf:${_param:apt_mk_version}
+ docker_image_remote_storage_adapter: apt:5000/remote_storage_adapter:${_param:apt_mk_version}
+ docker_image_remote_collector: apt:5000/heka:${_param:apt_mk_version}
+ docker_image_prometheus_relay: apt:5000/prometheus_relay:${_param:apt_mk_version}
+ docker_image_grafana: apt:5000/grafana:${_param:apt_mk_version}
+ influxdb_port: 8086
+ influxdb_admin_password: password
+ influxdb_stacklight_password: lmapass
+ prometheus_influxdb_url: "http://${_param:stacklight_monitor_address}:${_param:influxdb_port}/"
+ prometheus_influxdb_db: lma
+ prometheus_influxdb_username: lma
+ prometheus_influxdb_password: ${_param:influxdb_stacklight_password}
+ remote_collector_telegraf_host: monitoring_remote_agent
+ linux:
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
index c18b5bd..9f1aba9 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/init.yml
@@ -22,6 +22,11 @@
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}
cluster_node01_hostname: ctl01
diff --git a/classes/cluster/virtual-pike-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-pike-ovs-dpdk/openstack/init.yml
index d68f04c..5c618c8 100644
--- a/classes/cluster/virtual-pike-ovs-dpdk/openstack/init.yml
+++ b/classes/cluster/virtual-pike-ovs-dpdk/openstack/init.yml
@@ -22,6 +22,11 @@
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}
diff --git a/classes/system b/classes/system
index 85ab878..86e4aaa 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 85ab8789440f88e5ad5e0178207aac9ba6bda1d5
+Subproject commit 86e4aaabf472ae168e50423dd5d510818713261b