[openstack-tripleo-image-elements] Make 101-tuskar-ui re-runnable

slagle slagle at fedoraproject.org
Fri Oct 24 15:18:22 UTC 2014 

commit 8b5263c780b5ba2ed3526dea2b4de5ae9f3be6bf
Author: James Slagle <jslagle at redhat.com>
Date:   Fri Oct 24 11:18:13 2014 -0400

    Make 101-tuskar-ui re-runnable

 0010-Make-101-tuskar-ui-re-runnable.patch |   87 +++++++++++++++++++++++++++++
 openstack-tripleo-image-elements.spec     |    7 ++-
 2 files changed, 93 insertions(+), 1 deletions(-)
---
diff --git a/0010-Make-101-tuskar-ui-re-runnable.patch b/0010-Make-101-tuskar-ui-re-runnable.patch
new file mode 100644
index 0000000..e73266b
--- /dev/null
+++ b/0010-Make-101-tuskar-ui-re-runnable.patch
@@ -0,0 +1,87 @@
+From 04827dc2a7edca8a5df29d827bfbf3daba5296e9 Mon Sep 17 00:00:00 2001
+From: Tzu-Mainn Chen <tzumainn at redhat.com>
+Date: Fri, 24 Oct 2014 00:40:10 +0000
+Subject: [PATCH] Make 101-tuskar-ui re-runnable
+
+Change-Id: Idedfd2dea2a823245e749ae27e40ae4e29639726
+---
+ .../post-configure.d/101-tuskar-ui                 | 60 ++++++++++++----------
+ 1 file changed, 34 insertions(+), 26 deletions(-)
+
+diff --git a/elements/tuskar-ui/os-refresh-config/post-configure.d/101-tuskar-ui b/elements/tuskar-ui/os-refresh-config/post-configure.d/101-tuskar-ui
+index 375ea0b..aca394e 100755
+--- a/elements/tuskar-ui/os-refresh-config/post-configure.d/101-tuskar-ui
++++ b/elements/tuskar-ui/os-refresh-config/post-configure.d/101-tuskar-ui
+@@ -16,38 +16,46 @@ fi
+ 
+ source /root/stackrc
+ 
+-COMPUTE_IMAGE_ID=$( glance image-show overcloud-compute | grep id | awk '$2=="id" {print $4}' )
+-CONTROL_IMAGE_ID=$( glance image-show overcloud-control | grep id | awk '$2=="id" {print $4}' )
+-COMPUTE_ROLE_ID=$( tuskar --tuskar-api-version 2 role-list | awk '$4=="compute" {print $2}' )
+-CONTROL_ROLE_ID=$( tuskar --tuskar-api-version 2 role-list | awk '$4=="controller" {print $2}' )
++if [ -z "$(tuskar --tuskar-api-version 2 plan-list | grep overcloud)" ]; then
++    COMPUTE_IMAGE_ID=$( glance image-show overcloud-compute | grep id | awk '$2=="id" {print $4}' )
++    CONTROL_IMAGE_ID=$( glance image-show overcloud-control | grep id | awk '$2=="id" {print $4}' )
++    COMPUTE_ROLE_ID=$( tuskar --tuskar-api-version 2 role-list | awk '$4=="compute" {print $2}' )
++    CONTROL_ROLE_ID=$( tuskar --tuskar-api-version 2 role-list | awk '$4=="controller" {print $2}' )
+ 
+-PLAN_ID=$( tuskar --tuskar-api-version 2 plan-create overcloud | awk '$2=="uuid" {print $4}' )
++    PLAN_ID=$( tuskar --tuskar-api-version 2 plan-create overcloud | awk '$2=="uuid" {print $4}' )
+ 
+-tuskar --tuskar-api-version 2 plan-add-role -r $COMPUTE_ROLE_ID $PLAN_ID
+-tuskar --tuskar-api-version 2 plan-add-role -r $CONTROL_ROLE_ID $PLAN_ID
++    tuskar --tuskar-api-version 2 plan-add-role -r $COMPUTE_ROLE_ID $PLAN_ID
++    tuskar --tuskar-api-version 2 plan-add-role -r $CONTROL_ROLE_ID $PLAN_ID
+ 
+-if [ -n "$(tuskar --tuskar-api-version 2 role-list | grep cinder-storage)" ]; then
+-    BLOCK_STORAGE_IMAGE_ID=$(glance image-show overcloud-cinder-volume | grep id | awk '$2=="id" {print $4}' )
+-    BLOCK_STORAGE_ROLE_ID=$(tuskar --tuskar-api-version 2 role-list | awk '$4=="cinder-storage" {print $2}')
+-    tuskar --tuskar-api-version 2 plan-add-role -r $BLOCK_STORAGE_ROLE_ID $PLAN_ID
+-    tuskar --tuskar-api-version 2 plan-patch -A cinder-storage-1::Image=$BLOCK_STORAGE_IMAGE_ID $PLAN_ID
+-fi
+-
+-if [ -n "$(tuskar --tuskar-api-version 2 role-list | grep swift-storage)" ]; then
+-    OBJECT_STORAGE_IMAGE_ID=$(glance image-show overcloud-swift-storage | grep id | awk '$2=="id" {print $4}' )
+-    OBJECT_STORAGE_ROLE_ID=$(tuskar --tuskar-api-version 2 role-list | awk '$4=="swift-storage" {print $2}')
+-    tuskar --tuskar-api-version 2 plan-add-role -r $OBJECT_STORAGE_ROLE_ID $PLAN_ID
+-    tuskar --tuskar-api-version 2 plan-patch -A swift-storage-1::Image=$OBJECT_STORAGE_IMAGE_ID $PLAN_ID
+-fi
++    if [ -n "$(tuskar --tuskar-api-version 2 role-list | grep cinder-storage)" ]; then
++        BLOCK_STORAGE_IMAGE_ID=$(glance image-show overcloud-cinder-volume | grep id | awk '$2=="id" {print $4}' )
++        BLOCK_STORAGE_ROLE_ID=$(tuskar --tuskar-api-version 2 role-list | awk '$4=="cinder-storage" {print $2}')
++        tuskar --tuskar-api-version 2 plan-add-role -r $BLOCK_STORAGE_ROLE_ID $PLAN_ID
++        tuskar --tuskar-api-version 2 plan-patch -A cinder-storage-1::Image=$BLOCK_STORAGE_IMAGE_ID $PLAN_ID
++    fi
+ 
+-tuskar --tuskar-api-version 2 plan-patch -A compute-1::Image=$COMPUTE_IMAGE_ID $PLAN_ID
+-tuskar --tuskar-api-version 2 plan-patch -A controller-1::Image=$CONTROL_IMAGE_ID $PLAN_ID
++    if [ -n "$(tuskar --tuskar-api-version 2 role-list | grep swift-storage)" ]; then
++        OBJECT_STORAGE_IMAGE_ID=$(glance image-show overcloud-swift-storage | grep id | awk '$2=="id" {print $4}' )
++        OBJECT_STORAGE_ROLE_ID=$(tuskar --tuskar-api-version 2 role-list | awk '$4=="swift-storage" {print $2}')
++        tuskar --tuskar-api-version 2 plan-add-role -r $OBJECT_STORAGE_ROLE_ID $PLAN_ID
++        tuskar --tuskar-api-version 2 plan-patch -A swift-storage-1::Image=$OBJECT_STORAGE_IMAGE_ID $PLAN_ID
++    fi
+ 
+-echo "UNDERCLOUD_ADMIN_PASSWORD = \"${OS_PASSWORD}\"" >> $LOCAL_SETTINGS_FILE
+-echo "IRONIC_DISCOVERD_URL = \"http://127.0.0.1:5050\"" >> $LOCAL_SETTINGS_FILE
++    tuskar --tuskar-api-version 2 plan-patch -A compute-1::Image=$COMPUTE_IMAGE_ID $PLAN_ID
++    tuskar --tuskar-api-version 2 plan-patch -A controller-1::Image=$CONTROL_IMAGE_ID $PLAN_ID
++fi
+ 
+-DEPLOYMENT_MODE=$(os-apply-config --key deployment-mode --key-default=scale)
+-echo "DEPLOYMENT_MODE = \"${DEPLOYMENT_MODE}\"" >> $LOCAL_SETTINGS_FILE
++LOCAL_SETTINGS_FILE=$HORIZON_VENV_DIR/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py
++if [ -z "$(grep UNDERCLOUD_ADMIN_PASSWORD $LOCAL_SETTINGS_FILE)" ]; then
++    echo "UNDERCLOUD_ADMIN_PASSWORD = \"${OS_PASSWORD}\"" >> $LOCAL_SETTINGS_FILE
++fi
++if [ -z "$(grep IRONIC_DISCOVERD_URL $LOCAL_SETTINGS_FILE)" ]; then
++    echo "IRONIC_DISCOVERD_URL = \"http://127.0.0.1:5050\"" >> $LOCAL_SETTINGS_FILE
++fi
++if [ -z "$(grep DEPLOYMENT_MODE $LOCAL_SETTINGS_FILE)" ]; then
++    DEPLOYMENT_MODE=$(os-apply-config --key deployment-mode --key-default=scale)
++    echo "DEPLOYMENT_MODE = \"${DEPLOYMENT_MODE}\"" >> $LOCAL_SETTINGS_FILE
++fi
+ 
+ DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $DJANGO_ADMIN collectstatic --noinput
+ DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $DJANGO_ADMIN compress --force
diff --git a/openstack-tripleo-image-elements.spec b/openstack-tripleo-image-elements.spec
index 377f096..63eefc9 100644
--- a/openstack-tripleo-image-elements.spec
+++ b/openstack-tripleo-image-elements.spec
@@ -4,7 +4,7 @@
 Name:		openstack-tripleo-image-elements
 Summary:	OpenStack TripleO Image Elements for diskimage-builder
 Version:	0.8.10
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://wiki.openstack.org/wiki/TripleO
@@ -19,6 +19,7 @@ Patch0006: 0006-Add-package-install-support-for-tuskar-ui.patch
 Patch0007: 0007-Make-rdo-release-install-safe.patch
 Patch0008: 0008-Change-how-SELinux-policies-are-compiled.patch
 Patch0009: 0009-Simplify-keepalived-custom-policy.patch
+Patch0010: 0010-Make-101-tuskar-ui-re-runnable.patch
 
 BuildArch:	noarch
 BuildRequires:	python
@@ -44,6 +45,7 @@ program.
 %patch0007 -p1
 %patch0008 -p1
 %patch0009 -p1
+%patch0010 -p1
 
 %build
 %{__python} setup.py build
@@ -95,6 +97,9 @@ true
 %{_datadir}/tripleo-image-elements
 
 %changelog
+* Fri Oct 24 2014 James Slagle <jslagle at redhat.com> 0.8.10-5
+- Make 101-tuskar-ui re-runnable
+
 * Thu Oct 23 2014 James Slagle <jslagle at redhat.com> 0.8.10-4
 - Update %post script

More information about the scm-commits mailing list