diff --git a/manifests/site.pp b/manifests/site.pp index 5da57d609b..aab6a993f3 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -414,6 +414,7 @@ node 'storyboard.openstack.org' { # Node-OS: precise node 'static.openstack.org' { class { 'openstack_project::static': + project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', sysadmins => hiera('sysadmins', []), swift_authurl => 'https://identity.api.rackspacecloud.com/v2.0/', swift_user => 'infra-files-ro', diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp index ddf0df8652..c95cccdf53 100644 --- a/modules/openstack_project/manifests/static.pp +++ b/modules/openstack_project/manifests/static.pp @@ -8,6 +8,7 @@ class openstack_project::static ( $swift_tenant_name = '', $swift_region_name = '', $swift_default_container = '', + $project_config_repo = '', ) { class { 'openstack_project::server': @@ -15,6 +16,10 @@ class openstack_project::static ( sysadmins => $sysadmins, } + class { 'project_config': + url => $project_config_repo, + } + include openstack_project class { 'jenkins::jenkinsuser': ssh_key => $openstack_project::jenkins_ssh_key, @@ -234,7 +239,8 @@ class openstack_project::static ( owner => 'jenkins', group => 'jenkins', mode => '0444', - source => 'puppet:///modules/openstack_project/specs/index.html', - require => File['/srv/static/specs'], + source => $::project_config::specs_index_file, + require => [File['/srv/static/specs'], + $::project_config::config_dir], } } diff --git a/modules/project_config/manifests/init.pp b/modules/project_config/manifests/init.pp index a8a229305d..c4f3ad2994 100644 --- a/modules/project_config/manifests/init.pp +++ b/modules/project_config/manifests/init.pp @@ -39,5 +39,6 @@ class project_config( $jenkins_scripts_dir = "/etc/project-config/${base}jenkins/scripts" $nodepool_scripts_dir = "/etc/project-config/${base}nodepool/scripts" $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" }