Merge "Fix typo in class name"
diff --git a/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml b/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
index cd99283..4b67eec 100644
--- a/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/cicd/control/init.yml
@@ -1,5 +1,7 @@
classes:
- system.linux.system.repo.docker
+ - system.linux.system.repo.glusterfs
+
# GlusterFS
- system.glusterfs.server.cluster
- system.glusterfs.server.volume.aptly
@@ -127,7 +129,7 @@
# OpenLDAP
openldap_organisation: ${_param:cluster_name}
openldap_dn: 'dc=cicd-lab-dev,dc=local'
- openldap_domain: ${linux:system:domain}
+ openldap_domain: 'cicd-lab-dev.local'
openldap_admin_password: password
openldap_config_password: password
openldap_readonly_password: password
diff --git a/classes/cluster/drivetrain-ha/cicd/control/init.yml b/classes/cluster/drivetrain-ha/cicd/control/init.yml
index 81ad1ad..38fce33 100644
--- a/classes/cluster/drivetrain-ha/cicd/control/init.yml
+++ b/classes/cluster/drivetrain-ha/cicd/control/init.yml
@@ -1,5 +1,7 @@
classes:
- system.linux.system.repo.docker
+ - system.linux.system.repo.glusterfs
+
# GlusterFS
- system.glusterfs.server.cluster
- system.glusterfs.server.volume.aptly
@@ -129,7 +131,7 @@
# OpenLDAP
openldap_organisation: ${_param:cluster_name}
openldap_dn: 'dc=cicd-lab-dev,dc=local'
- openldap_domain: ${linux:system:domain}
+ openldap_domain: 'cicd-lab-dev.local'
openldap_admin_password: password
openldap_config_password: password
openldap_readonly_password: password
diff --git a/classes/cluster/k8s-aio-calico/.env b/classes/cluster/k8s-aio-calico/.env
index 407e2d1..4687819 100644
--- a/classes/cluster/k8s-aio-calico/.env
+++ b/classes/cluster/k8s-aio-calico/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp"
+EXTRA_FORMULAS="ntp rsyslog"
diff --git a/classes/cluster/k8s-aio-calico/kubernetes/init.yml b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
index 0856f18..d90145d 100644
--- a/classes/cluster/k8s-aio-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-calico/kubernetes/init.yml
@@ -23,7 +23,7 @@
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
kubernetes_virtlet_image: mirantis/virtlet:latest
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
diff --git a/classes/cluster/k8s-aio-contrail/.env b/classes/cluster/k8s-aio-contrail/.env
index 407e2d1..4687819 100644
--- a/classes/cluster/k8s-aio-contrail/.env
+++ b/classes/cluster/k8s-aio-contrail/.env
@@ -1 +1 @@
-EXTRA_FORMULAS="ntp"
+EXTRA_FORMULAS="ntp rsyslog"
diff --git a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
index 48e75b0..2dd76cc 100644
--- a/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-aio-contrail/kubernetes/init.yml
@@ -19,7 +19,7 @@
kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
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/infra/init.yml b/classes/cluster/k8s-compact/infra/init.yml
new file mode 100755
index 0000000..6d5cb21
--- /dev/null
+++ b/classes/cluster/k8s-compact/infra/init.yml
@@ -0,0 +1,46 @@
+classes:
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.mcp.salt
+- system.salt.master.pkg
+- system.salt.minion.ca.salt_master
+- system.salt.master.api
+- system.reclass.storage.salt
+- cluster.k8s-compact
+parameters:
+ _param:
+ salt_master_base_environment: prd
+ salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
+ salt_master_host: ${_param:single_address}
+ salt_master_environment_revision: master
+ salt_master_environment_repository: 'https://github.com/salt-formulas'
+ salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
+ salt_minion_ca_authority: salt_master_ca
+ reclass_data_repository: "https://gerrit.mcp.mirantis.net/salt-models/mcp-virtual-lab"
+ reclass_data_revision: master
+ reclass_config_master: ${_param:single_address}
+ linux:
+ network:
+ host:
+ kube01:
+ address: ${_param:single_address}
+ names:
+ - ${_param:infra_config_hostname}
+ - ${_param:infra_config_hostname}.${_param:cluster_domain}
+ system:
+ name: ${_param:infra_config_hostname}
+ domain: ${_param:cluster_domain}
+ salt:
+ master:
+ worker_threads: 3
+ 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>>
diff --git a/classes/cluster/k8s-compact/init.yml b/classes/cluster/k8s-compact/init.yml
new file mode 100755
index 0000000..7bafe50
--- /dev/null
+++ b/classes/cluster/k8s-compact/init.yml
@@ -0,0 +1,22 @@
+classes:
+- system.linux.system.single
+- system.linux.system.repo.ubuntu
+- system.linux.network.hosts
+parameters:
+ _param:
+ primary_interface: ens3
+ infra_config_hostname: kube01
+ cluster_domain: edge
+ linux_system_codename: xenial
+ apt_mk_version: nightly
+ openssh:
+ server:
+ password_auth: true
+ permit_root_login: true
+ linux:
+ system:
+ user:
+ root:
+ enabled: true
+ # r00tme
+ password: $6$9ojWyyN.$26Vj46JtCUL6C7XBQ8RmQTZLwo8/8SkqTRElXh0X2YBLrt7E/aVe2AYQ5gguYUwUknZNOSn5q7M9M3Jyf2gof/
diff --git a/classes/cluster/k8s-compact/kubernetes/compute.yml b/classes/cluster/k8s-compact/kubernetes/compute.yml
new file mode 100644
index 0000000..f520941
--- /dev/null
+++ b/classes/cluster/k8s-compact/kubernetes/compute.yml
@@ -0,0 +1,62 @@
+classes:
+#- system.linux.system.repo.docker
+- system.linux.system.repo.docker_legacy
+- service.docker.host
+- system.salt.minion.cert.etcd_client
+- system.salt.minion.cert.k8s_client_single
+- system.kubernetes.pool.single
+- cluster.k8s-compact.kubernetes
+parameters:
+ kubernetes:
+ pool:
+ cluster_dns: ${_param:kubernetes_internal_dns_address}
+ 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}
+ common:
+ addons:
+ virtlet:
+ enabled: ${_param:kubernetes_virtlet_enabled}
+ namespace: ${_param:kubernetes_addon_namespace}
+ image: ${_param:kubernetes_virtlet_image}
+ hosts:
+ - kube01
+ hyperkube:
+ image: ${_param:kubernetes_hyperkube_image}
+ docker:
+ host:
+ pkgs:
+ - ${_param:kubernetes_docker_package}
+ - python-docker
+ options:
+ bip: 172.31.255.1/24
+ storage-driver: overlay2
+ linux:
+ network:
+ resolv:
+ dns:
+ - ${_param:kubernetes_internal_dns_address}
+ - 172.18.176.4
+ - 172.18.176.7
+ interface:
+ ens3:
+ enabled: true
+ type: eth
+ proto: static
+ name: ${_param:primary_interface}
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
+ gateway: 192.168.122.1
+ route:
+ kubernetes_services:
+ address: 10.201.0.0
+ netmask: 255.255.0.0
+ gateway: ${_param:single_address}
diff --git a/classes/cluster/k8s-compact/kubernetes/control.yml b/classes/cluster/k8s-compact/kubernetes/control.yml
new file mode 100644
index 0000000..d64e5c3
--- /dev/null
+++ b/classes/cluster/k8s-compact/kubernetes/control.yml
@@ -0,0 +1,63 @@
+classes:
+- system.salt.minion.cert.etcd_server_single
+- system.salt.minion.cert.k8s_server_single
+- service.etcd.server.single
+- system.kubernetes.master.single
+- cluster.k8s-compact.kubernetes.compute
+parameters:
+ helm:
+ client:
+ repos:
+ mirantisworkloads: https://mirantisworkloads.storage.googleapis.com/
+ etcd:
+ server:
+ bind:
+ host: ${_param:single_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:
+ dns:
+ server: ${_param:kubernetes_internal_dns_address}
+ dashboard:
+ enabled: ${_param:kubernetes_dashboard}
+ 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}
+ coredns:
+ enabled: ${_param:kubernetes_coredns_enabled}
+ externaldns:
+ enabled: ${_param:kubernetes_externaldns_enabled}
+ image: ${_param:kubernetes_externaldns_image}
+ provider: ${_param:kubernetes_externaldns_provider}
+ master:
+ service_addresses: 10.201.0.0/16
+ addons:
+ dns:
+ server: ${_param:kubernetes_internal_dns_address}
+ kubelet:
+ address: ${_param:single_address}
+ etcd:
+ ssl:
+ enabled: true
+ network:
+ 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
new file mode 100644
index 0000000..70b2cf9
--- /dev/null
+++ b/classes/cluster/k8s-compact/kubernetes/init.yml
@@ -0,0 +1,48 @@
+classes:
+- cluster.k8s-compact
+parameters:
+ _param:
+ control_address: ${_param:single_address}
+ kubernetes_internal_api_address: 10.201.0.1
+ kubernetes_internal_dns_address: 10.201.0.10
+ cluster_name: ${_param:infra_config_hostname}.${_param:cluster_domain}
+ kubernetes_control_node01_address: ${_param:single_address}
+ cluster_local_address: ${_param:single_address}
+ master_address: ${_param:single_address}
+
+ etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
+ node_address: ${_param:single_address}
+ node_hostname: ${_param:infra_config_hostname}
+ node_port: 4001
+
+ calico_private_network: 10.10.0.0
+ calico_private_netmask: 16
+
+ kubernetes_admin_user: admin
+ kubernetes_admin_password: sbPfel23ZigJF3Bm
+ kubernetes_admin_token: PpP6Mm3pAoPVqcKOKUu0x1dh7b1959Fi
+ kubernetes_kubelet_token: JJ2PKHxjiU6EYvIt18BqwdSK1HvWh8pt
+ kubernetes_kube-proxy_token: jT0hJk9L6cIw5UpYDNhsRwcj3Z2n62B6
+ kubernetes_scheduler_token: VgkUHfrW07zNxrb0ucFyX7NBnSJN9Xp6
+ kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
+ kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
+ kubernetes_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_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-local.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
+ kubernetes_virtlet_image: mirantis/virtlet:latest
+ kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
+ kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
+ kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
+ kubernetes_externaldns_image: mirantis/external-dns:latest
+ kubernetes_externaldns_provider: coredns
+ kubernetes_addon_namespace: kube-system
+ kubernetes_dashboard: false
+ kubernetes_helm_enabled: false
+ kubernetes_netchecker_enabled: false
+ kubernetes_calico_policy_enabled: false
+ kubernetes_virtlet_enabled: true
+ kubernetes_coredns_enabled: false
+ kubernetes_externaldns_enabled: false
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-cloudprovider/kubernetes/compute.yml
index 53efb6b..c51a90c 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_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
docker:
host:
pkgs:
diff --git a/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-syndic/kubernetes/compute.yml
index 46635fb..19a2961 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_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
docker:
host:
pkgs:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 1336dde..8398678 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -26,7 +26,7 @@
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
kubernetes_virtlet_image: mirantis/virtlet:latest
kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index ec8e4de..801eeed 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -27,7 +27,7 @@
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_opencontrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
kubernetes_virtlet_image: mirantis/virtlet:latest
kubernetes_dashboard_image: gcr.io/google_containers/kubernetes-dashboard-amd64:v1.5.1
kubernetes_kubedns_image: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5
diff --git a/classes/cluster/os-ha-contrail-40/openstack/init.yml b/classes/cluster/os-ha-contrail-40/openstack/init.yml
index 6ecca65..bc03cd1 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/init.yml
@@ -49,6 +49,7 @@
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/iEDmHxnyjkA33EQC8
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
designate_pool_ns_records:
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/init.yml b/classes/cluster/os-ha-contrail-ironic/openstack/init.yml
index 9e2222f..c9d3b47 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/init.yml
@@ -56,6 +56,7 @@
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/iEDmHxnyjkA33EQC8
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
designate_pool_ns_records:
diff --git a/classes/cluster/os-ha-contrail/openstack/init.yml b/classes/cluster/os-ha-contrail/openstack/init.yml
index 011c39c..e840320 100755
--- a/classes/cluster/os-ha-contrail/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail/openstack/init.yml
@@ -49,6 +49,7 @@
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/iEDmHxnyjkA33EQC8
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
designate_pool_ns_records:
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/init.yml b/classes/cluster/os-ha-ovs-ceph/openstack/init.yml
index e0f12e2..b538443 100644
--- a/classes/cluster/os-ha-ovs-ceph/openstack/init.yml
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/init.yml
@@ -56,6 +56,7 @@
rabbitmq_openstack_password: workshop
rabbitmq_cold_password: workshop
designate_service_host: ${_param:openstack_control_address}
+ designate_admin_api_enabled: true
designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
designate_pool_ns_records:
diff --git a/classes/cluster/os-ha-ovs/openstack/compute.yml b/classes/cluster/os-ha-ovs/openstack/compute.yml
index 96db48a..8932786 100644
--- a/classes/cluster/os-ha-ovs/openstack/compute.yml
+++ b/classes/cluster/os-ha-ovs/openstack/compute.yml
@@ -15,6 +15,7 @@
linux_system_codename: xenial
nova:
compute:
+ cpu_mode: none
vncproxy_url: http://${_param:cluster_vip_address}:6080
notification:
driver: messagingv2
diff --git a/classes/cluster/os-ha-ovs/openstack/control.yml b/classes/cluster/os-ha-ovs/openstack/control.yml
index a01afb8..03c2070 100644
--- a/classes/cluster/os-ha-ovs/openstack/control.yml
+++ b/classes/cluster/os-ha-ovs/openstack/control.yml
@@ -4,6 +4,7 @@
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
+- system.linux.storage.loopback
- system.memcached.server.single
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
@@ -19,6 +20,9 @@
- system.nova.control.cluster
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
+- system.cinder.control.backend.lvm
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
- system.heat.server.cluster
- system.designate.server.cluster
- system.designate.server.backend.bind
diff --git a/classes/cluster/os-ha-ovs/openstack/init.yml b/classes/cluster/os-ha-ovs/openstack/init.yml
index 2f74ab9..d478f1f 100644
--- a/classes/cluster/os-ha-ovs/openstack/init.yml
+++ b/classes/cluster/os-ha-ovs/openstack/init.yml
@@ -56,6 +56,7 @@
rabbitmq_openstack_password: workshop
rabbitmq_cold_password: workshop
designate_service_host: ${_param:openstack_control_address}
+ designate_admin_api_enabled: true
designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
designate_pool_ns_records:
@@ -123,6 +124,8 @@
horizon_identity_host: ${_param:cluster_vip_address}
horizon_identity_encryption: none
horizon_identity_version: 2
+ nginx_proxy_openstack_api_proxy_host: ${_param:cluster_vip_address}
+ loopback_device_size: 20
linux:
network:
host:
diff --git a/classes/cluster/os-ha-ovs/openstack/proxy.yml b/classes/cluster/os-ha-ovs/openstack/proxy.yml
index 1f296ae..8b2e13c 100644
--- a/classes/cluster/os-ha-ovs/openstack/proxy.yml
+++ b/classes/cluster/os-ha-ovs/openstack/proxy.yml
@@ -3,6 +3,7 @@
- system.nginx.server.proxy.openstack_api
- system.nginx.server.proxy.openstack_vnc
- system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.openstack.designate
- system.salt.minion.cert.proxy
- cluster.os-ha-ovs.openstack.dashboard
- cluster.os-ha-ovs
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index ced1168..04aaf6c 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -10,7 +10,7 @@
kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
docker:
host:
pkgs:
diff --git a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
index 6d3270f..672ed25 100644
--- a/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/sl-k8s-contrail/kubernetes/init.yml
@@ -19,7 +19,7 @@
kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
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/sl-os-contrail/openstack/init.yml b/classes/cluster/sl-os-contrail/openstack/init.yml
index c0667d3..ebaf4ae 100755
--- a/classes/cluster/sl-os-contrail/openstack/init.yml
+++ b/classes/cluster/sl-os-contrail/openstack/init.yml
@@ -48,6 +48,7 @@
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/iEDmHxnyjkA33EQC8
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
designate_pool_ns_records:
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
index ae7e8ec..564bad5 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/init.yml
@@ -51,6 +51,7 @@
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
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
index c1130e2..f577697 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
@@ -33,6 +33,7 @@
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
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 03d7636..0881c16 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -93,6 +93,7 @@
horizon_identity_encryption: none
horizon_identity_version: 2
horizon_identity_host: ${_param:single_address}
+ designate_admin_api_enabled: true
designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
designate_pool_target_type: bind9
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
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 66c3264..b2c99c8 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/kubernetes/init.yml
@@ -23,7 +23,7 @@
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
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 88e93e8..05b6ad7 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/kubernetes/init.yml
@@ -22,7 +22,7 @@
kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index d3f4430..9b47c2c 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -26,7 +26,7 @@
kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
index 59e2771..5d4def2 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/init.yml
@@ -28,7 +28,7 @@
kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
kubernetes_opencontrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.7.8-3
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.5-4
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/system b/classes/system
index 0a17807..3610852 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 0a17807f39aac95f9e0de8643f64e5116bdd1a1e
+Subproject commit 36108526bd13c5a90a5db63e4bb6b02e0e7a090c