Uncomment nodes in pike ssl
Change-Id: I48e9861b8ce81c7ddeeda06a35aa1690760a7515
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 a2e9e3a..23ea919 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
@@ -24,11 +24,6 @@
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
-# message_queue:
-# members:
-# - host: ${_param:openstack_control_node01_address}
-# - host: ${_param:openstack_control_node02_address}
-# - host: ${_param:openstack_control_node03_address}
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
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 b370655..e7f48a6 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -1,5 +1,4 @@
classes:
-#- system.salt.minion.ca.salt_master
- system.salt.minion.cert.proxy
- system.linux.system.lowmem
- system.linux.system.repo.mcp.apt_mirantis.glusterfs
@@ -42,7 +41,6 @@
- system.galera.server.database.nova
- system.galera.server.database.designate
- system.haproxy.proxy.listen.openstack.nova-placement
-- cluster.virtual-mcp-pike-dvr-ssl.openstack.dns
- cluster.virtual-mcp-pike-dvr-ssl
parameters:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/dns.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/dns.yml
index 8badcc2..cb61189 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/dns.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/dns.yml
@@ -25,11 +25,11 @@
package:
python-msgpack:
version: latest
-# network:
-# interface:
-# ens4:
-# enabled: true
-# type: eth
-# proto: static
-# address: ${_param:single_address}
-# netmask: 255.255.255.0
+ network:
+ interface:
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: 255.255.255.0
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 c3efc9a..94e135b 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
@@ -175,6 +175,8 @@
mongodb_admin_password: cloudlab
mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
ceilometer_influxdb_password: lmapass
+ openstack_log_appender: true
+ openstack_fluentd_handler_enabled: true
linux:
network:
purge_hosts: true