openstack/puppet-openstack-integration
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2016-09-21 21:21:22 +00:00 committed by Gerrit Code Review
commit 40580254d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Puppetfile
View File

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

4
functions
View File

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