commit cd4fa2ca1f45a83bced11261e28ad4d13b6897d8
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Jan 10 15:33:31 2019 +0000
committer Gerrit Code Review <mail@domain.com> Thu Jan 10 15:33:31 2019 +0000
tree 30cc137e18871ca7fb6ccd5c0d2852fa831ea09c
parent 9459cfdbec3024480c9f5da700099eb9d9f465ca
parent b948c1d00af30a28e3246cb4a8ef0c74b6632807

Merge "Add Oleksiy Petrenko to team"

linux/system/repo/mcp/apt_mirantis/update/init.yml

diff --git a/linux/system/repo/mcp/apt_mirantis/update/init.yml b/linux/system/repo/mcp/apt_mirantis/update/init.yml
index 167f896..5897657 100644
--- a/linux/system/repo/mcp/apt_mirantis/update/init.yml
+++ b/linux/system/repo/mcp/apt_mirantis/update/init.yml
@@ -1,2 +1,5 @@
 classes:
+- system.linux.system.repo.mcp.apt_mirantis.update.extra
+- system.linux.system.repo.mcp.apt_mirantis.update.percona
+- system.linux.system.repo.mcp.apt_mirantis.update.saltstack
 - system.linux.system.repo.mcp.apt_mirantis.update.ubuntu

rabbitmq/server/vhost/openstack/init.yml

diff --git a/rabbitmq/server/vhost/openstack.yml b/rabbitmq/server/vhost/openstack/init.yml
similarity index 84%
rename from rabbitmq/server/vhost/openstack.yml
rename to rabbitmq/server/vhost/openstack/init.yml
index 4320919..7aa23f7 100644
--- a/rabbitmq/server/vhost/openstack.yml
+++ b/rabbitmq/server/vhost/openstack/init.yml
@@ -22,6 +22,3 @@
             pattern: '^metering.sample$'
             definition: '{"ha-mode": "all", "message-ttl": ${_param:rabbitmq_ceilometer_ttl}}'
             priority: 10
-          - name: HA
-            pattern: '^(?!amq\.).*'
-            definition: '{"ha-mode": "all", "message-ttl": 120000}'