Merge "Return missed salt master class in drivetrain_ha"
diff --git a/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml b/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml
index e637c3f..c60131d 100644
--- a/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico-cloudprovider/infra/init.yml
@@ -11,8 +11,8 @@
infra_config_address: 172.16.10.100
infra_config_deploy_address: 192.168.10.100
- cluster_domain: virtual-mcp11-k8s-calico.local
- cluster_name: virtual-mcp11-k8s-calico
+ cluster_domain: k8s-ha-calico-cloudprovider.local
+ cluster_name: k8s-ha-calico-cloudprovider
apt_mk_version: nightly
primary_interface: ens3
linux:
diff --git a/classes/cluster/k8s-ha-calico-syndic/infra/init.yml b/classes/cluster/k8s-ha-calico-syndic/infra/init.yml
index d91fab5..3637d1d 100644
--- a/classes/cluster/k8s-ha-calico-syndic/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/infra/init.yml
@@ -12,8 +12,8 @@
infra_config_deploy_address: 192.168.10.90
salt_syndic_master_address: 192.168.10.90
- cluster_domain: virtual-mcp11-k8s-calico.local
- cluster_name: virtual-mcp11-k8s-calico
+ cluster_domain: k8s-ha-calico-syndic.local
+ cluster_name: k8s-ha-calico-syndic
apt_mk_version: nightly
primary_interface: ens3
linux:
diff --git a/classes/cluster/k8s-ha-calico/infra/init.yml b/classes/cluster/k8s-ha-calico/infra/init.yml
index 1ead07a..e1576a8 100644
--- a/classes/cluster/k8s-ha-calico/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico/infra/init.yml
@@ -11,8 +11,8 @@
infra_config_address: 172.16.10.100
infra_config_deploy_address: 192.168.10.90
- cluster_domain: virtual-mcp11-k8s-calico.local
- cluster_name: virtual-mcp11-k8s-calico
+ cluster_domain: k8s-ha-calico.local
+ cluster_name: k8s-ha-calico
apt_mk_version: nightly
primary_interface: ens3
linux:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
index 81d89f7..521071a 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
@@ -110,6 +110,8 @@
rndc_key_file: /etc/designate/rndc.key
worker:
enabled: ${_param:designate_worker_enabled}
+ quota:
+ zones: ${_param:designate_quota_zones}
glance:
server:
storage:
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
index b564e0b..c1130e2 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
@@ -35,6 +35,7 @@
rabbitmq_cold_password: workshop
designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8H+z0fLLBunoitw==
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
+ designate_quota_zones: 40
designate_pool_ns_records:
- hostname: 'ns1.example.org.'
priority: 10