diff --git a/contrib/single_node_ci_data.yaml b/contrib/single_node_ci_data.yaml index 245a929..92abf75 100644 --- a/contrib/single_node_ci_data.yaml +++ b/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: | diff --git a/contrib/single_node_ci_site.pp b/contrib/single_node_ci_site.pp index f38abee..2c2f834 100644 --- a/contrib/single_node_ci_site.pp +++ b/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'), diff --git a/manifests/single_node_ci.pp b/manifests/single_node_ci.pp index 3941930..7d91375 100644 --- a/manifests/single_node_ci.pp +++ b/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, @@ -178,8 +183,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,