Merge "Allow p-o-i to install itself from current source when used without Zuul"

Puppetfile

@@ -85,10 +85,6 @@ mod 'octavia',
   :git => 'https://git.openstack.org/openstack/puppet-octavia',
   :ref => 'master'
 
-mod 'openstack_integration',
-  :git => 'https://git.openstack.org/openstack/puppet-openstack-integration',
-  :ref => 'master'
-
 mod 'openstack_extras',
   :git => 'https://git.openstack.org/openstack/puppet-openstack_extras',
   :ref => 'master'

functions

@@ -46,6 +46,7 @@ EOF
   local project_names=$(awk '{ if ($1 == ":git") print $3 }' \
     ${SCRIPT_DIR}/Puppetfile0 | tr -d "'," | cut -d '/' -f 4- | xargs
   )
+  project_names="${project_names} openstack/puppet-openstack-integration"
   /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml \
     --cache-dir /opt/git \
     --project-branch openstack/puppet-ceph=$PUPPET_CEPH_ZUUL_BRANCH \
@@ -64,7 +65,10 @@ EOF
 #
 # - ``SCRIPT_DIR`` must be set to script path
 install_all() {
+  # When installing from local source, we want to install the current source
+  # we're working from.
   PUPPETFILE=${SCRIPT_DIR}/Puppetfile r10k puppetfile install -v
+  cp -ar ${SCRIPT_DIR} ${PUPPETFILE_DIR}/openstack_integration
 }
 
 # Install Puppet OpenStack modules and dependencies by using