6 files changed, 72 insertions, 37 deletions
diff --git a/mcp/patches/0001-Disable-root_helper_daemon-option.patch b/mcp/patches/0001-Disable-root_helper_daemon-option.patch
new file mode 100644
index 000000000..389393975
--- /dev/null
+++ b/mcp/patches/0001-Disable-root_helper_daemon-option.patch
@@ -0,0 +1,40 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Michael Polenchuk <mpolenchuk@mirantis.com>
+Date: Tue, 6 Mar 2018 16:15:57 +0400
+Subject: [PATCH] Disable root_helper_daemon option
+
+Change-Id: I4cc6cce4868ea95e806ce4b41069805fb995dcdb
+
+diff --git a/neutron/files/pike/neutron-generic.conf.Debian b/neutron/files/pike/neutron-generic.conf.Debian
+index a94a24b..bec041f 100644
+--- a/neutron/files/pike/neutron-generic.conf.Debian
++++ b/neutron/files/pike/neutron-generic.conf.Debian
+@@ -668,7 +668,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+ # needs to execute commands in Dom0 in the hypervisor of XenServer, this item
+ # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session
+ # to pass commands to Dom0. (string value)
+-root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf
++#root_helper_daemon = <None>
+
+ # Seconds between nodes reporting state to server; should be less than
+ # agent_down_time, best if it is half or less than agent_down_time. (floating
+diff --git a/neutron/files/pike/neutron-server.conf.Debian b/neutron/files/pike/neutron-server.conf.Debian
+index 2daaebf..c9554c8 100644
+--- a/neutron/files/pike/neutron-server.conf.Debian
++++ b/neutron/files/pike/neutron-server.conf.Debian
+@@ -717,7 +717,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+ # needs to execute commands in Dom0 in the hypervisor of XenServer, this item
+ # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session
+ # to pass commands to Dom0. (string value)
+-root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf
++#root_helper_daemon = <None>
+
+ # Seconds between nodes reporting state to server; should be less than
+ # agent_down_time, best if it is half or less than agent_down_time. (floating
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index e0ad1f704..d1cd1b5b9 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -5,6 +5,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+/usr/share/salt-formulas/env: 0001-Disable-root_helper_daemon-option.patch
 /usr/share/salt-formulas/env: 0002-maas-region-skip-credentials-update.patch
 /usr/share/salt-formulas/env: 0003-maas-region-force-artifact-download.patch
 /usr/share/salt-formulas/env: 0004-network.dpdk-Move-ifcfg-br-prv-to-interfaces.u.patch
diff --git a/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch b/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch
new file mode 100644
index 000000000..ab818df70
--- /dev/null
+++ b/mcp/patches/reclass-system-salt-model/0001-ceilometer-server-publisher-Add-enabled-default.patch
@@ -0,0 +1,31 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Tue, 6 Mar 2018 22:40:06 +0100
+Subject: [PATCH] ceilometer:server:publisher: Add 'enabled' default
+
+Fixes: #306
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ ceilometer/server/cluster.yml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
+index 11488fb..2d19e31 100644
+--- a/ceilometer/server/cluster.yml
++++ b/ceilometer/server/cluster.yml
+@@ -14,6 +14,7 @@ parameters:
+       ttl: 86400
+       publisher:
+         default:
++          enabled: false
+       bind:
+         host: ${_param:cluster_local_address}
+         port: 8777
diff --git a/mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch b/mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch
index b22951a8f..b22951a8f 100644
--- a/mcp/patches/reclass-system-salt-model/0003-Use-keystone-v3-endpoints-by-default.patch
+++ b/mcp/patches/reclass-system-salt-model/0002-Use-keystone-v3-endpoints-by-default.patch
diff --git a/mcp/patches/reclass-system-salt-model/0002-mongodb-Parameterize-cluster-hostnames.patch b/mcp/patches/reclass-system-salt-model/0002-mongodb-Parameterize-cluster-hostnames.patch
deleted file mode 100644
index e77496001..000000000
--- a/mcp/patches/reclass-system-salt-model/0002-mongodb-Parameterize-cluster-hostnames.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Mirantis Inc., Enea AB and others.
-:
-: All rights reserved. This program and the accompanying materials
-: are made available under the terms of the Apache License, Version 2.0
-: which accompanies this distribution, and is available at
-: http://www.apache.org/licenses/LICENSE-2.0
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sun, 10 Dec 2017 21:58:52 +0100
-Subject: [PATCH] mongodb: Parameterize cluster hostnames
-
-Replace mdb{01,02,03} with reclass params, similar to prev commit.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- mongodb/server/cluster.yml | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mongodb/server/cluster.yml b/mongodb/server/cluster.yml
-index f3c16d6..1d1e397 100644
---- a/mongodb/server/cluster.yml
-+++ b/mongodb/server/cluster.yml
-@@ -3,9 +3,9 @@ classes:
- parameters:
-   _param:
-     mongodb_server_replica_set: mongodb
--    mongodb_master: mdb01
-+    mongodb_master: ${_param:openstack_telemetry_node01_hostname}
-     mongodb_server_members:
--    - host: mdb01
-+    - host: ${_param:openstack_telemetry_node01_hostname}
-       priority: 2
--    - host: mdb02
--    - host: mdb03
-+    - host: ${_param:openstack_telemetry_node02_hostname}
-+    - host: ${_param:openstack_telemetry_node03_hostname}
diff --git a/mcp/patches/reclass-system-salt-model/0004-Revert-Admin-endpoint-for-keystone-v3.patch b/mcp/patches/reclass-system-salt-model/0003-Revert-Admin-endpoint-for-keystone-v3.patch
index d0ddc58c2..d0ddc58c2 100644
--- a/mcp/patches/reclass-system-salt-model/0004-Revert-Admin-endpoint-for-keystone-v3.patch
+++ b/mcp/patches/reclass-system-salt-model/0003-Revert-Admin-endpoint-for-keystone-v3.patch