| commit | 93c89141f0a94bc6812907a6467bdc1d1dcdf19f | [log] [tgz] |
|---|---|---|
| author | Petr Jediny <pjediny@mirantis.com> | Thu Jun 07 13:42:30 2018 +0000 |
| committer | Gerrit Code Review <gerrit2@99e8dbefe3b7> | Thu Jun 07 13:42:30 2018 +0000 |
| tree | fd59e393ad9a00b1244cf5c30135be34cba180a1 | |
| parent | 1cee2a4f17787b45b876ff8e2015a363ee302b85 [diff] | |
| parent | ac98a67423b4fbc332d3682e283baf7fd2fd8ca0 [diff] |
Merge "Fix of K8s+OC4.0 virtual lab"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml index c7ec64a..7e74232 100644 --- a/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml +++ b/classes/cluster/virtual-mcp-pike-dvr-ceph-rgw/openstack/proxy.yml
@@ -9,6 +9,7 @@ parameters: _param: cluster_public_host: ${_param:openstack_proxy_address} + cluster_public_protocol: https nginx_proxy_ssl: enabled: true authority: ${_param:salt_minion_ca_authority}
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml index 72c44ce..97e56ec 100644 --- a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml +++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
@@ -8,6 +8,7 @@ parameters: _param: cluster_public_host: ${_param:openstack_proxy_address} + cluster_public_protocol: https nginx_proxy_ssl: enabled: true authority: ${_param:salt_minion_ca_authority}