Custom Jenkins vhost

This allows the CI admin to access Jenkins
by externally resolvable name

Change-Id: I3dca0d048b5013398a3b91d9157eb3f02e5c5bb5

contrib/single_node_ci_data.yaml

@@ -4,6 +4,7 @@
 #vhost_name:
 project_config_repo: http://your-project-config-repo.example.com/project-config-example.git
 #serveradmin:
+#jenkins_vhost_name: jenkins
 #jenkins_username: jenkins
 #jenkins_password:
 jenkins_ssh_private_key: |

contrib/single_node_ci_site.pp

@@ -32,6 +32,7 @@ node default {
     vhost_name                  => $vhost_name,
     project_config_repo         => hiera('project_config_repo'),
     serveradmin                 => hiera('serveradmin', "webmaster@${vhost_name}"),
+    jenkins_vhost_name          => hiera('jenkins_vhost_name', 'jenkins'),
     jenkins_username            => hiera('jenkins_username', 'jenkins'),
     jenkins_password            => hiera('jenkins_password', 'XXX'),
     jenkins_ssh_private_key     => hiera('jenkins_ssh_private_key'),

manifests/single_node_ci.pp

@@ -35,6 +35,10 @@
 # [*serveradmin*]
 #  The e-mail address of the owner of the CI system
 #
+# [*jenkins_vhost_name*]
+#   This is the alternative hostname or FQDN to use by Jenkins.
+#   Don't use $vhost_name as it conflicts with zuul
+#
 # [*jenkins_username*]
 #    If you have Jenkins secured, this is the username Jenkins Job Builder
 #    will use to manage all Jenkins jobs. Otherwise the value is ignored.
@@ -143,6 +147,7 @@ class openstackci::single_node_ci (
   $project_config_repo           = undef,
 
   # Jenkins Configurations
+  $jenkins_vhost_name            = 'jenkins',
   $serveradmin                   = "webmaster@${vhost_name}",
   $jenkins_username              = 'jenkins',
   $jenkins_password              = undef,
@@ -176,8 +181,7 @@ class openstackci::single_node_ci (
 ) {
 
   class { '::openstackci::jenkins_master':
-    # Don't use $vhost_name as it conflicts with zuul
-    vhost_name              => 'jenkins',
+    vhost_name              => $jenkins_vhost_name,
     serveradmin             => $serveradmin,
     jenkins_ssh_private_key => $jenkins_ssh_private_key,
     jenkins_ssh_public_key  => $jenkins_ssh_public_key,