From c2551e61455ecbb66c2fe8aa5fae60817a0884b0 Mon Sep 17 00:00:00 2001
From: David Moreau-Simard <dms@redhat.com>
Date: Fri, 16 Sep 2016 11:48:00 -0400
Subject: [PATCH] Allow p-o-i to install itself from current source when used
 without Zuul

puppet-openstack-integration currently takes care of installing itself.
This is done through the Puppetfile which references the p-o-i repository.

This works with zuul-cloner because Zuul with ensure the current reference
is cloned.
However, when running outside of the gate, this means that p-o-i will
completely disregard any local code and instead install from the git source
specified in the Puppetfile.

Change-Id: I665347dbede2c53bd5537d4a29d07bfe679c50e5
---
 Puppetfile | 4 ----
 functions  | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Puppetfile b/Puppetfile
index 5bdf9cf75..73c7eaaba 100644
--- a/Puppetfile
+++ b/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'
diff --git a/functions b/functions
index a6cc03c89..2f67be3e6 100644
--- a/functions
+++ b/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