Override redirect host for openstack_web
Change-Id: Ib3030ac1c9136a83d4e23fbe63b0e2a791f5e49b
diff --git a/classes/cluster/os-aio-contrail/openstack/proxy.yml b/classes/cluster/os-aio-contrail/openstack/proxy.yml
index c0688c2..1d61a39 100755
--- a/classes/cluster/os-aio-contrail/openstack/proxy.yml
+++ b/classes/cluster/os-aio-contrail/openstack/proxy.yml
@@ -15,3 +15,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/os-aio-ovs/openstack/proxy.yml b/classes/cluster/os-aio-ovs/openstack/proxy.yml
index 142a984..cd409a4 100644
--- a/classes/cluster/os-aio-ovs/openstack/proxy.yml
+++ b/classes/cluster/os-aio-ovs/openstack/proxy.yml
@@ -14,3 +14,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/os-ha-contrail-40/openstack/proxy.yml b/classes/cluster/os-ha-contrail-40/openstack/proxy.yml
index cb9aff6..aeb0bb7 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/proxy.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/proxy.yml
@@ -15,3 +15,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/proxy.yml b/classes/cluster/os-ha-contrail-ironic/openstack/proxy.yml
index f31a4fe..e402994 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/proxy.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/proxy.yml
@@ -15,3 +15,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/os-ha-contrail/openstack/proxy.yml b/classes/cluster/os-ha-contrail/openstack/proxy.yml
index f3dc4f1..9521511 100755
--- a/classes/cluster/os-ha-contrail/openstack/proxy.yml
+++ b/classes/cluster/os-ha-contrail/openstack/proxy.yml
@@ -17,3 +17,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/os-ha-ovs-ceph/openstack/proxy.yml b/classes/cluster/os-ha-ovs-ceph/openstack/proxy.yml
index a34bc1b..67badc5 100644
--- a/classes/cluster/os-ha-ovs-ceph/openstack/proxy.yml
+++ b/classes/cluster/os-ha-ovs-ceph/openstack/proxy.yml
@@ -14,3 +14,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/proxy.yml b/classes/cluster/os-ha-ovs-pike/openstack/proxy.yml
index ead28d0..31b3ab6 100644
--- a/classes/cluster/os-ha-ovs-pike/openstack/proxy.yml
+++ b/classes/cluster/os-ha-ovs-pike/openstack/proxy.yml
@@ -15,3 +15,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${linux:system:domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/os-ha-ovs-syndic/openstack/proxy.yml b/classes/cluster/os-ha-ovs-syndic/openstack/proxy.yml
index 9469837..09e5fe9 100644
--- a/classes/cluster/os-ha-ovs-syndic/openstack/proxy.yml
+++ b/classes/cluster/os-ha-ovs-syndic/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/os-ha-ovs/openstack/proxy.yml b/classes/cluster/os-ha-ovs/openstack/proxy.yml
index 3f32322..6ffbf34 100644
--- a/classes/cluster/os-ha-ovs/openstack/proxy.yml
+++ b/classes/cluster/os-ha-ovs/openstack/proxy.yml
@@ -15,3 +15,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${linux:system:domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/sl-os-contrail/openstack/proxy.yml b/classes/cluster/sl-os-contrail/openstack/proxy.yml
index d517b17..a7d3fb5 100755
--- a/classes/cluster/sl-os-contrail/openstack/proxy.yml
+++ b/classes/cluster/sl-os-contrail/openstack/proxy.yml
@@ -15,3 +15,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/sl-os-ovs/openstack/proxy.yml b/classes/cluster/sl-os-ovs/openstack/proxy.yml
index c40845b..e4132a2 100644
--- a/classes/cluster/sl-os-ovs/openstack/proxy.yml
+++ b/classes/cluster/sl-os-ovs/openstack/proxy.yml
@@ -13,3 +13,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/sl-pike-dvr/openstack/proxy.yml b/classes/cluster/sl-pike-dvr/openstack/proxy.yml
index 507d1e5..8b75dd7 100644
--- a/classes/cluster/sl-pike-dvr/openstack/proxy.yml
+++ b/classes/cluster/sl-pike-dvr/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml
index 1aaf437..50d564a 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/proxy.yml
index 149abc1..4d32753 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml
index 64f6c6a..cfe273e 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/proxy.yml
index 1354e85..98cc9a0 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-newton-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp-newton-dvr/openstack/proxy.yml
index 03d3685..170aea0 100644
--- a/classes/cluster/virtual-mcp-newton-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-newton-dvr/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-newton-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp-newton-ovs/openstack/proxy.yml
index d5b6ba6..834a475 100644
--- a/classes/cluster/virtual-mcp-newton-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-newton-ovs/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/proxy.yml
index 1f7a6ca..bcf9f77 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr-ceph-local/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-dvr/openstack/proxy.yml
index 66e2ae6..4f0cb81 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/proxy.yml
index 64a1e0e..6d64763 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph-local/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/proxy.yml
index 92a4c1b..cd0e7a0 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs-ceph/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml
index 93bfd56..9123a18 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
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 088af83..73ac124 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
@@ -13,4 +13,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
index 69159d4..fe85d74 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/proxy.yml
@@ -14,3 +14,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${linux:system:domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
index 0abc6b8..1a50bb6 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/proxy.yml
@@ -14,3 +14,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${linux:system:domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml
index d6ea854..dd30f35 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/proxy.yml
@@ -14,3 +14,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
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 00eb616..f5d61c6 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
index 83edc51..2305418 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/proxy.yml
@@ -14,3 +14,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp05-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp05-dvr/openstack/proxy.yml
index 3c03b07..391f22d 100644
--- a/classes/cluster/virtual-mcp05-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp05-dvr/openstack/proxy.yml
@@ -13,3 +13,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp05-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp05-ovs/openstack/proxy.yml
index fdfd00e..0369787 100644
--- a/classes/cluster/virtual-mcp05-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp05-ovs/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml b/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml
index 3c3838a..8b85a6c 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/proxy.yml
@@ -15,6 +15,12 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp10-dvr/openstack/proxy.yml
index 600819d..2fbbbbd 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/proxy.yml
@@ -13,6 +13,12 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp10-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp10-ovs/openstack/proxy.yml
index 8916abc..43741cd 100644
--- a/classes/cluster/virtual-mcp10-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp10-ovs/openstack/proxy.yml
@@ -13,6 +13,12 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
linux:
system:
package:
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/proxy.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/proxy.yml
index 85377e2..360979b 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/proxy.yml
@@ -15,3 +15,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/proxy.yml b/classes/cluster/virtual-mcp11-contrail/openstack/proxy.yml
index 690389b..0422b38 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/proxy.yml
@@ -15,3 +15,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/proxy.yml b/classes/cluster/virtual-mcp11-dvr/openstack/proxy.yml
index cd7bbd6..2ce252d 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/proxy.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/proxy.yml
index be66fa7..c12de32 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/proxy.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/proxy.yml
index eb1e5d4..31f80f3 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/proxy.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/proxy.yml
index cff2a88..4025d89 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/proxy.yml b/classes/cluster/virtual-mcp11-ovs/openstack/proxy.yml
index 1943969..77365d5 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml
index fe5783a..5f0be4a 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
index e055dee..c7e4e56 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/proxy.yml
@@ -12,4 +12,10 @@
authority: ${_param:salt_minion_ca_authority}
engine: salt
mode: secure
- salt_minion_ca_host: cfg01.${_param:cluster_domain}
\ No newline at end of file
+ salt_minion_ca_host: cfg01.${_param:cluster_domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"
diff --git a/classes/cluster/virtual-offline-ssl/openstack/proxy.yml b/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
index bea4384..59b941d 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/proxy.yml
@@ -14,3 +14,9 @@
engine: salt
mode: secure
salt_minion_ca_host: cfg01.${linux:system:domain}
+ nginx:
+ server:
+ site:
+ nginx_ssl_redirect_openstack_web:
+ host:
+ name: "$host"