commit 4b2061170e182fcbb4a8159e21ea721f03d063e3
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Jul 16 18:30:33 2018 +0000
committer Gerrit Code Review <gerrit2@853267bf53e2> Mon Jul 16 18:30:33 2018 +0000
tree 41239e77922024df4803ab1ec119ab2f862847d1
parent 25c019b1eeef0e8c824228ecda4c9dbf21dc6554
parent 2c3e0f9c58389513e929654f6b91908f9a8f01fe

Merge "Disbale ssl on redirect"

classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml

diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
index eefbe5c..c9c41a8 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
@@ -265,6 +265,11 @@
         port: ${_param:rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
+      # Since we using self signed cert not present in images, we have to
+      # use insecure option when sending signal to wait condition from instance.
+      clients:
+        heat:
+          insecure: true
   neutron:
     server:
       bind:

classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml

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 599c443..418af10 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
@@ -86,3 +86,7 @@
         port: ${_param:rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
+  cinder:
+    volume:
+      glance:
+        protocol: "https"

classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml

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 26952e4..077e701 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -198,6 +198,11 @@
         port: ${_param:rabbitmq_port}
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
+      # Since we using self signed cert not present in images, we have to
+      # use insecure option when sending signal to wait condition from instance.
+      clients:
+        heat:
+          insecure: true
   neutron:
     server:
       bind:

classes/cluster/virtual-offline-ssl/openstack/control.yml

diff --git a/classes/cluster/virtual-offline-ssl/openstack/control.yml b/classes/cluster/virtual-offline-ssl/openstack/control.yml
index f2bddcc..c085eab 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/control.yml
@@ -223,6 +223,11 @@
           address: 127.0.0.1
       identity:
         protocol: https
+      # Since we using self signed cert not present in images, we have to
+      # use insecure option when sending signal to wait condition from instance.
+      clients:
+        heat:
+          insecure: true
   neutron:
     server:
       bind: