diff --git a/manifests/site.pp b/manifests/site.pp index f7c7051bd6..1406ac0c1a 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -417,6 +417,7 @@ node 'devstack-launch01.slave.openstack.org' { jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'), jenkins_server => 'jenkins01.openstack.org', + jenkins_credentials_id => '8bcc2a78-0ce9-4383-aa14-039da7daf335', } } @@ -428,6 +429,7 @@ node 'devstack-launch02.slave.openstack.org' { jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'), jenkins_server => 'jenkins02.openstack.org', + jenkins_credentials_id => '8bcc2a78-0ce9-4383-aa14-039da7daf335', } } diff --git a/modules/openstack_project/manifests/devstack_launch_slave.pp b/modules/openstack_project/manifests/devstack_launch_slave.pp index dcf40a69a5..d4a4ed83a1 100644 --- a/modules/openstack_project/manifests/devstack_launch_slave.pp +++ b/modules/openstack_project/manifests/devstack_launch_slave.pp @@ -20,6 +20,7 @@ class openstack_project::devstack_launch_slave ( $jenkins_ssh_public_key, $jenkins_ssh_private_key, $jenkins_server, + $jenkins_credentials_id = '', ) { class { 'openstack_project::slave': diff --git a/modules/openstack_project/templates/devstack-gate-secure.conf.erb b/modules/openstack_project/templates/devstack-gate-secure.conf.erb index 09f8b5a0d2..ee824cbfb6 100644 --- a/modules/openstack_project/templates/devstack-gate-secure.conf.erb +++ b/modules/openstack_project/templates/devstack-gate-secure.conf.erb @@ -2,3 +2,6 @@ server=https://<%= jenkins_server %> user=<%= jenkins_api_user %> apikey=<%= jenkins_api_key %> +<% if jenkins_credentials_id != "" -%> +credentials_id=<%= jenkins_credentials_id %> +<% end -%>