[openstack-tripleo-image-elements] Updated patches from master-patches

slagle slagle at fedoraproject.org
Mon Oct 20 16:53:14 UTC 2014 

commit e9cc2df978a4d0427dafc94b589ab855cfdb002a
Author: James Slagle <jslagle at redhat.com>
Date:   Mon Oct 20 12:52:59 2014 -0400

    Updated patches from master-patches

 0006-Add-package-install-support-for-tuskar.patch  |   32 +++++++++-
 ...Add-package-install-support-for-tuskar-ui.patch |   67 ++++++++++++++++++-
 2 files changed, 92 insertions(+), 7 deletions(-)
---
diff --git a/0006-Add-package-install-support-for-tuskar.patch b/0006-Add-package-install-support-for-tuskar.patch
index b6dcdda..8b66f07 100644
--- a/0006-Add-package-install-support-for-tuskar.patch
+++ b/0006-Add-package-install-support-for-tuskar.patch
@@ -1,21 +1,26 @@
-From 13e41ab38fd067570a99ab21e50e5c2c00674a07 Mon Sep 17 00:00:00 2001
+From b5d4558ae204f2712b56016ad1c1c6a64140c394 Mon Sep 17 00:00:00 2001
 From: James Slagle <jslagle at redhat.com>
 Date: Fri, 17 Oct 2014 11:56:12 -0400
 Subject: [PATCH] Add package install support for tuskar
 
-Support installing from packages and source for the tuskar element.
+Support installing from packages and source for the tuskar element. Adds
+svc-map support for tuskar-api to support the service being named
+differently between source and package installs.
 
 Change-Id: I189748f91b17e398d15b91bd1bd6ce2f2de02a73
 ---
  elements/tuskar/install.d/100-tuskar-api                     | 12 ------------
  .../install.d/tuskar-package-install/package-installs-tuskar |  1 +
  .../tuskar/install.d/tuskar-source-install/100-tuskar-api    | 12 ++++++++++++
+ .../tuskar/os-refresh-config/post-configure.d/100-tuskar-api |  5 ++---
  elements/tuskar/pkg-map                                      |  5 +++++
- 4 files changed, 18 insertions(+), 12 deletions(-)
+ elements/tuskar/svc-map                                      |  2 ++
+ 6 files changed, 22 insertions(+), 15 deletions(-)
  delete mode 100755 elements/tuskar/install.d/100-tuskar-api
  create mode 100644 elements/tuskar/install.d/tuskar-package-install/package-installs-tuskar
  create mode 100755 elements/tuskar/install.d/tuskar-source-install/100-tuskar-api
  create mode 100644 elements/tuskar/pkg-map
+ create mode 100644 elements/tuskar/svc-map
 
 diff --git a/elements/tuskar/install.d/100-tuskar-api b/elements/tuskar/install.d/100-tuskar-api
 deleted file mode 100755
@@ -60,6 +65,19 @@ index 0000000..3bdcd8b
 +
 +ln -s $TUSKAR_VENV_DIR/bin/tuskar-dbsync /usr/local/bin/tuskar-dbsync
 +ln -s $TUSKAR_VENV_DIR/bin/tuskar-load-roles /usr/local/bin/tuskar-load-roles
+diff --git a/elements/tuskar/os-refresh-config/post-configure.d/100-tuskar-api b/elements/tuskar/os-refresh-config/post-configure.d/100-tuskar-api
+index 9ce0d2d..989328f 100755
+--- a/elements/tuskar/os-refresh-config/post-configure.d/100-tuskar-api
++++ b/elements/tuskar/os-refresh-config/post-configure.d/100-tuskar-api
+@@ -1,6 +1,5 @@
+ #!/bin/bash
+ set -eux
+ 
+-os-svc-enable -n tuskar-api
+-
+-service tuskar-api restart
++os-svc-enable -an tuskar-api
++os-svc-restart -an tuskar-api
 diff --git a/elements/tuskar/pkg-map b/elements/tuskar/pkg-map
 new file mode 100644
 index 0000000..bf7285b
@@ -71,3 +89,11 @@ index 0000000..bf7285b
 +    "tuskar_package": "openstack-tuskar"
 +  }
 +}
+diff --git a/elements/tuskar/svc-map b/elements/tuskar/svc-map
+new file mode 100644
+index 0000000..7053e55
+--- /dev/null
++++ b/elements/tuskar/svc-map
+@@ -0,0 +1,2 @@
++tuskar-api:
++    default: openstack-tuskar-api
diff --git a/0007-Add-package-install-support-for-tuskar-ui.patch b/0007-Add-package-install-support-for-tuskar-ui.patch
index f3934b6..9ec317c 100644
--- a/0007-Add-package-install-support-for-tuskar-ui.patch
+++ b/0007-Add-package-install-support-for-tuskar-ui.patch
@@ -1,15 +1,18 @@
-From a575051653a2e4d017749dc487125cd6c777a785 Mon Sep 17 00:00:00 2001
+From 0432b81b19c75bd73959108dee0e2157fe79e403 Mon Sep 17 00:00:00 2001
 From: James Slagle <jslagle at redhat.com>
 Date: Fri, 17 Oct 2014 11:59:43 -0400
 Subject: [PATCH] Add package install support for tuskar-ui
 
 Support installing from packages and source for the tuskar-ui element.
+The post-configure.d script is also updated to only use the virtualenv
+for Horizon if the $HORIZON_VENV_DIR environment variable is defined.
 
 Change-Id: If42ca22fb173df0b35155ce760b94c1c6f2f9d28
 ---
- .../install.d/tuskar-ui-package-install/package-installs-tuskar-ui   | 1 +
- elements/tuskar-ui/pkg-map                                           | 5 +++++
- 2 files changed, 6 insertions(+)
+ .../package-installs-tuskar-ui                     |  1 +
+ .../post-configure.d/101-tuskar-ui                 | 33 ++++++++++++++--------
+ elements/tuskar-ui/pkg-map                         |  5 ++++
+ 3 files changed, 28 insertions(+), 11 deletions(-)
  create mode 100644 elements/tuskar-ui/install.d/tuskar-ui-package-install/package-installs-tuskar-ui
  create mode 100644 elements/tuskar-ui/pkg-map
 
@@ -20,6 +23,62 @@ index 0000000..ce541f4
 +++ b/elements/tuskar-ui/install.d/tuskar-ui-package-install/package-installs-tuskar-ui
 @@ -0,0 +1 @@
 +tuskar_ui_package
+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 469329e..375ea0b 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
+@@ -2,10 +2,19 @@
+ set -eu
+ set -o pipefail
+ 
+-set +u
+-source $HORIZON_VENV_DIR/bin/activate
++if [ -n "${HORIZON_VENV_DIR:-}" ]; then
++    set +u
++    source $HORIZON_VENV_DIR/bin/activate
++    set -u
++    LOCAL_SETTINGS_FILE=$HORIZON_VENV_DIR/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py
++    DJANGO_ADMIN=django-admin.py
++else
++    export PYTHONPATH=/usr/share/openstack-dashboard
++    LOCAL_SETTINGS_FILE=/etc/horizon/local_settings.py
++    DJANGO_ADMIN=django-admin
++fi
++
+ source /root/stackrc
+-set -u
+ 
+ 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}' )
+@@ -34,18 +43,20 @@ 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
+ 
+-echo "UNDERCLOUD_ADMIN_PASSWORD = \"${OS_PASSWORD}\"" >> $HORIZON_VENV_DIR/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py
+-echo "IRONIC_DISCOVERD_URL = \"http://127.0.0.1:5050\"" >> $HORIZON_VENV_DIR/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py
++echo "UNDERCLOUD_ADMIN_PASSWORD = \"${OS_PASSWORD}\"" >> $LOCAL_SETTINGS_FILE
++echo "IRONIC_DISCOVERD_URL = \"http://127.0.0.1:5050\"" >> $LOCAL_SETTINGS_FILE
+ 
+ DEPLOYMENT_MODE=$(os-apply-config --key deployment-mode --key-default=scale)
+-echo "DEPLOYMENT_MODE = \"${DEPLOYMENT_MODE}\"" >> $HORIZON_VENV_DIR/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py
++echo "DEPLOYMENT_MODE = \"${DEPLOYMENT_MODE}\"" >> $LOCAL_SETTINGS_FILE
+ 
+-DJANGO_SETTINGS_MODULE=openstack_dashboard.settings django-admin.py collectstatic --noinput
+-DJANGO_SETTINGS_MODULE=openstack_dashboard.settings django-admin.py compress --force
++DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $DJANGO_ADMIN collectstatic --noinput
++DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $DJANGO_ADMIN compress --force
+ 
+-set +u
+-deactivate
+-set -u
++if [ -n "${HORIZON_VENV_DIR:-}" ]; then
++    set +u
++    deactivate
++    set -u
++fi
+ 
+ os-svc-enable -n apache2
+ os-svc-restart -n apache2
 diff --git a/elements/tuskar-ui/pkg-map b/elements/tuskar-ui/pkg-map
 new file mode 100644
 index 0000000..2ead606

More information about the scm-commits mailing list