Change opt/config to opt/system-config

Move the install location of the git checkout of the config repo
to /opt/system-config to make things more consistent for operators.

Actually moving this on the puppetmaster will be a manual step.

Change-Id: Id9297088ae6c76c02e35414433aae2733f9f639c

doc/source/puppet.rst

@@ -47,8 +47,8 @@ compatible, so be sure to use an older release - e.g. Ubuntu Precise.
 .. code-block:: bash
 
    sudo su -
-   git clone https://git.openstack.org/openstack-infra/system-config /opt/config/production
+   git clone https://git.openstack.org/openstack-infra/system-config /opt/system-config/production
-   /opt/config/production/install_puppet.sh
+   /opt/system-config/production/install_puppet.sh
    apt-get install puppetmaster-passenger hiera hiera-puppet
 
 Finally, install the modules, fix your hostname and use ``puppet apply`` to
@@ -56,10 +56,10 @@ finish configuration:
 
 .. code-block:: bash
 
-   bash /opt/config/production/install_modules.sh
+   bash /opt/system-config/production/install_modules.sh
    echo $REAL_HOSTNAME > /etc/hostname
    service hostname restart
-   puppet apply --modulepath='/opt/config/production/modules:/etc/puppet/modules' -e 'include openstack_project::puppetmaster'
+   puppet apply --modulepath='/opt/system-config/production/modules:/etc/puppet/modules' -e 'include openstack_project::puppetmaster'
 
 Note: Hiera uses a systemwide configuration file in ``/etc/puppet/hiera.yaml``
 and this setup supports multiple configurations. The two sets of environments
@@ -128,7 +128,7 @@ each host we know about. We do not use the daemon mode of puppet agent
 because it experiences random hangs, and also does not allow us to control
 sequencing in any meaningful way.
 
-The entry point for this process is ``/opt/config/production/run_all.sh``
+The entry point for this process is ``/opt/system-config/production/run_all.sh``
 
 There are a set of nodes, which are configured in puppet as "override" nodes,
 which are run in sequence before the rest of the nodes are run in parallel.

doc/source/running-your-own.rst

@@ -118,7 +118,7 @@ Then start up your puppet db with puppet board (see :file:`launch/README`
 for full details)::
 
     sudo su -
-    cd /opt/config/production/launch
+    cd /opt/system-config/production/launch
     . /root/ci-launch/
     export FQDN=servername.project.example.com
     puppet cert generate $FQDN

modules/openstack_project/files/puppetmaster/production_environment.conf

@@ -1,2 +1,2 @@
-manifest = /opt/config/production/manifests/site.pp
+manifest = /opt/system-config/production/manifests/site.pp
-modulepath = $basemodulepath:modules:/opt/config/production/modules
+modulepath = $basemodulepath:modules:/opt/system-config/production/modules

modules/openstack_project/manifests/puppetmaster.pp

@@ -55,7 +55,7 @@ class openstack_project::puppetmaster (
   cron { 'updatepuppetmaster':
     user        => 'root',
     minute      => '*/15',
-    command     => 'bash /opt/config/production/run_all.sh',
+    command     => 'bash /opt/system-config/production/run_all.sh',
     environment => 'PATH=/var/lib/gems/1.8/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
   }
 

modules/openstack_project/templates/puppet.conf.erb

@@ -23,8 +23,8 @@ environmenttimeout = 0
 ssl_client_header = SSL_CLIENT_S_DN
 ssl_client_verify_header = SSL_CLIENT_VERIFY
 <% if @puppet_version.to_f < 3.6 -%>
-manifestdir=/opt/config/$environment/manifests
+manifestdir=/opt/system-config/$environment/manifests
-modulepath=/opt/config/$environment/modules:/etc/puppet/modules
+modulepath=/opt/system-config/$environment/modules:/etc/puppet/modules
 manifest=$manifestdir/site.pp
 <% end -%>
 reports=store,puppetdb

run_all.sh

@@ -15,7 +15,7 @@
 # under the License.
 
 
-cd /opt/config/production
+cd /opt/system-config/production
 git fetch -a && git reset -q --hard @{u}
 ./install_modules.sh