Merge "Use system level for etcd instead of service"
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
index e9cd961..fa9a04d 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
@@ -60,6 +60,8 @@
- 172.18.208.44
- 172.18.176.4
- 10.254.0.10
+ search:
+ - ${_param:cluster_domain}
interface:
ens3:
enabled: true
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index 92e7a25..f31efab 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -54,6 +54,8 @@
- 172.18.208.44
- 172.18.176.4
- 10.254.0.10
+ search:
+ - ${_param:cluster_domain}
interface:
ens3:
enabled: true
diff --git a/classes/cluster/os-ha-contrail-40/openstack/compute.yml b/classes/cluster/os-ha-contrail-40/openstack/compute.yml
index b30902b..4dc427e 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/compute.yml
@@ -66,6 +66,7 @@
topics: "notifications"
notify_on:
state_change: vm_and_task_state
+ networking: contrail
opencontrail:
common:
network:
diff --git a/classes/cluster/os-ha-contrail-40/openstack/control.yml b/classes/cluster/os-ha-contrail-40/openstack/control.yml
index d5105fd..424e2bf 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/control.yml
@@ -11,11 +11,9 @@
- system.keystone.server.wsgi
- system.keystone.server.cluster
- system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
- system.glusterfs.server.cluster
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
- system.glance.control.cluster
- system.nova.control.cluster
- system.neutron.control.opencontrail.cluster
diff --git a/classes/cluster/os-ha-contrail/openstack/compute.yml b/classes/cluster/os-ha-contrail/openstack/compute.yml
index 1d2b5e0..0467c74 100755
--- a/classes/cluster/os-ha-contrail/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail/openstack/compute.yml
@@ -68,6 +68,7 @@
topics: "notifications"
notify_on:
state_change: vm_and_task_state
+ networking: contrail
opencontrail:
common:
network:
diff --git a/classes/cluster/os-ha-contrail/openstack/control.yml b/classes/cluster/os-ha-contrail/openstack/control.yml
index 7aea4e5..51bf18d 100755
--- a/classes/cluster/os-ha-contrail/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail/openstack/control.yml
@@ -11,11 +11,9 @@
- system.keystone.server.wsgi
- system.keystone.server.cluster
- system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
- system.glusterfs.server.cluster
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
- system.glance.control.cluster
- system.nova.control.cluster
- system.neutron.control.opencontrail.cluster
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index bdb4290..2001099 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -58,6 +58,8 @@
- 172.18.208.44
- 172.18.176.4
- 10.254.0.10
+ search:
+ - ${_param:cluster_domain}
interface:
ens3:
enabled: true
diff --git a/classes/cluster/sl-os-contrail/openstack/compute.yml b/classes/cluster/sl-os-contrail/openstack/compute.yml
index c523b7c..0da8728 100755
--- a/classes/cluster/sl-os-contrail/openstack/compute.yml
+++ b/classes/cluster/sl-os-contrail/openstack/compute.yml
@@ -59,6 +59,7 @@
topics: "notifications,${_param:stacklight_notification_topic}"
notify_on:
state_change: vm_and_task_state
+ networking: contrail
ceilometer:
agent:
message_queue:
diff --git a/classes/cluster/sl-os-contrail/openstack/control.yml b/classes/cluster/sl-os-contrail/openstack/control.yml
index cce2588..bfeb04a 100755
--- a/classes/cluster/sl-os-contrail/openstack/control.yml
+++ b/classes/cluster/sl-os-contrail/openstack/control.yml
@@ -11,11 +11,9 @@
- system.keystone.server.wsgi
- system.keystone.server.cluster
- system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
- system.glusterfs.server.cluster
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
- system.glance.control.cluster
- system.nova.control.cluster
- system.haproxy.proxy.listen.openstack.nova-placement
diff --git a/classes/cluster/sl-os-ovs/openstack/control.yml b/classes/cluster/sl-os-ovs/openstack/control.yml
index b5746f3..507b315 100644
--- a/classes/cluster/sl-os-ovs/openstack/control.yml
+++ b/classes/cluster/sl-os-ovs/openstack/control.yml
@@ -11,9 +11,7 @@
- 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
diff --git a/classes/cluster/sl-pike-dvr/openstack/control.yml b/classes/cluster/sl-pike-dvr/openstack/control.yml
index d4daf0d..f0ac140 100644
--- a/classes/cluster/sl-pike-dvr/openstack/control.yml
+++ b/classes/cluster/sl-pike-dvr/openstack/control.yml
@@ -11,9 +11,7 @@
- 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
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
index fc50e87..c890a9d 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
@@ -12,9 +12,7 @@
- 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
@@ -158,4 +156,4 @@
quota:
zones: ${_param:designate_quota_zones}
worker:
- enabled: ${_param:designate_worker_enabled}
\ No newline at end of file
+ enabled: ${_param:designate_worker_enabled}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
index e0ba2ce..1b21c5f 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
@@ -12,9 +12,7 @@
- system.keystone.server.cluster
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
- system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
- system.glusterfs.server.cluster
- system.glance.control.cluster
- system.heka.ceilometer_collector.single
@@ -154,4 +152,4 @@
quota:
zones: ${_param:designate_quota_zones}
worker:
- enabled: ${_param:designate_worker_enabled}
\ No newline at end of file
+ enabled: ${_param:designate_worker_enabled}
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
index 708b627..958e72d 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
@@ -23,9 +23,7 @@
- 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
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index 7b750a0..4d44545 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -22,9 +22,7 @@
- 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
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
index 53b8c95..3099dc2 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
@@ -12,9 +12,7 @@
- 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.volume.backup
- system.glusterfs.server.cluster
- system.glance.control.cluster
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index fc73a24..217fa17 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -12,9 +12,7 @@
- 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.volume.backup
- system.glusterfs.server.cluster
- system.glance.control.cluster
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index 0c78e8d..636f1e1 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -54,6 +54,8 @@
- 172.18.208.44
- 172.18.176.4
- 10.254.0.10
+ search:
+ - ${_param:cluster_domain}
interface:
ens3:
enabled: true
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
index 5c41cab..e8b5cd4 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
@@ -12,9 +12,7 @@
- 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.volume.backup
- system.glusterfs.server.cluster
- system.glusterfs.server.volume.aptly
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
index e7d4084..5fdb7da 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
@@ -12,9 +12,7 @@
- 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
diff --git a/classes/cluster/virtual-offline-ssl/openstack/control.yml b/classes/cluster/virtual-offline-ssl/openstack/control.yml
index 1889149..3646709 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/control.yml
@@ -21,9 +21,7 @@
- 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