Merge "Move playbooks out of the puppet module"

doc/source/gerrit.rst

@@ -524,7 +524,7 @@ To rename a project:
    changing, gate jobs may fail due to outdated remote URLs. Clear
    the workspaces on persistent Jenkins slaves to mitigate this::
 
-     sudo ansible-playbook -f 10 /etc/ansible/playbooks/clean_workspaces.yaml --extra-vars "project=PROJECTNAME"
+     sudo ansible-playbook -f 10 /opt/system-config/production/playbooks/clean_workspaces.yaml --extra-vars "project=PROJECTNAME"
 
 #. Submit a change that updates .gitreview with the new location of the
    project.

modules/openstack_project/manifests/puppetmaster.pp

@@ -176,10 +176,7 @@ class openstack_project::puppetmaster (
 # Playbooks
 #
   file { '/etc/ansible/playbooks':
-    ensure  => directory,
-    recurse => true,
-    source  => 'puppet:///modules/openstack_project/ansible/playbooks',
-    require => Class[ansible],
+    ensure  => absent,
   }
 
   file { '/etc/ansible/remote_puppet.yaml':

run_all.sh

@@ -19,9 +19,10 @@
 # expect.
 set -e
 export ANSIBLE_LOG_PATH=/var/log/puppet_run_all.log
-ANSIBLE_PLAYBOOKS=/etc/ansible/playbooks
+SYSTEM_CONFIG=/opt/system-config/production
+ANSIBLE_PLAYBOOKS=$SYSTEM_CONFIG/playbooks
 
-cd /opt/system-config/production
+cd $SYSTEM_CONFIG
 git fetch -a && git reset -q --hard @{u}
 ./install_modules.sh
 ansible-galaxy install --force -r roles.yaml