openstack/instack-undercloud
Code Issues Proposed changes

Use openstack-puppet-modules

Browse Source 
Update instack-install-undercloud and instack-build-images to no longer
use puppet modules from source and use packaged openstack-puppet-modules
instead.

Change-Id: Ia5f73b2ca779cd2f69eca1772cfd6f43b532eece
This commit is contained in:
James Slagle 2015-04-30 09:23:45 -04:00
parent f93b878d39
commit b8a008210b
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/undercloud-package-install/environment.d/00-package-install
View File

@ -5,6 +5,10 @@ set -eux
export DIB_DEFAULT_INSTALLTYPE=${DIB_DEFAULT_INSTALLTYPE:-package}
export DIB_INSTALLTYPE_os_cloud_config=package
# Must define this manually, see:
# https://review.openstack.org/179101
export DIB_INSTALLTYPE_puppet_modules=${DIB_INSTALLTYPE_puppet_modules:-package}
# OpenStack projects
export DIB_INSTALLTYPE_heat=${DIB_INSTALLTYPE_heat:-package}
export DIB_INSTALLTYPE_keystone=${DIB_INSTALLTYPE_keystone:-package}

14
scripts/instack-build-images
View File

@ -5,13 +5,6 @@ set -o pipefail
export image_build=${1:-"default"}
# Commit 9970cc6550735370666553cb043656bb945bef7b to puppetlabs-concat is
# causing the following error:
# Error: Could not find class ::concat::setup for localhost on node localhost
# during the puppet apply.
# Pin to an earlier commit for now.
export DIB_REPOREF_puppetlabs_concat=15ecb98dc3a551024b0b92c6aafdefe960a4596f
# Attempt to be smart about detecting the path to the instack-undercloud
# elements
INSTACKUNDERCLOUDELEMENTS=/usr/share/instack-undercloud
@ -37,10 +30,11 @@ $INSTACKUNDERCLOUDELEMENTS:\
# use a tmpfs on it's own if there is enough free RAM.
export TMP_DIR=${TMP_DIR:-/var/tmp}
export NODE_ARCH=${NODE_ARCH:-amd64}
# We need to define this here, see:
# https://review.openstack.org/179502
export DIB_DEFAULT_INSTALLTYPE=${DIB_DEFAULT_INSTALLTYPE:-package}
# We must do this until tripleo-puppet-elements is packaged
export DIB_INSTALLTYPE_puppet_modules=source
export NODE_ARCH=${NODE_ARCH:-amd64}
export USE_DELOREAN_TRUNK=${USE_DELOREAN_TRUNK:-1}
export DELOREAN_TRUNK_REPO=${DELOREAN_TRUNK_REPO:-"http://trunk.rdoproject.org/kilo/centos7/latest-RDO-kilo-CI/"}

10
scripts/instack-install-undercloud
View File

@ -35,16 +35,6 @@ if ! grep -E "\s+$detected_static_hostname(\s|$)+" /etc/hosts; then
exit 1
fi
# We must do this until tripleo-puppet-elements is packaged
export DIB_INSTALLTYPE_puppet_modules=source
# Commit 9970cc6550735370666553cb043656bb945bef7b to puppetlabs-concat is
# causing the following error:
# Error: Could not find class ::concat::setup for localhost on node localhost
# during the puppet apply.
# Pin to an earlier commit for now.
export DIB_REPOREF_puppetlabs_concat=15ecb98dc3a551024b0b92c6aafdefe960a4596f
# Attempt to be smart about detecting the path to the json files.
JSONFILEDIR=/usr/share/instack-undercloud/json-files
if [ ! -d "$JSONFILEDIR" ]; then