opendev/system-config
Code Issues Proposed changes

A few puppetmaster migration errors.

Browse Source 
Change-Id: Ibcc8456da4d3fa3beb94173e571a5da071b6fa15
Reviewed-on: https://review.openstack.org/11628
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Monty Taylor 2012-08-19 14:13:49 -04:00 committed by Jenkins
parent f6ae3e6b7b
commit 39fc1d5072
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -150,7 +150,7 @@ node /^oneiric.*\.slave\.openstack\.org$/ {
class { 'openstack_project::glancetest': class { 'openstack_project::glancetest':
s3_store_access_key => hiera('s3_store_access_key'), s3_store_access_key => hiera('s3_store_access_key'),
s3_store_secret_key => hiera('s3_store_secret_key'), s3_store_secret_key => hiera('s3_store_secret_key'),
s3_store_secret_key => hiera('s3_store_bucket'), s3_store_bucket => hiera('s3_store_bucket'),
swift_store_user => hiera('swift_store_user'), swift_store_user => hiera('swift_store_user'),
swift_store_key => hiera('swift_store_key'), swift_store_key => hiera('swift_store_key'),
swift_store_container => hiera('swift_store_container'), swift_store_container => hiera('swift_store_container'),

4
modules/openstack_project/manifests/glancetest.pp
View File

@ -25,7 +25,7 @@ class openstack_project::glancetest(
mode => 400, mode => 400,
ensure => 'present', ensure => 'present',
require => File['jenkinsglanceconfigdir'], require => File['jenkinsglanceconfigdir'],
content => template('jenkins/glance_s3.conf.erb'), content => template('openstack_project/glance_s3.conf.erb'),
} }
file { 'glanceswiftconf': file { 'glanceswiftconf':
@ -35,7 +35,7 @@ class openstack_project::glancetest(
mode => 400, mode => 400,
ensure => 'present', ensure => 'present',
require => File['jenkinsglanceconfigdir'], require => File['jenkinsglanceconfigdir'],
content => template('jenkins/glance_swift.conf.erb'), content => template('openstack_project/glance_swift.conf.erb'),
} }
} }

2
modules/openstack_project/manifests/slave.pp
View File

@ -6,7 +6,7 @@ class openstack_project::slave(
include unattended_upgrades include unattended_upgrades
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [], iptables_public_tcp_ports => [],
certname => $cername, certname => $certname,
} }
class { 'jenkins::slave': class { 'jenkins::slave':
ssh_key => $openstack_project::jenkins_ssh_key ssh_key => $openstack_project::jenkins_ssh_key