From 39fc1d50727e296eb0f1008b489e0c31c9bce53c Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 19 Aug 2012 14:13:49 -0400 Subject: [PATCH] A few puppetmaster migration errors. Change-Id: Ibcc8456da4d3fa3beb94173e571a5da071b6fa15 Reviewed-on: https://review.openstack.org/11628 Approved: Monty Taylor Reviewed-by: Monty Taylor Tested-by: Jenkins --- manifests/site.pp | 2 +- modules/openstack_project/manifests/glancetest.pp | 4 ++-- modules/openstack_project/manifests/slave.pp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 4746f0d81a..05112d8b8f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -150,7 +150,7 @@ node /^oneiric.*\.slave\.openstack\.org$/ { class { 'openstack_project::glancetest': 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_bucket'), + s3_store_bucket => hiera('s3_store_bucket'), swift_store_user => hiera('swift_store_user'), swift_store_key => hiera('swift_store_key'), swift_store_container => hiera('swift_store_container'), diff --git a/modules/openstack_project/manifests/glancetest.pp b/modules/openstack_project/manifests/glancetest.pp index 845291d42d..fa2b0f6696 100644 --- a/modules/openstack_project/manifests/glancetest.pp +++ b/modules/openstack_project/manifests/glancetest.pp @@ -25,7 +25,7 @@ class openstack_project::glancetest( mode => 400, ensure => 'present', require => File['jenkinsglanceconfigdir'], - content => template('jenkins/glance_s3.conf.erb'), + content => template('openstack_project/glance_s3.conf.erb'), } file { 'glanceswiftconf': @@ -35,7 +35,7 @@ class openstack_project::glancetest( mode => 400, ensure => 'present', require => File['jenkinsglanceconfigdir'], - content => template('jenkins/glance_swift.conf.erb'), + content => template('openstack_project/glance_swift.conf.erb'), } } diff --git a/modules/openstack_project/manifests/slave.pp b/modules/openstack_project/manifests/slave.pp index 0ac4aae295..6d52be842c 100644 --- a/modules/openstack_project/manifests/slave.pp +++ b/modules/openstack_project/manifests/slave.pp @@ -6,7 +6,7 @@ class openstack_project::slave( include unattended_upgrades class { 'openstack_project::server': iptables_public_tcp_ports => [], - certname => $cername, + certname => $certname, } class { 'jenkins::slave': ssh_key => $openstack_project::jenkins_ssh_key