Merge "Custom Jenkins vhost"
This commit is contained in:
commit
f7477c79df
|
@ -4,6 +4,7 @@
|
||||||
#vhost_name:
|
#vhost_name:
|
||||||
project_config_repo: http://your-project-config-repo.example.com/project-config-example.git
|
project_config_repo: http://your-project-config-repo.example.com/project-config-example.git
|
||||||
#serveradmin:
|
#serveradmin:
|
||||||
|
#jenkins_vhost_name: jenkins
|
||||||
#jenkins_username: jenkins
|
#jenkins_username: jenkins
|
||||||
#jenkins_password:
|
#jenkins_password:
|
||||||
jenkins_ssh_private_key: |
|
jenkins_ssh_private_key: |
|
||||||
|
|
|
@ -32,6 +32,7 @@ node default {
|
||||||
vhost_name => $vhost_name,
|
vhost_name => $vhost_name,
|
||||||
project_config_repo => hiera('project_config_repo'),
|
project_config_repo => hiera('project_config_repo'),
|
||||||
serveradmin => hiera('serveradmin', "webmaster@${vhost_name}"),
|
serveradmin => hiera('serveradmin', "webmaster@${vhost_name}"),
|
||||||
|
jenkins_vhost_name => hiera('jenkins_vhost_name', 'jenkins'),
|
||||||
jenkins_username => hiera('jenkins_username', 'jenkins'),
|
jenkins_username => hiera('jenkins_username', 'jenkins'),
|
||||||
jenkins_password => hiera('jenkins_password', 'XXX'),
|
jenkins_password => hiera('jenkins_password', 'XXX'),
|
||||||
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key'),
|
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key'),
|
||||||
|
|
|
@ -35,6 +35,10 @@
|
||||||
# [*serveradmin*]
|
# [*serveradmin*]
|
||||||
# The e-mail address of the owner of the CI system
|
# 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*]
|
# [*jenkins_username*]
|
||||||
# If you have Jenkins secured, this is the username Jenkins Job Builder
|
# If you have Jenkins secured, this is the username Jenkins Job Builder
|
||||||
# will use to manage all Jenkins jobs. Otherwise the value is ignored.
|
# 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,
|
$project_config_repo = undef,
|
||||||
|
|
||||||
# Jenkins Configurations
|
# Jenkins Configurations
|
||||||
|
$jenkins_vhost_name = 'jenkins',
|
||||||
$serveradmin = "webmaster@${vhost_name}",
|
$serveradmin = "webmaster@${vhost_name}",
|
||||||
$jenkins_username = 'jenkins',
|
$jenkins_username = 'jenkins',
|
||||||
$jenkins_password = undef,
|
$jenkins_password = undef,
|
||||||
|
@ -178,8 +183,7 @@ class openstackci::single_node_ci (
|
||||||
) {
|
) {
|
||||||
|
|
||||||
class { '::openstackci::jenkins_master':
|
class { '::openstackci::jenkins_master':
|
||||||
# Don't use $vhost_name as it conflicts with zuul
|
vhost_name => $jenkins_vhost_name,
|
||||||
vhost_name => 'jenkins',
|
|
||||||
serveradmin => $serveradmin,
|
serveradmin => $serveradmin,
|
||||||
jenkins_ssh_private_key => $jenkins_ssh_private_key,
|
jenkins_ssh_private_key => $jenkins_ssh_private_key,
|
||||||
jenkins_ssh_public_key => $jenkins_ssh_public_key,
|
jenkins_ssh_public_key => $jenkins_ssh_public_key,
|
||||||
|
|
Loading…
Reference in New Issue