opendev/system-config
Code Issues Proposed changes

Move puppetmaster git repo.

Browse Source 
To /opt/config.

Change-Id: Iab489ba398522dfd8e36dedb92d4d3f8d78df642
Reviewed-on: https://review.openstack.org/18177
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: James E. Blair <corvus@inaugust.com>
This commit is contained in:
James E. Blair 2012-12-16 09:51:37 -08:00 committed by James E. Blair
parent 6726028fdc
commit efe6a22aac
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/source/puppet.rst
View File

@ -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

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

@ -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',
}

4
modules/openstack_project/templates/puppet.conf.erb
View File

@ -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