Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openstack-utils for openSUSE:Factory
checked in at 2021-05-10 15:37:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-utils (Old)
and /work/SRC/openSUSE:Factory/.openstack-utils.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-utils"
Mon May 10 15:37:15 2021 rev:13 rq:889957 version:2017.11+git.1480685772.571a0f8
Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-utils/openstack-utils.changes
2015-07-12 22:52:27.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.openstack-utils.new.2988/openstack-utils.changes
2021-05-10 15:39:29.397537253 +0200
@@ -1,0 +2,104 @@
+Mon Aug 20 21:02:45 UTC 2018 - [email protected]
+
+- Fixed linter complaints about licenses
+
+-------------------------------------------------------------------
+Sun Dec 04 12:12:10 UTC 2016 - [email protected]
+
+- Update to version 2016.11+git.1480685772.571a0f8:
+ * keystone command is no longer part of openstack
+
+-------------------------------------------------------------------
+Wed Sep 21 13:31:52 UTC 2016 - [email protected]
+
+- Update to version openstack-utils-2016.11+git.1473418843.89a5245
+
+-------------------------------------------------------------------
+Wed Sep 21 13:26:57 UTC 2016 - [email protected]
+
+- Update to version 2016.11+git.1473418843.89a5245:
+ + Remove man-page for openstack-db
+
+-------------------------------------------------------------------
+Mon Aug 08 12:38:50 UTC 2016 - [email protected]
+
+- Update to version 2016.11+git.1467979893.0f679b2:
+ * openstack-db: remove out-of-date utility
+ * 2016.1-1 release
+
+-------------------------------------------------------------------
+Mon Aug 8 12:38:36 UTC 2016 - [email protected]
+
+- drop fix-db.patch - this does not exist anymore upstream
+
+-------------------------------------------------------------------
+Sun Jun 19 01:37:34 UTC 2016 - [email protected]
+
+- Update to version 2015.21+git.1466261810.4ed8f0b:
+ + Adds status check for neutron-lbaasv2-agent
+
+-------------------------------------------------------------------
+Wed Jan 06 02:01:17 UTC 2016 - [email protected]
+
+- Update to version 2015.21+git.1451948894.092baf8:
+ + Determine MySQL variant in use in openstack-status
+
+-------------------------------------------------------------------
+Tue Jan 05 01:57:25 UTC 2016 - [email protected]
+
+- Update to version 2015.21+git.1451945258.8aed0bd:
+ + Make 'openstack-service help' pull up man page
+
+-------------------------------------------------------------------
+Tue Dec 08 03:11:13 UTC 2015 - [email protected]
+
+- Update to version 2015.21+git.1449495953.d861259:
+ + bump release number
+
+-------------------------------------------------------------------
+Fri Jul 31 13:59:29 UTC 2015 - [email protected]
+
+- Update to version 2014.21+git.1438267640.8b362f2:
+ + openstack-status: determine sahara services to list
+
+-------------------------------------------------------------------
+Thu Jul 30 01:28:58 UTC 2015 - [email protected]
+
+- Update to version 2014.21+git.1438171559.5992126:
+ + list sahara-all status rather than sahara-api
+
+-------------------------------------------------------------------
+Thu Jul 02 00:53:34 UTC 2015 - [email protected]
+
+- Update to version 2014.21+git.1435744397.5f55639:
+ + doc: mention that openstack-config is deprecated
+
+-------------------------------------------------------------------
+Wed Apr 29 23:46:30 UTC 2015 - [email protected]
+
+- Update to version 2014.21+git.1430321875.f0d3722:
+ + openstack-status: list tuskar and ironic services
+ + openstack-status: list nova instances for all tenants
+
+-------------------------------------------------------------------
+Thu Mar 19 01:34:43 UTC 2015 - [email protected]
+
+- Update to version 2014.21+git.1422967986.34f7d65:
+ + openstack-status: list all nova optional services
+
+-------------------------------------------------------------------
+Tue Dec 9 00:44:15 UTC 2014 - [email protected]
+
+- Update to version 2014.2.1+git.1418053814.79fb98c:
+ + bumpe release number
+ + NEWS: document changes since last release
+
+-------------------------------------------------------------------
+Wed Oct 29 00:36:28 UTC 2014 - [email protected]
+
+- Update to version 2014.1.3+git.1414505925.3a2029e:
+ + openstack-service: mention recent change in NEWS
+ + openstack-status: list "target" service status
+ + openstack-status: fix detection of systemd installed services
+
+-------------------------------------------------------------------
Old:
----
fix-db.patch
openstack-utils-2014.1.3+git.1409246608.bd34653.tar.gz
New:
----
openstack-utils-2017.11+git.1480685772.571a0f8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-utils.spec ++++++
--- /var/tmp/diff_new_pack.f9HdiB/_old 2021-05-10 15:39:29.801535601 +0200
+++ /var/tmp/diff_new_pack.f9HdiB/_new 2021-05-10 15:39:29.801535601 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openstack-utils
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,19 +12,20 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+%define version_unconverted 2017.11+git.1480685772.571a0f8
+
Name: openstack-utils
-Version: 2014.1.3+git.1409246608.bd34653
+Version: 2017.11+git.1480685772.571a0f8
Release: 0
Summary: Helper utilities for OpenStack service
License: Apache-2.0
Group: Development/Libraries/Python
-Url: https://github.com/fedora-openstack/openstack-utils
+Url: https://github.com/redhat-openstack/openstack-utils
Source: %{name}-%{version}.tar.gz
-Patch1: fix-db.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Requires: crudini
@@ -33,12 +34,10 @@
Utilities to aid the setup and configuration of OpenStack packages.
- openstack-config - Manipulate the openstack ini files
- - openstack-db - Setup or delete the database for a specified service
- openstack-status - Give an overview of the status of installed services
%prep
%setup -q
-%patch1 -p0
%build
@@ -50,13 +49,12 @@
%files
%defattr(-,root,root)
-%doc README.md NEWS LICENSE
+%doc README.md NEWS
+%license LICENSE
%{_bindir}/openstack-config
-%{_bindir}/openstack-db
%{_bindir}/openstack-service
%{_bindir}/openstack-status
%{_mandir}/man1/openstack-config.1%{?ext_man}
-%{_mandir}/man1/openstack-db.1%{?ext_man}
%{_mandir}/man1/openstack-service.1.gz
%{_mandir}/man1/openstack-status.1%{?ext_man}
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.f9HdiB/_old 2021-05-10 15:39:29.841535436 +0200
+++ /var/tmp/diff_new_pack.f9HdiB/_new 2021-05-10 15:39:29.841535436 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">git://github.com/redhat-openstack/openstack-utils.git</param>
- <param name="changesrevision">bd34653b5c</param>
+ <param
name="changesrevision">dc38dd697e16681a85c1c322dd154fa65824eb40</param>
</service>
</servicedata>
\ No newline at end of file
++++++ openstack-utils-2014.1.3+git.1409246608.bd34653.tar.gz ->
openstack-utils-2017.11+git.1480685772.571a0f8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-utils-2014.1.3+git.1409246608.bd34653/Makefile
new/openstack-utils-2017.11+git.1480685772.571a0f8/Makefile
--- old/openstack-utils-2014.1.3+git.1409246608.bd34653/Makefile
2014-06-25 02:00:56.703807000 +0200
+++ new/openstack-utils-2017.11+git.1480685772.571a0f8/Makefile 2016-12-02
14:36:12.000000000 +0100
@@ -1,6 +1,6 @@
name = openstack-utils
-version = 2014.1
-release = 3
+version = 2016.1
+release = 1
all:
mkdir ${name}-${version}-${release}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/openstack-utils-2014.1.3+git.1409246608.bd34653/NEWS
new/openstack-utils-2017.11+git.1480685772.571a0f8/NEWS
--- old/openstack-utils-2014.1.3+git.1409246608.bd34653/NEWS 2014-06-25
02:00:56.703807000 +0200
+++ new/openstack-utils-2017.11+git.1480685772.571a0f8/NEWS 2016-12-02
14:36:12.000000000 +0100
@@ -1,3 +1,27 @@
+2016.1-1 11-07-2016
+ openstack-db:
+ remove out-of-date utility
+ openstack-status:
+ autodetect mysql variant
+ add status check for lbaasv2 agent
+
+2015.2-1 07-12-2015
+ openstack-status:
+ list all nova optional services, now including:
+ cells console consoleauth xvpvncproxy spicehtml5proxy serialproxy
+ list tuskar and ironic services
+ list nova instances for all tenants, not just current openstack user
+ list enabled sahara services rather than just sahara-api
+
+2014.2-1 08-12-2014
+ openstack-status:
+ don't display status for uninstalled services on systemd platforms
+ list "target" service status instead of obsolete "tgtd"
+ list openstack-ceilometer-notification service
+ list neutron-metering-agent service
+ openstack-service:
+ neutron-ovs-cleanup is excluded from restart as that breaks tap devices
+
2014.1-3 23-06-2014
openstack-service:
simplify "status" output on systemd platforms
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-utils-2014.1.3+git.1409246608.bd34653/README.md
new/openstack-utils-2017.11+git.1480685772.571a0f8/README.md
--- old/openstack-utils-2014.1.3+git.1409246608.bd34653/README.md
2014-08-29 01:36:20.560000000 +0200
+++ new/openstack-utils-2017.11+git.1480685772.571a0f8/README.md
2016-12-02 14:36:12.000000000 +0100
@@ -4,6 +4,5 @@
Helper utilities for OpenStack services on Fedora/RHEL distros
* openstack-config - Manipulate the openstack ini files
-* openstack-db - Create/Update/Delete, the database for a service
* openstack-status - Give an overview of the status of installed
services
* openstack-service - Control enabled openstack services
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-utils-2014.1.3+git.1409246608.bd34653/man/openstack-config.1
new/openstack-utils-2017.11+git.1480685772.571a0f8/man/openstack-config.1
--- old/openstack-utils-2014.1.3+git.1409246608.bd34653/man/openstack-config.1
2014-03-06 16:10:31.528000000 +0100
+++ new/openstack-utils-2017.11+git.1480685772.571a0f8/man/openstack-config.1
2016-12-02 14:36:12.000000000 +0100
@@ -16,3 +16,6 @@
\fB\-\-del\fR
.IP
Remove the specified parameter or section
+.SH SEE ALSO
+This command is deprecated.
+Please consider using the more featureful crudini(1).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-utils-2014.1.3+git.1409246608.bd34653/man/openstack-db.1
new/openstack-utils-2017.11+git.1480685772.571a0f8/man/openstack-db.1
--- old/openstack-utils-2014.1.3+git.1409246608.bd34653/man/openstack-db.1
2014-03-06 16:10:31.528000000 +0100
+++ new/openstack-utils-2017.11+git.1480685772.571a0f8/man/openstack-db.1
1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-.TH openstack-db "1" "April 2012" "openstack-utils" "User Commands"
-.SH NAME
-openstack-db - Set up a local database for use with an OpenStack service
-.SH SYNOPSIS
-.B openstack-db
-\fI--service <service> --init|--drop \fR[\fIoptions\fR]
-.SH DESCRIPTION
-Set up a local database (MySQL) for use with openstack\-<service>.
-This script will create a '<service>' database that is accessible
-only on localhost by user '<service>' with password '<service>'.
-The setup of a database with a multi\-server OpenStack installation
-is outside of the scope of this simple helper script.
-.SH OPTIONS
-.HP
-\fB\-\-help\fR | \fB\-h\fR
-.IP
-Print usage information.
-.HP
-\fB\-\-drop\fR
-.IP
-Drop the database.
-.HP
-\fB\-\-init\fR
-.IP
-Initialise the database.
-.HP
-\fB\-\-update\fR
-.IP
-Update an initialised database.
-.HP
-\fB\-\-password\fR <pw> | \fB\-p\fR <pw>
-.IP
-Specify the password for user that will be used
-to connect database for the service. By default the
-<service> parameter is used for the password.
-.HP
-\fB\-\-rootpw\fR <pw> | \fB\-r\fR <pw>
-.IP
-Specify the root database password.
-If the script installs the database server, it will set the root password to
this value
-instead of prompting for a password. If the database server is
-already installed, this password will be used to connect to the
-database instead of having to prompt for it.
-.HP
-\fB\-\-service\fR <service>
-.IP
-Specify the openstack service to manipulate the database for.
-This option is mandatory.
-.HP
-\fB\-\-yes\fR | \fB\-y\fR
-.IP
-In cases where the script would normally ask for confirmation
-before doing something, such as installing the database server,
-just assume yes. This is useful if you want to run the script
-non\-interactively.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-db
new/openstack-utils-2017.11+git.1480685772.571a0f8/utils/openstack-db
--- old/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-db
2014-05-21 02:09:47.775807000 +0200
+++ new/openstack-utils-2017.11+git.1480685772.571a0f8/utils/openstack-db
1970-01-01 01:00:00.000000000 +0100
@@ -1,377 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2011 - 2013, Red Hat, Inc.
-# Russell Bryant <[email protected]>
-# Alan Pevec <[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
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-
-systemctl --version >/dev/null 2>&1 && systemctl=1
-
-usage() {
-
-cat << EOF
-Set up a local database (MySQL) for use with openstack-<service>.
-This script will create a '<service>' database that is accessible
-only on localhost by user '<service>' with password '<service>'.
-The setup of a database with a multi-server OpenStack installation
-is outside of the scope of this simple helper script.
-
-Usage: openstack-db --service <service> --init|--drop [options]
-Options:
- --help | -h
- Print usage information.
- --drop
- Drop the database.
- --init
- Initialise the database.
- --update
- Update an initialised database.
- --password <pw> | -p <pw>
- Specify the password for user that will be used
- to connect database for the service. By default the
- <service> parameter is used for the password.
- --rootpw <pw> | -r <pw>
- Specify the root database password. If the script installs
- the database server, it will set the root password to this value
- instead of prompting for a password. If the database server is
- already installed, this password will be used to connect to the
- database instead of having to prompt for it.
- --service <service>
- Specify the openstack service to manipulate the database for.
- This option is mandatory.
- --yes | -y
- In cases where the script would normally ask for confirmation
- before doing something, such as installing the database server,
- just assume yes. This is useful if you want to run the script
- non-interactively.
-EOF
-
- exit $1
-}
-
-while [ $# -gt 0 ]; do
- case "$1" in
- -h|--help) usage 0 ;;
- --drop) MODE='drop' ;;
- --init) MODE='init' ;;
- --update) MODE='sync' ;;
- --service) shift; APP=$1 ;;
- -p|--password) shift; MYSQL_APP_PW=$1 ;;
- -r|--rootpw) shift; MYSQL_ROOT_PW=$1 ;;
- -y|--yes) ASSUME_YES="yes" ;;
- *) shift ;; # ignore
- esac
- shift
-done
-
-# Check mandatory args set
-if [ ! "$MODE" ] || [ ! "$APP" ]; then
- usage 1
-fi
-
-case "$APP" in
- nova|glance|keystone|cinder|heat|neutron|trove) ;;
- *)
- printf "Unrecognized --service $APP\n" >&2
- printf "Please specify nova|glance|keystone|cinder|heat|neutron|trove\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"
- else
- 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"
-}
-
-db_sync() {
- if ! db_manage sync; then
- echo "Error updating the database. Please see /var/log/${APP}/ logs for
details." >&2
- exit 1
- fi
-}
-
-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
- echo "Can't determine the existing sync level." >&2
- echo "Please ensure the database is running and already initialised." >&2
- exit 1
- else
- db_sync
- echo "Complete!"
- exit
- fi
-fi
-
-install_mysql_server() {
- if [ -z "${ASSUME_YES}" ]; then
- yum install mysql-server
- else
- yum install -y mysql-server
- fi
-}
-
-start_service() {
- if test "$systemctl"; then
- systemctl start $1.service
- else
- service $1 start
- fi
-}
-
-service_running() {
- if test "$systemctl"; then
- systemctl status $1.service >/dev/null
- else
- service $1 status >/dev/null
- fi
-}
-
-MYSQL_APP_PW_DEFAULT="$APP"
-: ${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
-
-
-# Make sure a DB reset to mysql is OK
-
-if ! grep -q '^#* *\(sql_\)*connection *= *mysql://' ${APP_CONFIG}; then
- # If 'mysql' isn't mentioned in comment or setting
- if [ -z "${ASSUME_YES}" ]; then
- printf "$APP default DB is not mysql. Would you like to reset to mysql
now? (y/n): "
- read response
- case "$response" in
- y|Y)
- ;;
- n|N)
- echo "Aborting."
- exit 0
- ;;
- *)
- echo "Invalid response." >&2
- exit 1
- esac
- fi
-fi
-
-# Make sure MySQL is installed.
-
-NEW_MYSQL_INSTALL=0
-if ! rpm -q --whatprovides mysql-server > /dev/null; then
- if [ -z "${ASSUME_YES}" ]; then
- printf "mysql-server is not installed. Would you like to install it now?
(y/n): "
- read response
- case "$response" in
- y|Y)
- ;;
- n|N)
- echo "mysql-server must be installed. Please install it before
proceeding."
- exit 0
- ;;
- *)
- echo "Invalid response." >&2
- exit 1
- esac
- fi
-
- NEW_MYSQL_INSTALL=1
- install_mysql_server
-fi
-
-
-# Make sure mysqld is running.
-
-if ! service_running mysqld; then
- if [ -z "${ASSUME_YES}" ]; then
- printf "mysqld is not running. Would you like to start it now? (y/n): "
- read response
- case "$response" in
- y|Y)
- ;;
- n|N)
- echo "mysqld must be running. Please start it before proceeding."
- exit 0
- ;;
- *)
- echo "Invalid response." >&2
- exit 1
- esac
- fi
-
- start_service 'mysqld'
-
- # If we both installed and started, ensure it starts at boot
- [ $NEW_MYSQL_INSTALL -eq 1 ] && chkconfig mysqld on
-fi
-
-
-# Get MySQL root access.
-
-if [ $NEW_MYSQL_INSTALL -eq 1 ]; then
- if [ ! "${MYSQL_ROOT_PW+defined}" ]; then
- echo "Since this is a fresh installation of MySQL, please set a password
for the 'root' mysql user."
-
- PW_MATCH=0
- while [ $PW_MATCH -eq 0 ]; do
- printf "Enter new password for 'root' mysql user: "
- read -s MYSQL_ROOT_PW
- echo
- printf "Enter new password again: "
- read -s PW2
- echo
- if [ "${MYSQL_ROOT_PW}" = "${PW2}" ]; then
- PW_MATCH=1
- else
- echo "Passwords did not match." >&2
- fi
- done
- fi
-
- if ! echo "UPDATE mysql.user SET password = password('${MYSQL_ROOT_PW}')
WHERE user = 'root'; DELETE FROM mysql.user WHERE user = ''; flush privileges;"
|
- mysql -u root; then
- echo "Failed to set password for 'root' MySQL user." >&2
- exit 1
- fi
-elif [ ! "${MYSQL_ROOT_PW+defined}" ]; then
- printf "Please enter the password for the 'root' MySQL user: "
- read -s MYSQL_ROOT_PW
- echo
-fi
-
-
-# Sanity check MySQL credentials.
-
-MYSQL_ROOT_PW_ARG=""
-if [ "${MYSQL_ROOT_PW+defined}" ]; then
- MYSQL_ROOT_PW_ARG="--password=${MYSQL_ROOT_PW}"
-fi
-if ! echo "SELECT 1;" | mysql -u root ${MYSQL_ROOT_PW_ARG} > /dev/null; then
- echo "Failed to connect to the MySQL server. Please check your root user
credentials." >&2
- exit 1
-fi
-echo "Verified connectivity to MySQL."
-
-# Sanity check that there are no existing db or users
-
-if [ "$MODE" = 'init' ]; then
- dbs=$(echo "SELECT COUNT(*) FROM INFORMATION_SCHEMA.SCHEMATA WHERE
SCHEMA_NAME='$APP';" |
- mysql -u root ${MYSQL_ROOT_PW_ARG} | tail -n+2)
- if [ "$dbs" != 0 ]; then
- echo "Database '$APP' already exists. Please consider first running:" >&2
- echo "$0 --drop --service $APP" >&2
- exit 1
- fi
- users=$(echo "SELECT COUNT(*) FROM mysql.user WHERE User = '$APP';" |
- mysql -u root ${MYSQL_ROOT_PW_ARG} | tail -n+2)
- if [ "$users" != 0 ]; then
- echo "User '$APP' already exists. Please consider first running:" >&2
- echo "$0 --drop --service $APP" >&2
- exit 1
- fi
-fi
-
-# Create or Drop the db.
-
-if [ "$MODE" = 'init' ]; then
- echo "Creating '$APP' database." >&2
-cat << EOF
-CREATE DATABASE $APP DEFAULT CHARACTER SET utf8;
-CREATE USER '$APP'@'localhost' IDENTIFIED BY '${MYSQL_APP_PW}';
-CREATE USER '$APP'@'%' IDENTIFIED BY '${MYSQL_APP_PW}';
-GRANT ALL ON $APP.* TO '$APP'@'localhost';
-GRANT ALL ON $APP.* TO '$APP'@'%';
-flush privileges;
-EOF
-else
- echo "Dropping '$APP' database." >&2
-drop_users=$(
- echo "SELECT User,Host FROM mysql.user WHERE User = '$APP';" |
- mysql -u root ${MYSQL_ROOT_PW_ARG} |
- sed -n "s/\($APP\)[\t ]*\(.*\)/DROP USER '\1'@'\2';/p"
-)
-cat << EOF
-$drop_users
-DROP DATABASE IF EXISTS $APP;
-flush privileges;
-EOF
-fi |
-mysql -u root ${MYSQL_ROOT_PW_ARG}
-
-
-if [ "$MODE" = 'init' ]; then
-
- # Make sure $APP configuration has the right MySQL password.
- if [ "${MYSQL_APP_PW}" != "${MYSQL_APP_PW_DEFAULT}" ]; then
- echo "Updating '$APP' database password in ${APP_CONFIG}"
- sed -i -e "s|^#* *\(\(sql_\)*connection *=
*mysql://$APP\):.*@|\1:${MYSQL_APP_PW}@|" ${APP_CONFIG}
- fi
-
- # Ask openstack-$APP to sync the db.
- echo "Initializing the $APP database, please wait..."
- db_sync
-
- # Do a final sanity check on the database.
- 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
- exit 1
- fi
-
-fi
-
-echo "Complete!"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-service
new/openstack-utils-2017.11+git.1480685772.571a0f8/utils/openstack-service
--- old/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-service
2014-08-29 01:36:20.560000000 +0200
+++ new/openstack-utils-2017.11+git.1480685772.571a0f8/utils/openstack-service
2016-12-02 14:36:12.000000000 +0100
@@ -107,6 +107,14 @@
fi
}
+# Non-LSB actions
+case $action in
+help)
+ man $(basename $0)
+ exit $?
+ ;;
+esac
+
# Generate a list of services and either print the list on stdout for "list"
# or use the "service" command to perform the requested action on each of
# the services.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-status
new/openstack-utils-2017.11+git.1480685772.571a0f8/utils/openstack-status
--- old/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-status
2014-07-29 02:05:31.076000000 +0200
+++ new/openstack-utils-2017.11+git.1480685772.571a0f8/utils/openstack-status
2016-12-02 14:36:12.000000000 +0100
@@ -19,10 +19,27 @@
systemctl --version >/dev/null 2>&1 && systemctl=1
[ "$systemctl" ] || RUNLEVEL=$(LANG=C who -r | sed 's/.*run-level
\([0-9]\).*/\1/')
+# Figure out what provides mysqld services, if installed locally
+get_mysql_variant() {
+ local r
+ r=$(rpm -q --whatprovides mysql-server)
+ if [ $? -ne 0 ]; then
+ return 1
+ fi
+ # using bash would be faster/less forks: r=${r/-*/}
+ r=$(echo $r | cut -f1 -d-)
+ if [ "$r" = "mysql" ]; then
+ echo mysqld
+ return 0
+ fi
+ echo $r
+}
+
+
for conf in nova/nova.conf keystone/keystone.conf glance/glance-registry.conf;
do
if grep -qF 'connection = mysql' /etc/$conf 2>/dev/null; then
- mysqld='mysqld'
- break;
+ mysqld=$(get_mysql_variant)
+ break
fi
done
@@ -38,12 +55,13 @@
rpm -q openstack-heat-common > /dev/null && heat='heat'
rpm -q openstack-sahara > /dev/null && sahara='sahara'
rpm -q openstack-trove > /dev/null && trove='trove'
+rpm -q openstack-tuskar > /dev/null && tuskar='tuskar'
+rpm -q openstack-ironic-common > /dev/null && ironic='ironic'
rpm -q libvirt > /dev/null && libvirtd='libvirtd'
rpm -q openvswitch > /dev/null && openvswitch='openvswitch'
rpm -q qpid-cpp-server > /dev/null && qpidd='qpidd'
rpm -q rabbitmq-server > /dev/null && rabbitmq='rabbitmq-server'
rpm -q memcached > /dev/null && memcached='memcached'
-rpm -q targetd > /dev/null && targetd='targetd' || targetd='tgtd'
if test "$qpidd" && test "$rabbitmq"; then
# Give preference to rabbit
@@ -56,7 +74,10 @@
fi
service_installed() {
- PAGER= systemctl show $1.service >/dev/null 2>&1 ||
+ {
+ systemctl list-unit-files --type service --full --all ||
+ systemctl list-units --full --all --type service
+ } 2>/dev/null | grep -q "^$1\.service" ||
chkconfig --list $1 >//dev/null 2>&1
}
@@ -73,7 +94,9 @@
if service_enabled openstack-nova-volume 2>/dev/null ||
service_enabled openstack-cinder-volume 2>/dev/null; then
- tgtd="$targetd"
+ for target in 'target' 'targetd' 'tgtd'; do
+ service_installed $target && break
+ done
fi
lsb_to_string() {
@@ -117,10 +140,10 @@
if test "$nova"; then
printf "== Nova services ==\n"
- service_installed openstack-nova-cert && cert=cert
- service_installed openstack-nova-conductor && conductor=conductor
- service_installed openstack-nova-volume && volume=volume
- for svc in api $cert compute network scheduler $volume $conductor; do
check_svc "openstack-nova-$svc"; done
+ for nova_opt in cert conductor volume cells console consoleauth xvpvncproxy
spicehtml5proxy serialproxy; do
+ service_installed openstack-nova-$nova_opt &&
nova_opt_inst="$nova_opt_inst $nova_opt"
+ done
+ for svc in api compute network scheduler $nova_opt_inst; do check_svc
"openstack-nova-$svc"; done
fi
if test "$glance"; then
@@ -145,7 +168,7 @@
printf "== $neutron services ==\n"
for svc in $neutron-server; do check_svc "$svc"; done
# Default agents
- for agent in dhcp l3 metadata lbaas; do
+ for agent in dhcp l3 metadata lbaas lbaasv2; do
service_installed $neutron-$agent-agent &&
check_svc "$neutron-$agent-agent"
done
@@ -197,7 +220,14 @@
if test "$sahara"; then
printf "== Sahara services ==\n"
- for service in api; do
+ if service_enabled 'openstack-sahara-engine'; then
+ sahara_services='api engine'
+ elif service_enabled 'openstack-sahara-api'; then
+ sahara_services='api'
+ else
+ sahara_services='all'
+ fi
+ for service in $sahara_services; do
check_svc openstack-sahara-$service
done
fi
@@ -209,8 +239,22 @@
done
fi
+if test "$tuskar"; then
+ printf "== Tuskar services ==\n"
+ for service in api; do
+ check_svc openstack-tuskar-$service
+ done
+fi
+
+if test "$ironic"; then
+ printf "== Ironic services ==\n"
+ for service in api conductor; do
+ check_svc openstack-ironic-$service
+ done
+fi
+
printf "== Support services ==\n"
-for svc in $mysqld $libvirtd $openvswitch $dbus $tgtd $qpidd $rabbitmq
$memcached; do
+for svc in $mysqld $libvirtd $openvswitch $dbus $target $qpidd $rabbitmq
$memcached; do
check_svc "$svc"
done
@@ -220,7 +264,7 @@
echo "Warning keystonerc not sourced" >&2
else
keystonerc=1
- keystone user-list
+ openstack user list
fi
fi
@@ -245,6 +289,6 @@
printf "== Nova instances ==\n"
# Check access through the API
- nova list # instances
+ nova list --all-tenants # instances
fi
fi
