Merge "Add update|hotfix repo classes" into release/2019.2.0
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index fcca6b6..fde1172 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -69,7 +69,7 @@
kubernetes_hyperkube_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/hyperkube-amd64:v1.12.3-2
kubernetes_calico_cni_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/cni:v3.3.2
kubernetes_calico_calicoctl_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/ctl:v3.3.2
- kubernetes_containerd_package: containerd.io=1.2.0-1
+ kubernetes_containerd_package: containerd.io=1.2.1-1~u16.04+mcp
kubernetes_metrics_server_image: ${_param:kubernetes_metrics_server_repo}/metrics-server-amd64:v0.3.1
kubernetes_opencontrail_controller_image: ${_param:kubernetes_contrail_registry}/opencontrail-controller:${_param:mcp_version}
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}'