diff --git a/elements/delorean/extra-data.d/10-delorean-repo b/elements/delorean/extra-data.d/10-delorean-repo deleted file mode 100755 index fee1a1b2c..000000000 --- a/elements/delorean/extra-data.d/10-delorean-repo +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -DELOREAN_REPO=${DELOREAN_REPO:-""} - -if [ -z "$DELOREAN_REPO" ]; then - echo \$DELOREAN_REPO must be set - exit 1 -fi - -sudo curl -o $TMP_MOUNT_PATH/etc/yum.repos.d/delorean.repo $DELOREAN_REPO diff --git a/elements/rhos-release/pre-install.d/01-rhos-release b/elements/rhos-release/pre-install.d/00-rhos-release similarity index 100% rename from elements/rhos-release/pre-install.d/01-rhos-release rename to elements/rhos-release/pre-install.d/00-rhos-release diff --git a/scripts/instack-build-images b/scripts/instack-build-images index 360b80d03..8de6eb417 100755 --- a/scripts/instack-build-images +++ b/scripts/instack-build-images @@ -12,8 +12,14 @@ if [ ! -d $INSTACKUNDERCLOUDELEMENTS ]; then INSTACKUNDERCLOUDELEMENTS=$(dirname $0)/../elements fi +TRIPLEOPUPPETELEMENTS=/usr/share/tripleo-puppet-elements +if [ ! -d $TRIPLEOPUPPETELEMENTS ]; then + # Assume it's checked out in the current directory + TRIPLEOPUPPETELEMENTS=$PWD/tripleo-puppet-elements/elements +fi + export ELEMENTS_PATH=${ELEMENTS_PATH:-"\ -$(pwd)/tripleo-puppet-elements/elements:\ +$TRIPLEOPUPPETELEMENTS:\ $INSTACKUNDERCLOUDELEMENTS:\ /usr/share/tripleo-image-elements:\ /usr/share/diskimage-builder/elements:\ @@ -40,7 +46,7 @@ if $(grep -Eqs 'Red Hat Enterprise Linux' /etc/redhat-release); then export DIB_COMMON_ELEMENTS=rhos-release export REG_HALT_UNREGISTER=1 export DELOREAN=1 - export DELOREAN_REPO="http://104.130.230.24/centos70/05/d8/05d8a6b82bf1f16c064bbee84d95c88b73030fae_3ea5fe35/delorean.repo" + export DELOREAN_REPO_URL="http://104.130.230.24/centos70/4a/1d/4a1d1169acdf6b63239b60a898a33caf428acb5c_291a4aa4/" elif $(grep -Eqs 'CentOS' /etc/redhat-release); then export NODE_DIST=${NODE_DIST:-centos7} elif $(grep -Eqs 'Fedora' /etc/redhat-release); then @@ -68,7 +74,8 @@ if [[ "rhel7 centos7" =~ "$NODE_DIST" ]]; then export FS_TYPE=${FS_TYPE:-xfs} if [ "$RHOS" = "0" ]; then - export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS epel rdo-juno rdo-release" + export RDO_RELEASE=kilo + export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS epel rdo-release" elif [ ! "$RHOS_RELEASE" = "0" ]; then export DIB_COMMON_ELEMENTS="$DIB_COMMON_ELEMENTS rhos-release" fi @@ -85,7 +92,6 @@ if [ "$PACKAGES" = "1" ]; then fi # Puppet overcloud-specific configuration -export DELOREAN_REPO_URL="http://104.130.230.24/centos70/05/d8/05d8a6b82bf1f16c064bbee84d95c88b73030fae_3ea5fe35" export PUPPET_COMMON_ELEMENTS="\ sysctl \ hosts \ @@ -264,8 +270,8 @@ function os-disk-config { if [ "$image_build" = "all" ]; then deploy-ramdisk discovery-ramdisk - overcloud-compute overcloud-control + overcloud-compute else eval "$image_build" fi diff --git a/scripts/instack-install-undercloud b/scripts/instack-install-undercloud index cdd31fa40..3c6d2f830 100755 --- a/scripts/instack-install-undercloud +++ b/scripts/instack-install-undercloud @@ -41,8 +41,14 @@ if [ ! -d $INSTACKUNDERCLOUDELEMENTS ]; then INSTACKUNDERCLOUDELEMENTS=$(dirname $0)/../elements fi +TRIPLEOPUPPETELEMENTS=/usr/share/tripleo-puppet-elements +if [ ! -d $TRIPLEOPUPPETELEMENTS ]; then + # Assume it's checked out in the current directory + TRIPLEOPUPPETELEMENTS=$PWD/tripleo-puppet-elements/elements +fi + export ELEMENTS_PATH=${ELEMENTS_PATH:-"\ -$(pwd)/tripleo-puppet-elements/elements:\ +$TRIPLEOPUPPETELEMENTS:\ $INSTACKUNDERCLOUDELEMENTS:\ /usr/share/tripleo-image-elements:\ /usr/share/diskimage-builder/elements"} diff --git a/scripts/instack-setup-host-rhel7 b/scripts/instack-setup-host-rhel7 index 4914adde6..00109fe03 100755 --- a/scripts/instack-setup-host-rhel7 +++ b/scripts/instack-setup-host-rhel7 @@ -6,7 +6,7 @@ set -o pipefail # Install repo file for Delorean master packages # Pin to an older repo for now because newer openstack-keystone requires a # newer and not yet avaialable python-pycadf. -export DELOREAN_REPO=${DELOREAN_REPO:-"http://104.130.230.24/centos70/05/d8/05d8a6b82bf1f16c064bbee84d95c88b73030fae_3ea5fe35/delorean.repo"} +export DELOREAN_REPO=${DELOREAN_REPO:-"http://104.130.230.24/centos70/4a/1d/4a1d1169acdf6b63239b60a898a33caf428acb5c_291a4aa4/delorean.repo"} sudo curl -o /etc/yum.repos.d/delorean.repo $DELOREAN_REPO # Install repo file for Delorean el7 midstream packages built from @@ -18,7 +18,7 @@ sudo sed -i 's/delorean/delorean-rdo-management/' /etc/yum.repos.d/delorean-rdo- # Delorean requires RDO if ! rpm -q rdo-release; then - sudo yum install -y https://rdo.fedorapeople.org/rdo-release.rpm + sudo yum install -y https://rdo.fedorapeople.org/openstack-kilo/rdo-release-kilo-0.noarch.rpm fi if ! rpm -q epel-release; then @@ -38,14 +38,6 @@ sudo yum-config-manager --disable rhelosp-6.0-poodle # We need openwsman-python from the optional repo sudo yum-config-manager --enable rhelosp-rhel-7-server-opt -sudo yum -y install git - -# os-cloud-config is broken in Delorean packaging right now, b/c it's missing -# the patch to remove the pbr requirements, yet doesn't actually Require it, so -# just install it manually for now. -sudo yum -y install os-cloud-config -sudo yum -y install python-pbr - # newer openstack-keystone requires python-zope-interface, but that is not # avaiable anywhere for EL7. So just install the Fedora package for now. We can # add this dep to Delorean going forward. @@ -54,12 +46,7 @@ if ! rpm -q python-zope-interface; then fi # Required for building puppet-based images +# We can remove these once we add a corresponding Requires: +# to the instack-undercloud spec file. sudo yum install -y openstack-heat-templates - -# tripleo-puppet-elements is not yet in Delorean, so just git clone for now -if [ ! -d "tripleo-puppet-elements" ]; then - git clone http://git.openstack.org/openstack/tripleo-puppet-elements -else - echo "WARNING##################################:" - echo "tripleo-puppet-elements directory already exists, not recloning" -fi +sudo yum install -y openstack-tripleo-puppet-elements