commit 984d58500f12931888f77c8a7c75ecabe0ff02ca
author Oleksii Grudev <ogrudev@mirantis.com> Fri Oct 26 13:37:09 2018 +0300
committer sgarbuz <sgarbuz@mirantis.com> Tue Oct 30 16:11:01 2018 +0000
tree 22590cbd36480966f1c42168677dd88acdd2be3d
parent 3b6d9017f2d6fe0bd61cd4f9e2bbf555d0a459f1

Bump reclass AIO pike

Change-Id: I33f615733bd37e464792ae67fd096455c2ab61d3

classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml

diff --git a/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml
deleted file mode 100644
index 219ed8d..0000000
--- a/classes/cluster/virtual-mcp11-aio-ironic/infra/init.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-classes:
-  - cluster.virtual-mcp11-aio.infra

classes/cluster/virtual-mcp11-aio-ironic/init.yml

diff --git a/classes/cluster/virtual-mcp11-aio-ironic/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/init.yml
index 448fe80..56513f8 100755
--- a/classes/cluster/virtual-mcp11-aio-ironic/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-ironic/init.yml
@@ -1,5 +1,4 @@
 classes:
 - cluster.virtual-mcp11-aio
-- cluster.virtual-mcp11-aio-ironic.infra
 - cluster.virtual-mcp11-aio-ironic.openstack
 - cluster.overrides

classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml

diff --git a/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
index 0390924..b4ef9c4 100755
--- a/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-ironic/openstack/init.yml
@@ -43,7 +43,7 @@
       bind:
         address: 0.0.0.0
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
       database:
@@ -53,7 +53,7 @@
       api_url: http://${_param:single_baremetal_address}:6385
       http_url: http://${_param:single_baremetal_address}
       message_queue:
-        port: ${_param:rabbitmq_port}
+        port: ${_param:openstack_rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
       database: