From 38ed37530db238ff1c618960e901a54c14e0337e Mon Sep 17 00:00:00 2001 From: James Slagle Date: Mon, 29 Sep 2014 07:20:10 -0400 Subject: [PATCH] Update $LKG --- .../delorean/extra-data.d/10-delorean-repo | 3 +- .../post-configure.d/98-undercloud-setup | 1 + instack-sourcerc | 10 ++-- scripts/instack-install-undercloud-source | 56 ++++--------------- 4 files changed, 18 insertions(+), 52 deletions(-) diff --git a/elements/delorean/extra-data.d/10-delorean-repo b/elements/delorean/extra-data.d/10-delorean-repo index 9749715ca..d460b7f40 100755 --- a/elements/delorean/extra-data.d/10-delorean-repo +++ b/elements/delorean/extra-data.d/10-delorean-repo @@ -11,4 +11,5 @@ if [ -z "$DELOREAN_REPO" ]; then fi sudo curl -o $TMP_MOUNT_PATH/etc/yum.repos.d/delorean.repo $DELOREAN_REPO - +sudo curl -o $TMP_MOUNT_PATH/etc/yum.repos.d/delorean-alt.repo $DELOREAN_REPO_ALT +sudo sed -i "s/delorean/delorean-alt/g" $TMP_MOUNT_PATH/etc/yum.repos.d/delorean-alt.repo diff --git a/elements/undercloud-post-config-source/os-refresh-config/post-configure.d/98-undercloud-setup b/elements/undercloud-post-config-source/os-refresh-config/post-configure.d/98-undercloud-setup index 4266c4a92..777cf53d1 100755 --- a/elements/undercloud-post-config-source/os-refresh-config/post-configure.d/98-undercloud-setup +++ b/elements/undercloud-post-config-source/os-refresh-config/post-configure.d/98-undercloud-setup @@ -60,6 +60,7 @@ REGISTER_SERVICE_OPTS= # Needed by ceilometer user in register-endpoint keystone role-create --name=ResellerAdmin +# TODO: this needs to be switched over to use os-cloud-config's setup-endpoints setup-endpoints $UNDERCLOUD_IP $ENDPOINT_LIST $REGISTER_SERVICE_OPTS keystone role-create --name heat_stack_user diff --git a/instack-sourcerc b/instack-sourcerc index f51948288..1a40f412f 100644 --- a/instack-sourcerc +++ b/instack-sourcerc @@ -34,7 +34,8 @@ sudo cp /root/stackrc . #############################################################################" if [ "$LKG" = "1" ]; then - export DELOREAN_REPO=http://209.132.178.33/repos/b7/26/b7261e39cbeb96e22e804e1de83e8f629c248a61/delorean.repo + export DELOREAN_REPO=http://209.132.178.33/repos/0d/f4/0df4f416f9587881b8f7442b07506edf1155c3d3/delorean.repo + export DELOREAN_REPO_ALT=http://209.132.178.33/repos/e3/af/e3af9b42b532363b6cdc8eb95207c7d5e0ea87fc/delorean.repo else export DELOREAN_REPO=http://209.132.178.33/repos/current/delorean.repo fi @@ -43,10 +44,10 @@ export PIP_DOWNLOAD_CACHE=~/.cache/pip if [ "$LKG" = "1" ]; then # These are set manually, since they're not part of source-repositories - export DIB_REPOREF_tripleo_image_elements=4b3d93e144b3452509048e5f9f5a10fcb93ded5c - export DIB_REPOREF_diskimage_builder=41ba1d2b9c0bee5738bec921f2a1114e772a3ab8 + export DIB_REPOREF_tripleo_image_elements=5fea32ff79220fce2eb808d9b119832a98ace626 + export DIB_REPOREF_diskimage_builder=dbc60e8942ca700cd673a115a6d327af8ee41483 export DIB_REPOREF_os_cloud_config=4a03e6b129c91a7269b6103a1f85fd011ec92c91 - export DIB_REPOREF_tripleo_incubator=9f3f00eb6c21528d1cda9b80958da5088e8d25cf + export DIB_REPOREF_tripleo_incubator=b51d5a1840b4e985b7daa334814a10590af00d53 # This is set manually since swift is not part of the undercloud export DIB_REPOREF_swift=4dc718e8c3bd2a8bbe1f2d7a98ad03421a70217f @@ -91,7 +92,6 @@ if [ "$LKG" = "1" ]; then export DIB_REPOLOCATION_python_novaclient=https://git.openstack.org/openstack/python-novaclient.git export DIB_REPOREF_python_swiftclient=45465c70e31764167b43fe342c38231a3e0b825c export DIB_REPOLOCATION_python_swiftclient=https://git.openstack.org/openstack/python-swiftclient.git - fi export ELEMENTS_PATH="\ diff --git a/scripts/instack-install-undercloud-source b/scripts/instack-install-undercloud-source index 03295ceca..2c18bd04f 100755 --- a/scripts/instack-install-undercloud-source +++ b/scripts/instack-install-undercloud-source @@ -10,6 +10,8 @@ export JSONFILE=${JSONFILE:-$INSTACK_ROOT/instack-undercloud/json-files/fedora-2 if [ "$DELOREAN" = "1" ]; then sudo curl -o /etc/yum.repos.d/delorean.repo $DELOREAN_REPO + sudo curl -o /etc/yum.repos.d/delorean-alt.repo $DELOREAN_REPO_ALT + sudo sed -i "s/delorean/delorean-alt/g" /etc/yum.repos.d/delorean-alt.repo export JSONFILE=$INSTACK_ROOT/instack-undercloud/json-files/fedora-20-undercloud-delorean.json fi @@ -32,30 +34,6 @@ if [ ! -d $INSTACK_ROOT/tripleo-image-elements/elements ]; then git reset --hard FETCH_HEAD fi - ## Ceilometer package install support - # - # https://review.openstack.org/#/c/121048/ - git fetch https://review.openstack.org/openstack/tripleo-image-elements refs/changes/48/121048/4 && git cherry-pick FETCH_HEAD - - ## tuskar-ui element - # - # https://review.openstack.org/#/c/121205/ - git fetch https://review.openstack.org/openstack/tripleo-image-elements refs/changes/05/121205/3 && git cherry-pick FETCH_HEAD - # https://review.openstack.org/#/c/123503 - git fetch https://review.openstack.org/openstack/tripleo-image-elements refs/changes/03/123503/4 && git cherry-pick FETCH_HEAD - # https://review.openstack.org/#/c/123796/ - git fetch https://review.openstack.org/openstack/tripleo-image-elements refs/changes/96/123796/1 && git cherry-pick FETCH_HEAD - - ## swift-storage missing /mnt/state/var/log - # - # https://review.openstack.org/#/c/122800/ - git fetch https://review.openstack.org/openstack/tripleo-image-elements refs/changes/00/122800/2 && git cherry-pick FETCH_HEAD - - ## tuskar element - # - # https://review.openstack.org/#/c/122183 - git fetch https://review.openstack.org/openstack/tripleo-image-elements refs/changes/83/122183/5 && git cherry-pick FETCH_HEAD - popd fi @@ -74,12 +52,6 @@ fi if [ ! -d "$INSTACK_ROOT/dib-utils" ]; then git clone https://git.openstack.org/openstack/dib-utils - - pushd $INSTACK_ROOT/dib-utils - # environment.d sort fix, plus other fixes - git fetch https://review.openstack.org/openstack/dib-utils refs/changes/12/122412/2 && git cherry-pick FETCH_HEAD || true - popd - fi @@ -110,6 +82,7 @@ if [ ! -d $INSTACK_ROOT/os-cloud-config ]; then fi + if [ ! -d $INSTACK_ROOT/tripleo-incubator ]; then git clone https://git.openstack.org/openstack/tripleo-incubator @@ -120,10 +93,6 @@ if [ ! -d $INSTACK_ROOT/tripleo-incubator ]; then git reset --hard FETCH_HEAD fi - ## wait_for_hypervisor_stats - # - # https://review.openstack.org/#/c/122846/ - git fetch https://review.openstack.org/openstack/tripleo-incubator refs/changes/46/122846/1 && git cherry-pick FETCH_HEAD ## create-nodes x86_64 support # @@ -137,16 +106,11 @@ fi if [ ! -d $INSTACK_ROOT/tripleo-heat-templates ]; then git clone https://git.openstack.org/openstack/tripleo-heat-templates - pushd tripleo-heat-templates - - # if [ "$LKG" = "1" ]; then - # git fetch origin $DIB_REPOREF_tripleo_heat_templates - # git reset --hard FETCH_HEAD - # fi - # Create an unpatched copy for non-Tuskar testing cp -r $INSTACK_ROOT/tripleo-heat-templates $INSTACK_ROOT/tripleo-heat-templates-instack + pushd tripleo-heat-templates + ## No merge.py for the overcloud # # https://review.openstack.org/#/c/123100 @@ -154,20 +118,19 @@ if [ ! -d $INSTACK_ROOT/tripleo-heat-templates ]; then popd - export DIB_REPOLOCATION_tripleo_heat_templates=$INSTACK_ROOT/tripleo-heat-templates - fi +export DIB_REPOLOCATION_tripleo_heat_templates=$INSTACK_ROOT/tripleo-heat-templates + if [ ! -d $INSTACK_ROOT/tuskar-ui ]; then git clone https://git.openstack.org/openstack/tuskar-ui - pushd tuskar-ui - popd - export DIB_REPOLOCATION_tuskar_ui=$INSTACK_ROOT/tuskar-ui fi +export DIB_REPOLOCATION_tuskar_ui=$INSTACK_ROOT/tuskar-ui + pushd $INSTACK_ROOT/dib-utils sudo pip install -U . popd @@ -186,6 +149,7 @@ pushd $INSTACK_ROOT/os-cloud-config sudo pip install -e . popd + # tar is required if we want to run diskimage-builder sudo yum install -y tar