| commit | 29655170f61cbd26fa93c5b1198b13a11f5538c3 | [log] [tgz] |
|---|---|---|
| author | mcp-jenkins <mcp-jenkins@mirantis.com> | Fri Jul 13 20:19:04 2018 +0000 |
| committer | Gerrit Code Review <gerrit2@853267bf53e2> | Fri Jul 13 20:19:04 2018 +0000 |
| tree | 64a07f16b9937c19165b3e91cbeea7c8ca5b2493 | |
| parent | f934006b99353ea6f7191647cd24e0ce651fd3a5 [diff] | |
| parent | a4d20bceedac464a278b800d23a806c4b0aa8250 [diff] |
Merge "Set correct identity protocol for ceilometer agent"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml index 95ecbd3..689b17f 100644 --- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml +++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
@@ -28,6 +28,8 @@ port: ${_param:rabbitmq_port} ssl: enabled: ${_param:rabbitmq_ssl_enabled} + identity: + protocol: https nova: compute: vncproxy_url: http://${_param:cluster_vip_address}:6080
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 a1a1418..4a7632b 100644 --- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml +++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/compute.yml
@@ -37,6 +37,8 @@ port: ${_param:rabbitmq_port} ssl: enabled: ${_param:rabbitmq_ssl_enabled} + identity: + protocol: https nova: compute: vncproxy_url: http://${_param:cluster_vip_address}:6080