From efe6a22aacbdfb3ffbd79faaf3edc20824f2480f Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Sun, 16 Dec 2012 09:51:37 -0800 Subject: [PATCH] Move puppetmaster git repo. To /opt/config. Change-Id: Iab489ba398522dfd8e36dedb92d4d3f8d78df642 Reviewed-on: https://review.openstack.org/18177 Reviewed-by: Monty Taylor Reviewed-by: Jeremy Stanley Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: James E. Blair --- doc/source/puppet.rst | 10 +++++----- modules/openstack_project/manifests/puppetmaster.pp | 2 +- modules/openstack_project/templates/puppet.conf.erb | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/source/puppet.rst b/doc/source/puppet.rst index 3c4ebadc8b..3416489ad6 100644 --- a/doc/source/puppet.rst +++ b/doc/source/puppet.rst @@ -20,12 +20,12 @@ ship the data to the clients. To install this: sudo apt-get install puppet puppetmaster-passenger Files for puppet master are stored in a git repo clone at -``/opt/openstack-infra/config``. We have a ``root`` cron job that -automatically populates these from our puppet git repository as follows: +``/opt/config``. We have a ``root`` cron job that automatically +populates these from our puppet git repository as follows: .. code-block:: bash - \*/15 * * * * sleep $((RANDOM\%600)) && cd /opt/openstack-infra/config && /usr/bin/git pull -q + \*/15 * * * * sleep $((RANDOM\%600)) && cd /opt/config && /usr/bin/git pull -q The ``/etc/puppet/puppet.conf`` file then needs updating to point to the manifest and modules as follows: @@ -37,8 +37,8 @@ manifest and modules as follows: # and can safely be removed if webrick is used. ssl_client_header = SSL_CLIENT_S_DN ssl_client_verify_header = SSL_CLIENT_VERIFY - manifestdir=/opt/openstack-infra/config/manifests - modulepath=/opt/openstack-infra/config/modules + manifestdir=/opt/config/manifests + modulepath=/opt/config/modules manifest=$manifestdir/site.pp Hiera diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp index 2bb76d1611..ff86fb1312 100644 --- a/modules/openstack_project/manifests/puppetmaster.pp +++ b/modules/openstack_project/manifests/puppetmaster.pp @@ -13,7 +13,7 @@ class openstack_project::puppetmaster ( cron { 'updatepuppetmaster': user => 'root', minute => '*/15', - command => 'sleep $((RANDOM\%600)) && cd /opt/openstack-infra/config/production && /usr/bin/git pull -q && /bin/bash install_modules.sh', + command => 'sleep $((RANDOM\%600)) && cd /opt/config/production && /usr/bin/git pull -q && /bin/bash install_modules.sh', environment => 'PATH=/var/lib/gems/1.8/bin:/usr/bin:/bin:/usr/sbin:/sbin', } diff --git a/modules/openstack_project/templates/puppet.conf.erb b/modules/openstack_project/templates/puppet.conf.erb index 92341800f2..e757585074 100644 --- a/modules/openstack_project/templates/puppet.conf.erb +++ b/modules/openstack_project/templates/puppet.conf.erb @@ -14,8 +14,8 @@ pluginsync=true # and can safely be removed if webrick is used. ssl_client_header = SSL_CLIENT_S_DN ssl_client_verify_header = SSL_CLIENT_VERIFY -manifestdir=/opt/openstack-infra/config/$environment/manifests -modulepath=/opt/openstack-infra/config/$environment/modules:/etc/puppet/modules +manifestdir=/opt/config/$environment/manifests +modulepath=/opt/config/$environment/modules:/etc/puppet/modules manifest=$manifestdir/site.pp reports=store, http reporturl=http://puppet-dashboard.openstack.org:3000/reports/upload