opendev/system-config
Code Issues Proposed changes

Add devstack-gate-secure.conf.

Browse Source 
This file exists on the jenkins master but is not managed by puppet.
Put it on the new devstack-launch slave, under puppet control.

Rename the apikey hieradata variable that zuul uses to be more
generic since the same key is used by multiple projects.

Add the username portion of that to hiera as well to make the
hieradata file more self-documenting and easier to maintain, even
though it's not strictly secret.

The new values have been added to hiera.

Change-Id: I0af634d091577236a81feefddada63feacf3e2bc
Reviewed-on: https://review.openstack.org/23740
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2013-03-06 13:12:20 -08:00 committed by Jenkins
parent e6b82fc88c
commit fafffb6547
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/site.pp
View File

@ -206,8 +206,8 @@ node 'zuul.openstack.org' {
class { 'openstack_project::zuul': class { 'openstack_project::zuul':
jenkins_host => 'jenkins.openstack.org', jenkins_host => 'jenkins.openstack.org',
jenkins_url => 'https://jenkins.openstack.org', jenkins_url => 'https://jenkins.openstack.org',
jenkins_user => 'hudson-openstack', jenkins_user => hiera('jenkins_api_user'),
jenkins_apikey => hiera('zuul_jenkins_apikey'), jenkins_apikey => hiera('jenkins_api_key'),
gerrit_server => 'review.openstack.org', gerrit_server => 'review.openstack.org',
gerrit_user => 'jenkins', gerrit_user => 'jenkins',
zuul_ssh_private_key => hiera('jenkins_ssh_private_key_contents'), zuul_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
@ -233,6 +233,8 @@ node /^ci-backup-.*\.openstack\.org$/ {
node 'devstack-launch.slave.openstack.org' { node 'devstack-launch.slave.openstack.org' {
class { 'openstack_project::devstack_launch_slave': class { 'openstack_project::devstack_launch_slave':
jenkins_api_user => hiera('jenkins_api_user'),
jenkins_api_key => hiera('jenkins_api_key')
} }
} }

27
modules/openstack_project/manifests/devstack_launch_slave.pp
View File

@ -1,6 +1,22 @@
# == Class: openstack_project::devstack_launch_slave # Copyright 2013 OpenStack Foundation
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# Install a host that manages the devstack node pool.
class openstack_project::devstack_launch_slave ( class openstack_project::devstack_launch_slave (
$jenkins_api_user,
$jenkins_api_key
) { ) {
class { 'openstack_project::slave': class { 'openstack_project::slave':
@ -12,4 +28,13 @@ class openstack_project::devstack_launch_slave (
provider => pip, provider => pip,
require => Class['pip'], require => Class['pip'],
} }
file { '/home/jenkins/devstack-gate-secure.conf':
ensure => present,
owner => 'jenkins',
group => 'jenkins',
mode => '0600',
content => template('openstack_project/devstack-gate-secure.erb'),
require => File['/home/jenkins'],
}
} }

4
modules/openstack_project/templates/devstack-gate-secure.conf.erb Normal file
View File

@ -0,0 +1,4 @@
[jenkins]
server=https://jenkins.openstack.org
user=<%= jenkins_api_user %>
apikey=<%= jenkins_api_key %>