opendev/system-config
Code Issues Proposed changes

Merge "Updating node defn for puppet 3 master"

Browse Source
This commit is contained in:
Jenkins 2014-09-10 17:25:23 +00:00 committed by Gerrit Code Review
commit f637e3bee3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -185,7 +185,7 @@ node 'puppetmaster.openstack.org' {
root_rsa_key => hiera('puppetmaster_root_rsa_key', 'XXX'), root_rsa_key => hiera('puppetmaster_root_rsa_key', 'XXX'),
update_slave => false, update_slave => false,
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
version => '3.4.', version => '3.6.',
ca_server => 'ci-puppetmaster.openstack.org', ca_server => 'ci-puppetmaster.openstack.org',
} }
} }

1
util/puppetmaster_bootstrap.sh
View File

@ -2,6 +2,7 @@
set -x set -x
# Script to build a puppet 3 master to infra/config standards # Script to build a puppet 3 master to infra/config standards
apt-get update apt-get update
apt-get install git apt-get install git
git clone https://git.openstack.org/openstack-infra/config git clone https://git.openstack.org/openstack-infra/config