opendev/system-config
Code Issues Proposed changes

Switch specs to project-config

Browse Source 
Change-Id: If256bb1d00ca3ad37d323b9707d10bc2d9519a4f
This commit is contained in:
James E. Blair 2014-09-19 18:25:26 -07:00
parent 180308970e
commit f6cd98b7d0
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -414,6 +414,7 @@ node 'storyboard.openstack.org' {
# Node-OS: precise # Node-OS: precise
node 'static.openstack.org' { node 'static.openstack.org' {
class { 'openstack_project::static': class { 'openstack_project::static':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
swift_authurl => 'https://identity.api.rackspacecloud.com/v2.0/', swift_authurl => 'https://identity.api.rackspacecloud.com/v2.0/',
swift_user => 'infra-files-ro', swift_user => 'infra-files-ro',

10
modules/openstack_project/manifests/static.pp
View File

@ -8,6 +8,7 @@ class openstack_project::static (
$swift_tenant_name = '', $swift_tenant_name = '',
$swift_region_name = '', $swift_region_name = '',
$swift_default_container = '', $swift_default_container = '',
$project_config_repo = '',
) { ) {
class { 'openstack_project::server': class { 'openstack_project::server':
@ -15,6 +16,10 @@ class openstack_project::static (
sysadmins => $sysadmins, sysadmins => $sysadmins,
} }
class { 'project_config':
url => $project_config_repo,
}
include openstack_project include openstack_project
class { 'jenkins::jenkinsuser': class { 'jenkins::jenkinsuser':
ssh_key => $openstack_project::jenkins_ssh_key, ssh_key => $openstack_project::jenkins_ssh_key,
@ -234,7 +239,8 @@ class openstack_project::static (
owner => 'jenkins', owner => 'jenkins',
group => 'jenkins', group => 'jenkins',
mode => '0444', mode => '0444',
source => 'puppet:///modules/openstack_project/specs/index.html', source => $::project_config::specs_index_file,
require => File['/srv/static/specs'], require => [File['/srv/static/specs'],
$::project_config::config_dir],
} }
} }

1
modules/project_config/manifests/init.pp
View File

@ -39,5 +39,6 @@ class project_config(
$jenkins_scripts_dir = "/etc/project-config/${base}jenkins/scripts" $jenkins_scripts_dir = "/etc/project-config/${base}jenkins/scripts"
$nodepool_scripts_dir = "/etc/project-config/${base}nodepool/scripts" $nodepool_scripts_dir = "/etc/project-config/${base}nodepool/scripts"
$nodepool_elements_dir = "/etc/project-config/${base}nodepool/elements" $nodepool_elements_dir = "/etc/project-config/${base}nodepool/elements"
$specs_index_file = "/etc/project-config/${base}specs/index.html"
$zuul_layout_dir = "/etc/project-config/${base}zuul" $zuul_layout_dir = "/etc/project-config/${base}zuul"
} }