Hello community, here is the log from the commit of package openstack-utils for openSUSE:Factory checked in at 2014-01-20 07:52:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-utils (Old) and /work/SRC/openSUSE:Factory/.openstack-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-utils/openstack-utils.changes 2013-11-20 11:13:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-utils.new/openstack-utils.changes 2014-01-23 15:50:49.000000000 +0100 @@ -2 +2,38 @@ -Thu Nov 14 00:35:04 UTC 2013 - [email protected] +Thu Jan 16 00:58:13 UTC 2014 - [email protected] + +- Update to latest git (7c70ed8): + + report status of openstack-cinder-backup on >= Havana + +------------------------------------------------------------------- +Fri Jan 10 11:57:57 UTC 2014 - [email protected] + +- Update to latest git (0843f28): + + fixes bz 1044155 + + ensure correct permissions on $APP-manage.log + + bump release and add NEWS + +------------------------------------------------------------------- +Fri Jan 10 11:57:55 UTC 2014 - [email protected] + +- Rebased patches: + + fix-db.patch (only offset) + +------------------------------------------------------------------- +Thu Nov 21 01:09:37 UTC 2013 - [email protected] + +- Update to latest git (6862401): + + openstack-status: refactor printing of service status + + openstack-status: display nova's view of its services and networks + + openstack-db: allow control of the heat database + + allow control of the neutron database + + bump release number + +------------------------------------------------------------------- +Thu Nov 21 01:09:35 UTC 2013 - None + +- Rebased patches: + + patches/fix-db.patch (only offset) + + fix-db.patch (manually) + +------------------------------------------------------------------- +Thu Nov 14 01:01:32 UTC 2013 - [email protected] @@ -8 +45,6 @@ -Wed Nov 13 09:37:07 UTC 2013 - [email protected] +Wed Nov 13 09:23:43 UTC 2013 - [email protected] + +- Add refresh_patches service + +------------------------------------------------------------------- +Fri Nov 1 13:40:49 UTC 2013 - [email protected] @@ -10,2 +52,3 @@ -- Drop changesrevision from service file, the implementation in tar_scm - changed +- Fix openstack-db to give proper bug address and invocation + of manage command. + (updated patch fix-db.patch) Old: ---- openstack-utils-2013.2.1+git.1384359061.a943b8a.tar.gz New: ---- openstack-utils-2013.2.3+git.1389795372.7c70ed8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-utils.spec ++++++ --- /var/tmp/diff_new_pack.VMcKB5/_old 2014-01-23 15:50:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VMcKB5/_new 2014-01-23 15:50:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openstack-utils # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: openstack-utils -Version: 2013.2.1+git.1384359061.a943b8a +Version: 2013.2.3+git.1389795372.7c70ed8 Release: 0 Summary: Helper utilities for OpenStack service License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.VMcKB5/_old 2014-01-23 15:50:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VMcKB5/_new 2014-01-23 15:50:50.000000000 +0100 @@ -6,13 +6,14 @@ <param name="versionformat">@PARENT_TAG@+git.%ct.%h</param> <param name="revision">master</param> </service> - <service mode="disabled" name="recompress"> <param name="file">openstack-utils-*.tar</param> <param name="compression">gz</param> </service> - <service mode="disabled" name="set_version"> <param name="basename">openstack-utils</param> </service> + <service name="refresh_patches" mode="disabled"> + <param name="changesgenerate">enable</param> + </service> </services> ++++++ fix-db.patch ++++++ --- /var/tmp/diff_new_pack.VMcKB5/_old 2014-01-23 15:50:50.000000000 +0100 +++ /var/tmp/diff_new_pack.VMcKB5/_new 2014-01-23 15:50:50.000000000 +0100 @@ -10,16 +10,16 @@ usage() { -@@ -98,7 +99,7 @@ db_manage() +@@ -119,7 +120,7 @@ db_manage() db_cmd="db_$cmd" fi # Run as $APP user so any newly created (log) files have correct ownership - runuser -s /bin/sh $APP -c "$APP-manage $db_cmd" -+ su -s /bin/sh -c "$APP-manage $db_sync" openstack-$APP ++ su -s /bin/sh -c "$APP-manage $db_cmd" openstack-$APP } db_sync() { db_manage sync; } -@@ -117,10 +118,15 @@ if [ "$MODE" = 'sync' ]; then +@@ -147,10 +148,15 @@ if [ "$MODE" = 'sync' ]; then fi install_mysql_server() { @@ -37,7 +37,7 @@ fi } -@@ -173,15 +179,20 @@ fi +@@ -205,15 +211,20 @@ fi # Make sure MySQL is installed. NEW_MYSQL_INSTALL=0 @@ -61,7 +61,7 @@ exit 0 ;; *) -@@ -197,7 +208,7 @@ fi +@@ -229,7 +240,7 @@ fi # Make sure mysqld is running. @@ -70,7 +70,7 @@ if [ -z "${ASSUME_YES}" ]; then printf "mysqld is not running. Would you like to start it now? (y/n): " read response -@@ -214,10 +225,10 @@ if ! service_running mysqld; then +@@ -246,10 +257,10 @@ if ! service_running mysqld; then esac fi @@ -83,3 +83,12 @@ fi +@@ -362,7 +373,7 @@ if [ "$MODE" = 'init' ]; then + if ! echo "SELECT * FROM migrate_version;" | + mysql -u $APP --password=${MYSQL_APP_PW} $APP > /dev/null; then + echo "Final sanity check failed." >&2 +- echo "Please file a bug report on bugzilla.redhat.com against the openstack-$APP package." >&2 ++ echo "Please file a bug report on bugzilla.novell.com against the openstack-$APP package." >&2 + exit 1 + fi + ++++++ openstack-utils-2013.2.1+git.1384359061.a943b8a.tar.gz -> openstack-utils-2013.2.3+git.1389795372.7c70ed8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-utils-2013.2.1+git.1384359061.a943b8a/Makefile new/openstack-utils-2013.2.3+git.1389795372.7c70ed8/Makefile --- old/openstack-utils-2013.2.1+git.1384359061.a943b8a/Makefile 2013-10-29 14:57:31.000000000 +0100 +++ new/openstack-utils-2013.2.3+git.1389795372.7c70ed8/Makefile 2014-01-10 12:57:55.000000000 +0100 @@ -1,6 +1,6 @@ name = openstack-utils version = 2013.2 -release = 1 +release = 3 all: mkdir ${name}-${version}-${release} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-utils-2013.2.1+git.1384359061.a943b8a/NEWS new/openstack-utils-2013.2.3+git.1389795372.7c70ed8/NEWS --- old/openstack-utils-2013.2.1+git.1384359061.a943b8a/NEWS 2013-11-14 01:35:03.000000000 +0100 +++ new/openstack-utils-2013.2.3+git.1389795372.7c70ed8/NEWS 2014-01-16 01:58:11.000000000 +0100 @@ -1,9 +1,19 @@ -2013.2-? ??-??-???? +201X.X-X dd-mm-yyyy + openstack-status: + Report status of openstack-cinder-backup on >= Havana + +2013.2-3 19-01-2014 + openstack-db: + Avoid pemissions issues with 'init' and 'sync' + +2013.2-2 20-11-2013 openstack-status: print ceilometer alarm services status don't print nova volume status when not installed + display nova's view of its services and networks openstack-db: Add the --update option to sync the database + Allow control of the 'heat' and 'neutron' databases openstack-service: Add a new util to control enabled openstack services diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-utils-2013.2.1+git.1384359061.a943b8a/utils/openstack-config new/openstack-utils-2013.2.3+git.1389795372.7c70ed8/utils/openstack-config --- old/openstack-utils-2013.2.1+git.1384359061.a943b8a/utils/openstack-config 2013-10-29 14:57:31.000000000 +0100 +++ new/openstack-utils-2013.2.3+git.1389795372.7c70ed8/utils/openstack-config 2013-11-27 01:37:54.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (C) 2012, Red Hat, Inc. -# Alan Pevec <[email protected]> +# Copyright (C) 2013, Red Hat, Inc. +# Pádraig Brady <[email protected]> # # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-utils-2013.2.1+git.1384359061.a943b8a/utils/openstack-db new/openstack-utils-2013.2.3+git.1389795372.7c70ed8/utils/openstack-db --- old/openstack-utils-2013.2.1+git.1384359061.a943b8a/utils/openstack-db 2013-10-29 14:57:31.000000000 +0100 +++ new/openstack-utils-2013.2.3+git.1389795372.7c70ed8/utils/openstack-db 2014-01-10 12:57:55.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2011 - 2012, Red Hat, Inc. +# Copyright (C) 2011 - 2013, Red Hat, Inc. # Russell Bryant <[email protected]> # Alan Pevec <[email protected]> # @@ -82,15 +82,36 @@ fi case "$APP" in - nova|glance|keystone|cinder) ;; + nova|glance|keystone|cinder|heat|neutron) ;; *) printf "Unrecognized --service $APP\n" >&2 - printf "Please specify nova|glance|keystone|cinder\n" >&2 + printf "Please specify nova|glance|keystone|cinder|heat|neutron\n" >&2 exit 1 ;; esac +neutron_manage() { + cmd="$*" + [ "$cmd" = 'version' ] && db_cmd='current' + [ "$cmd" = 'sync' ] && db_cmd='upgrade head' + + # FIXME: Adjust neutron-db-manage so it doesn't need explicit configs + conf_opts='' + for conf in '/usr/share/neutron/neutron-dist.conf' \ + '/etc/neutron/neutron.conf' \ + '/etc/neutron/plugin.ini'; do + test -e "$conf" && conf_opts="$conf_opts --config-file $conf" + done + + runuser -s /bin/sh $APP -c "$APP-db-manage $conf_opts $db_cmd" +} + db_manage() { + # ensure $APP-manage.log has correct permissions + test -e /var/log/$APP/$APP-manage.log && chown $APP: /var/log/$APP/$APP-manage.log || : + + [ "${APP}" = "neutron" ] && { neutron_manage "$@"; return; } + cmd="$1" if [ "${APP}" = "nova" ] || [ "${APP}" = "cinder" ]; then db_cmd="db $cmd" @@ -102,7 +123,16 @@ } db_sync() { db_manage sync; } -db_synced() { db_manage version >/dev/null 2>&1; } +db_synced() { + version=$(db_manage version) || return 1 + + # Neutron doesn't currently set a version in the DB by default. + # So ensure this is done before we consider it synced + if [ "${APP}" = "neutron" ]; then + neutron_ver=$(printf '%s\n' "$version" | awk '/Current revision/ {print $NF}') + test "$neutron_ver" != 'None' + fi +} if [ "$MODE" = 'sync' ]; then if ! db_synced; then @@ -144,6 +174,8 @@ : ${MYSQL_APP_PW=$MYSQL_APP_PW_DEFAULT} if [ "${APP}" = "glance" ]; then APP_CONFIG="/etc/$APP/$APP-registry.conf /etc/$APP/$APP-api.conf" +elif [ "${APP}" = "neutron" ]; then + APP_CONFIG="/etc/$APP/$APP.conf /etc/$APP/plugin.ini" else APP_CONFIG="/etc/$APP/$APP.conf" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-utils-2013.2.1+git.1384359061.a943b8a/utils/openstack-status new/openstack-utils-2013.2.3+git.1389795372.7c70ed8/utils/openstack-status --- old/openstack-utils-2013.2.1+git.1384359061.a943b8a/utils/openstack-status 2013-11-14 01:35:03.000000000 +0100 +++ new/openstack-utils-2013.2.3+git.1389795372.7c70ed8/utils/openstack-status 2014-01-16 01:58:11.000000000 +0100 @@ -83,38 +83,32 @@ esac } -check_sysv_svc() { +check_svc() { - printf '%-40' "$1:" - bootstatus=$(service_enabled $1 && echo enabled || echo disabled) - status=$(service $1 status >/dev/null 2>/dev/null ; lsb_to_string $?) - if [ "$bootstatus" = 'disabled' ]; then - bootstatus=' (disabled on boot)' - else - bootstatus='' - fi - printf '%s\n' "$status$bootstatus" -} + printf '%-40s' "$1:" -check_svc() { + bootstatus=$(service_enabled $1 && echo enabled || echo disabled) - if [ ! "$systemctl" ]; then - check_sysv_svc "$@" - return + if [ "$systemctl" ]; then + status=$(systemctl is-active $1.service 2>/dev/null) + # For "simple" systemd services you get + # "unknown" if you query a non enabled service + if [ "$bootstatus" = 'disabled' ]; then + [ $status = 'unknown' ] && status='inactive' + fi + else + status=$(service $1 status >/dev/null 2>/dev/null ; lsb_to_string $?) fi - printf '%-40s' "$1:" - bootstatus=$(service_enabled $1 && echo enabled || echo disabled) - status=$(systemctl is-active $1.service 2>/dev/null) - # For "simple" systemd services you get - # "unknown" if you query a non enabled service if [ "$bootstatus" = 'disabled' ]; then - bootstatus=' (disabled on boot)' - [ $status = 'unknown' ] && status='inactive' + bootstatus='(disabled on boot)' else bootstatus='' fi - printf '%s\n' "$status$bootstatus" + + test "$bootstatus" && status_pad=10 || status_pad=0 + + printf "%-${status_pad}s%s\n" "$status" "$bootstatus" } @@ -174,7 +168,8 @@ if test "$cinder"; then printf "== Cinder services ==\n" - for service in api scheduler volume; do + service_installed openstack-cinder-backup && backup=backup + for service in api scheduler volume $backup; do check_svc openstack-cinder-$service done fi @@ -219,6 +214,12 @@ if ! test "$keystonerc" && ! test "$NOVA_USERNAME"; then test "$keystone" || echo "Warning novarc not sourced" >&2 else + printf "== Nova managed services ==\n" + nova service-list + + printf "== Nova networks ==\n" + nova network-list + printf "== Nova instance flavors ==\n" # Check direct access nova flavor-list -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
