From df6edc372af2a1096ac174123fc40909a234fff4 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 29 Jan 2019 15:20:00 -0800
Subject: [PATCH] Add http vhosts for zuul.o.o
We missed this when adding zuul.opendev.org. The old setup added vhosts
for port 80 and 443. Explicitly add these back in here.
Change-Id: I945d1d82da297a4fb643afc2513928268578a4f4
---
manifests/site.pp | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/manifests/site.pp b/manifests/site.pp
index 6deede3f2a..3d4da0d068 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -930,6 +930,22 @@ node /^zuul\d+\.open.*\.org$/ {
template => 'zuul/zuulv3.vhost.erb',
vhost_name => 'zuul.opendev.org',
},
+ 'zuul.openstack.org-http' => {
+ port => 80,
+ docroot => '/opt/zuul-web/content',
+ priority => '50',
+ ssl => false,
+ template => 'zuul/zuulv3.vhost.erb',
+ vhost_name => 'zuul.openstack.org',
+ },
+ 'zuul.opendev.org-http' => {
+ port => 80,
+ docroot => '/opt/zuul-web/content',
+ priority => '40',
+ ssl => false,
+ template => 'zuul/zuulv3.vhost.erb',
+ vhost_name => 'zuul.opendev.org',
+ },
},
vhosts_flags => {
'zuul.openstack.org' => {
@@ -940,6 +956,14 @@ node /^zuul\d+\.open.*\.org$/ {
tenant_name => '',
ssl => true,
},
+ 'zuul.openstack.org-http' => {
+ tenant_name => 'openstack',
+ ssl => false,
+ },
+ 'zuul.opendev.org-http' => {
+ tenant_name => '',
+ ssl => false,
+ },
},
vhosts_ssl => {
'zuul.openstack.org' => {