Merge "Adding env files to deploy required salt formulas"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
index 146bbac..089a3cd 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
@@ -17,6 +17,15 @@
external_interface: ens6
interface_mtu: 1500
linux_system_codename: xenial
+ linux:
+ network:
+ interface:
+ primary_interface:
+ ipflush_onchange: true
+ tenant_interface:
+ ipflush_onchange: true
+ external_interface:
+ ipflush_onchange: true
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
@@ -32,4 +41,4 @@
compute:
notification:
driver: messagingv2
- topics: "notifications"
\ No newline at end of file
+ topics: "notifications"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml
index 8487021..5dbb948 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml
@@ -19,3 +19,12 @@
notification:
driver: messagingv2
topics: "notifications"
+ linux:
+ network:
+ interface:
+ primary_interface:
+ ipflush_onchange: true
+ tenant_interface:
+ ipflush_onchange: true
+ external_interface:
+ ipflush_onchange: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
index 49644e2..deeb36d 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
@@ -30,3 +30,12 @@
notification:
driver: messagingv2
topics: "notifications"
+ linux:
+ network:
+ interface:
+ primary_interface:
+ ipflush_onchange: true
+ tenant_interface:
+ ipflush_onchange: true
+ external_interface:
+ ipflush_onchange: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
index 6c9f58d..625e906 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
@@ -75,9 +75,6 @@
domain_id: ${_param:designate_domain_id}
version: ${_param:designate_version}
backend:
- bind9:
- rndc_key: ${_param:designate_bind9_rndc_key}
- rndc_algorithm: ${_param:designate_bind9_rndc_algorithm}
pdns4:
api_token: ${_param:designate_pdns_api_key}
api_endpoint: ${_param:designate_pdns_api_endpoint}
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml
index 586579c..6ed3f45 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/gateway.yml
@@ -19,3 +19,12 @@
notification:
driver: messagingv2
topics: "notifications"
+ linux:
+ network:
+ interface:
+ primary_interface:
+ ipflush_onchange: true
+ tenant_interface:
+ ipflush_onchange: true
+ external_interface:
+ ipflush_onchange: true
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
index 31c7a69..bcda365 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
@@ -100,8 +100,6 @@
designate_domain_id: 5186883b-91fb-4891-bd49-e6769234a8fc
designate_mdns_address: 0.0.0.0
designate_mdns_port: 53
- designate_bind9_rndc_key: 4pc+X4PDqb2q+5o72dISm72LM1Ds9X2EYZjqg+nmsS7FhdTwzFFY8l/iEDmHxnyjkA33EQC8
- designate_bind9_rndc_algorithm: hmac-sha512
designate_pdns_api_key: VxK9cMlFL5Ae
designate_pdns_api_endpoint: "http://${_param:openstack_dns_node01_address}:${_param:powerdns_webserver_port}"
designate_pool_manager_enabled: True