Hello community, here is the log from the commit of package openstack-utils for openSUSE:Factory checked in at 2015-07-12 22:52:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-05-02 14:01:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openstack-utils.new/openstack-utils.changes 2015-07-12 22:52:27.000000000 +0200 @@ -1,0 +2,41 @@ +Fri Aug 29 00:11:37 UTC 2014 - [email protected] + +- Update to version 2014.1.3+git.1409246608.bd34653: + + Skip neutron cleanup scripts for openstack-service utility + + Remove references to openstack-demo-install + +------------------------------------------------------------------- +Tue Jul 29 00:18:49 UTC 2014 - [email protected] + +- Update to version 2014.1.3+git.1406537705.3cf6d2f: + + openstack-status: Add neutron-metering-agent. + + openstack-status: Add openstack-ceilometer-notification. + +------------------------------------------------------------------- +Thu Jun 26 11:34:07 UTC 2014 - [email protected] + +- Update to version 2014.1.3+git.1403518190.5f33951: + + bump release number + + maint: remove openstack-demo-install.1 + + bump release number + + openstack-status: improve status for uncontactable httpd + + openstack-status: handle dashboard redirect from http to https + +------------------------------------------------------------------- +Tue Jun 10 16:50:09 UTC 2014 - [email protected] + +- Update to version 2014.1.1+git.1401972689.77a7fa8: + + openstack-demo-install: remove this provisioning script + +------------------------------------------------------------------- +Wed May 21 11:55:44 UTC 2014 - [email protected] + +- Update to version 2014.1.1+git.1400601894.9b10db2: + + support all systemctl actions on systemd platforms + + improve diagnostics for failure to sync DB + + bump release number + + report status of targetd if installed + + openstack-status: report status of trove services + + openstack-db: support trove database setup + +------------------------------------------------------------------- Old: ---- openstack-utils-2013.2.3+git.1396353592.c2b8f6c.tar.gz New: ---- openstack-utils-2014.1.3+git.1409246608.bd34653.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-utils.spec ++++++ --- /var/tmp/diff_new_pack.iNVpjJ/_old 2015-07-12 22:52:28.000000000 +0200 +++ /var/tmp/diff_new_pack.iNVpjJ/_new 2015-07-12 22:52:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: openstack-utils -Version: 2013.2.3+git.1396353592.c2b8f6c +Version: 2014.1.3+git.1409246608.bd34653 Release: 0 Summary: Helper utilities for OpenStack service License: Apache-2.0 @@ -34,7 +34,6 @@ - openstack-config - Manipulate the openstack ini files - openstack-db - Setup or delete the database for a specified service - - openstack-demo-install - Setup all services on a single node for testing - openstack-status - Give an overview of the status of installed services %prep @@ -54,12 +53,10 @@ %doc README.md NEWS LICENSE %{_bindir}/openstack-config %{_bindir}/openstack-db -%{_bindir}/openstack-demo-install %{_bindir}/openstack-service %{_bindir}/openstack-status %{_mandir}/man1/openstack-config.1%{?ext_man} %{_mandir}/man1/openstack-db.1%{?ext_man} -%{_mandir}/man1/openstack-demo-install.1%{?ext_man} %{_mandir}/man1/openstack-service.1.gz %{_mandir}/man1/openstack-status.1%{?ext_man} ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.iNVpjJ/_old 2015-07-12 22:52:28.000000000 +0200 +++ /var/tmp/diff_new_pack.iNVpjJ/_new 2015-07-12 22:52:28.000000000 +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">c2b8f6c01a</param> + <param name="changesrevision">bd34653b5c</param> </service> </servicedata> \ No newline at end of file ++++++ fix-db.patch ++++++ --- /var/tmp/diff_new_pack.iNVpjJ/_old 2015-07-12 22:52:28.000000000 +0200 +++ /var/tmp/diff_new_pack.iNVpjJ/_new 2015-07-12 22:52:28.000000000 +0200 @@ -18,8 +18,8 @@ + su -s /bin/sh -c "$APP-manage $db_cmd" $APP } - db_sync() { db_manage sync; } -@@ -147,10 +148,15 @@ if [ "$MODE" = 'sync' ]; then + db_sync() { +@@ -153,10 +154,15 @@ if [ "$MODE" = 'sync' ]; then fi install_mysql_server() { @@ -37,7 +37,7 @@ fi } -@@ -205,15 +211,20 @@ fi +@@ -211,15 +217,20 @@ fi # Make sure MySQL is installed. NEW_MYSQL_INSTALL=0 @@ -61,7 +61,7 @@ exit 0 ;; *) -@@ -229,7 +240,7 @@ fi +@@ -235,7 +246,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 -@@ -246,10 +257,10 @@ if ! service_running mysqld; then +@@ -252,10 +263,10 @@ if ! service_running mysqld; then esac fi @@ -83,7 +83,7 @@ fi -@@ -362,7 +373,7 @@ if [ "$MODE" = 'init' ]; then +@@ -368,7 +379,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 ++++++ openstack-utils-2013.2.3+git.1396353592.c2b8f6c.tar.gz -> openstack-utils-2014.1.3+git.1409246608.bd34653.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/Makefile new/openstack-utils-2014.1.3+git.1409246608.bd34653/Makefile --- old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/Makefile 2014-03-06 16:10:31.000000000 +0100 +++ new/openstack-utils-2014.1.3+git.1409246608.bd34653/Makefile 2014-06-25 02:00:56.000000000 +0200 @@ -1,5 +1,5 @@ name = openstack-utils -version = 2013.2 +version = 2014.1 release = 3 all: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/NEWS new/openstack-utils-2014.1.3+git.1409246608.bd34653/NEWS --- old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/NEWS 2014-04-02 01:45:17.000000000 +0200 +++ new/openstack-utils-2014.1.3+git.1409246608.bd34653/NEWS 2014-06-25 02:00:56.000000000 +0200 @@ -1,9 +1,24 @@ -201X.X-X dd-mm-yyyy +2014.1-3 23-06-2014 + openstack-service: + simplify "status" output on systemd platforms + support all systemctl actions on systemd platforms + openstack-db: + Improve diagnostics for db sync failure + openstack-demo-install: + Remove no longer supported provisioning script + openstack-status: + Handle dashboard redirect from http to https + Improve status for uncontactable httpd + +2014.1-1 24-04-2014 openstack-status: Report status of openstack-cinder-backup on >= Havana Report status of openstack-sahara service + Report status of openstack-trove services + Report status of targetd if installed openstack-db: Set default charset for new DBs to UTF8 to avoid migrate issues + Support openstack-trove database setup 2013.2-3 19-01-2014 openstack-db: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/README.md new/openstack-utils-2014.1.3+git.1409246608.bd34653/README.md --- old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/README.md 2014-03-06 16:10:31.000000000 +0100 +++ new/openstack-utils-2014.1.3+git.1409246608.bd34653/README.md 2014-08-29 01:36:20.000000000 +0200 @@ -5,6 +5,5 @@ * openstack-config - Manipulate the openstack ini files * openstack-db - Create/Update/Delete, the database for a service -* openstack-demo-install - Setup all services on a single node for testing * 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-2013.2.3+git.1396353592.c2b8f6c/man/openstack-demo-install.1 new/openstack-utils-2014.1.3+git.1409246608.bd34653/man/openstack-demo-install.1 --- old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/man/openstack-demo-install.1 2014-03-06 16:10:31.000000000 +0100 +++ new/openstack-utils-2014.1.3+git.1409246608.bd34653/man/openstack-demo-install.1 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -.TH openstack-demo-install "1" "April 2012" "openstack-utils" "User Commands" -.SH NAME -openstack-demo-install - Setup all services on a single node for testing -.SH SYNOPSIS -.B openstack-demo-install -.SH DESCRIPTION -Install all OpenStack services on a single node with a default configuration, -useful for testing. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/utils/openstack-db new/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-db --- old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/utils/openstack-db 2014-03-06 16:10:31.000000000 +0100 +++ new/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-db 2014-05-21 02:09:47.000000000 +0200 @@ -82,10 +82,10 @@ fi case "$APP" in - nova|glance|keystone|cinder|heat|neutron) ;; + nova|glance|keystone|cinder|heat|neutron|trove) ;; *) printf "Unrecognized --service $APP\n" >&2 - printf "Please specify nova|glance|keystone|cinder|heat|neutron\n" >&2 + printf "Please specify nova|glance|keystone|cinder|heat|neutron|trove\n" >&2 exit 1 ;; esac @@ -122,7 +122,13 @@ runuser -s /bin/sh $APP -c "$APP-manage $db_cmd" } -db_sync() { db_manage sync; } +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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/utils/openstack-demo-install new/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-demo-install --- old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/utils/openstack-demo-install 2014-03-06 16:10:31.000000000 +0100 +++ new/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-demo-install 1970-01-01 01:00:00.000000000 +0100 @@ -1,398 +0,0 @@ -#!/bin/sh -# Install and Enable all OpenStack services on a single node, -# for testing/demonstration purposes. -# -# Copyright (C) 2012, 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 -# 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. -# - -service_installed() { - PAGER= systemctl show $1.service >/dev/null 2>&1 || - chkconfig --list $1 >//dev/null 2>&1 -} - -set -e # exit on error. This script is restartable - -if [ $(id -u) -ne 0 ]; then - echo 'Please run this as the root user' >&2 - exit 1 -fi - - -echo "======= Installing/Updating packages ======" - -#install nova-common first to see what version it is -yum install openstack-nova-common -y - -#determine which OpenStack version we'll be running -os_version=$(rpm -q openstack-nova-common --qf='%{VERSION}') -case $os_version in - 2012.1|2012.1.*) os_dist='essex';; - 2012.2|2012.2.*) os_dist='folsom';; - 2013.1|2013.1.*) os_dist='grizzly';; -esac - -# Install these first if not on essex -if [ "$os_dist" != 'essex' ]; then - yum install -y openstack-cinder openstack-swift-plugin-swift3 - cinder='cinder' -fi -# memcached is needed by swift -# qpid AMQP broker is needed by most services -# virtualization capabilities are needed by nova -# avahi referenced explicitly to avoid https://bugzilla.redhat.com/746111 -yum -y install \ - qpid-cpp-server qpid-cpp-server-daemon \ - @virtualization \ - memcached \ - avahi \ - openstack-nova openstack-nova-novncproxy \ - openstack-glance openstack-keystone openstack-dashboard \ - openstack-swift\* openstack-quantum \ - openstack-utils virt-what \ - -x openstack-swift-plugin-swift3 - -if [ "$os_dist" != 'essex' ] && [ "$os_dist" != 'folsom' ]; then - conductor='conductor' -fi - -echo "======= Setting up the databases ======" - -getpassword() -{ - password='x' - until [ "$password" = "$rpassword" ]; do - read -s -p "Enter a password for the '$1' user : " password; echo >&2 - read -s -p "Reenter password for the '$1' user : " rpassword; echo >&2 - done - echo "$password" -} - -ROOT_DB_PW=$(getpassword 'database root') - -for APP in nova glance keystone $cinder; do - openstack-db -y --init --service $APP --rootpw "$ROOT_DB_PW" -done - -if virt-what | grep -q .; then - # We're running in a VM so set nova-compute up appropriately - echo '======= Configuring VM. Please wait =======' >&2 - fedora_ver="0$(sed -n 's/Fedora release \([0-9]*\).*/\1/p' /etc/issue)" - openstack-config --set /etc/nova/nova.conf DEFAULT libvirt_type qemu - # Workaround (https://bugzilla.redhat.com/show_bug.cgi?id=858216) - openstack-config --set /etc/nova/nova.conf DEFAULT libvirt_cpu_mode none - if [ "$fedora_ver" -ge 16 ] && selinuxenabled; then - setsebool -P virt_use_execmem on - fi - # Note if running on RHEL (derivatives) <= 6.3 or - # specifically libvirt < 0.9.13-66 then we need to - # do this to support starting nested VMs. See: - # See https://bugzilla.redhat.com/show_bug.cgi?id=813735 - # A local libvirt version check is fine here since this script - # only considers installing everything on the local node. - if python -c 'import libvirt, sys; sys.exit(not libvirt.getVersion() <= 9013)'; then - [ "$(uname -m)" = 'x86_64' ] && qemu_cmd=qemu-system-x86_64 || qemu_cmd=qemu-system-i386 - if [ -e /usr/libexec/qemu-kvm ]; then # present on RHEL - ln -s /usr/libexec/qemu-kvm /usr/bin/$qemu_cmd - service libvirtd stop # (re)started below - fi - fi -fi - -# Allow httpd (horizon) to connect to other services -selinuxenabled && setsebool -P httpd_can_network_connect=on -service httpd restart - -# Configure cinder with nova and keystone if installed -if [ "$cinder" ]; then - # Change nova configuration to use cinder - openstack-config --set /etc/nova/nova.conf DEFAULT volume_api_class nova.volume.cinder.API - # The following is the default apis with 'osapi_volume' removed - openstack-config --set /etc/nova/nova.conf DEFAULT enabled_apis ec2,osapi_compute,metadata - - # On RHEL, manually adjust config to integrate - # persistent volumes on tgtd startup - if rpm -q scsi-target-utils | grep -q el6; then - sed -i '1iinclude /etc/cinder/volumes/*' /etc/tgt/targets.conf - fi -fi - -# TODO support volumes (maybe as an option due to size) -# Need to support setup on reboot also. -# When this is done, add 'volume' to the nova services below -# truncate -s20G /var/lib/nova/nova-volumes.img -# vgcreate nova-volumes $(sudo losetup --show -f /var/lib/nova/nova-volumes.img) - -# determine the correct dbus service name -service_installed dbus && dbus='dbus' || dbus='messagebus' - -# Ensure cgroup is started so that libvirt does an SELinux relabel -# for VM disk images. Avoids a bug on some versions of libvirtd on RHEL 6.4 -chkconfig --list $1 >//dev/null 2>&1 'cgconfig' && cgroup='cgconfig' - -echo "======= Enabling the services ======" - -for svc in qpidd $cgroup $dbus libvirtd httpd; do - chkconfig $svc on -done -for svc in api registry; do - chkconfig openstack-glance-$svc on -done -for svc in api objectstore compute network scheduler cert $conductor consoleauth novncproxy; do - chkconfig openstack-nova-$svc on -done -if [ "$cinder" ]; then - for svc in api scheduler; do - chkconfig openstack-cinder-$svc on - done -fi - -# Disable QPID auth with a warning at the end -if grep -q '^auth=yes' /etc/qpidd.conf; then - sed -i 's/^auth=yes/auth=no/' /etc/qpidd.conf - qpid_auth_disabled=1 -fi - -echo "======= Starting the services ======" - -for svc in qpidd $cgroup $dbus libvirtd httpd; do - service $svc start -done -for svc in api registry; do - service openstack-glance-$svc start -done -for svc in api objectstore compute network scheduler cert $conductor consoleauth novncproxy; do - service openstack-nova-$svc start -done -if [ "$cinder" ]; then - for svc in api scheduler; do - service openstack-cinder-$svc start - done -fi - -echo "======= Setting up Keystone ======" - -# Set up a keystonerc file with admin password -cat > ~/keystonerc <<EOF -export OS_USERNAME=admin -export OS_PASSWORD=secrete -export OS_TENANT_NAME=demo -export OS_AUTH_URL=http://127.0.0.1:5000/v2.0/ -EOF - -# Service token is needed to bootstrap keystone commands -export SERVICE_TOKEN=$(openssl rand -hex 10) -export SERVICE_ENDPOINT=http://127.0.0.1:35357/v2.0 - -. ~/keystonerc - -# Set the administrative token in the config file -openstack-config --set /etc/keystone/keystone.conf DEFAULT admin_token $SERVICE_TOKEN - -#Generate keystone certs -if [ "$os_dist" != 'essex' ] && [ "$os_dist" != 'folsom' ]; then - keystone-manage pki_setup - chown -R keystone /etc/keystone/ssl/ -fi - -# Stop keystone if it is already running (to reload the new admin token) -service openstack-keystone status >/dev/null 2>&1 && - service openstack-keystone stop - -# Start and enable the Keystone service -service openstack-keystone start -chkconfig openstack-keystone on - -# wait for the keystone service to start -tries=0 -until keystone user-list >/dev/null 2>&1; do - tries=$(($tries + 1)) - [ $tries -eq 10 ] && { keystone user-list; break; } - sleep 1 -done - -# Create sample Tenants, Users and Roles -# NB in Grizzly sample_data.sh *_PASSWORD are ignored: -# https://github.com/openstack/keystone/commit/d6f7cbc484868bdec3eeb9d4b0f45b10ce536e79 -ADMIN_PASSWORD=$OS_PASSWORD SERVICE_PASSWORD=servicepass \ -ENABLE_SWIFT=1 openstack-keystone-sample-data - -# Change nova configuration to use keystone -openstack-config --set /etc/nova/nova.conf DEFAULT auth_strategy keystone -if [ "$os_dist" = 'essex' ]; then - openstack-config --set /etc/nova/api-paste.ini filter:authtoken admin_tenant_name service - openstack-config --set /etc/nova/api-paste.ini filter:authtoken admin_user nova - openstack-config --set /etc/nova/api-paste.ini filter:authtoken admin_password servicepass -else #>=folsom - openstack-config --set /etc/nova/nova.conf keystone_authtoken admin_tenant_name service - openstack-config --set /etc/nova/nova.conf keystone_authtoken admin_user nova - if [ "$os_dist" = 'folsom' ]; then - openstack-config --set /etc/nova/nova.conf keystone_authtoken admin_password servicepass - else #>=grizzly - openstack-config --set /etc/nova/nova.conf keystone_authtoken admin_password nova - fi -fi -for svc in api compute; do - service openstack-nova-$svc restart -done - -# Change glance configuration to use keystone -for svc in api registry; do - openstack-config --set /etc/glance/glance-$svc.conf paste_deploy flavor keystone - if [ "$os_dist" = 'essex' ]; then - openstack-config --set /etc/glance/glance-$svc-paste.ini filter:authtoken admin_tenant_name service - openstack-config --set /etc/glance/glance-$svc-paste.ini filter:authtoken admin_user glance - openstack-config --set /etc/glance/glance-$svc-paste.ini filter:authtoken admin_password servicepass - else #>=folsom - openstack-config --set /etc/glance/glance-$svc.conf keystone_authtoken admin_tenant_name service - openstack-config --set /etc/glance/glance-$svc.conf keystone_authtoken admin_user glance - if [ "$os_dist" = 'folsom' ]; then - openstack-config --set /etc/glance/glance-$svc.conf keystone_authtoken admin_password servicepass - else #>=grizzly - openstack-config --set /etc/glance/glance-$svc.conf keystone_authtoken admin_password glance - fi - fi -done -for svc in api registry; do - service openstack-glance-$svc restart -done - -cinder_keystone_sample_data() -{ - # TODO: Move this to openstack-keystone-sample-data - - get_id () { echo $("$@" | grep ' id ' | awk '{print $4}'); } - ADMIN_PASSWORD=$OS_PASSWORD - SERVICE_HOST=127.0.0.1 - SERVICE_PASSWORD=servicepass - SERVICE_TENANT=$(keystone tenant-list | grep service | awk '{print $2}') - ADMIN_ROLE=$(keystone role-list | grep ' admin ' | awk '{print $2}') - - CINDER_USER=$(get_id keystone user-create --name=cinder \ - --pass="$SERVICE_PASSWORD" \ - --tenant_id $SERVICE_TENANT \ - [email protected]) - keystone user-role-add --tenant_id $SERVICE_TENANT \ - --user_id $CINDER_USER \ - --role_id $ADMIN_ROLE - CINDER_SERVICE=$(get_id keystone service-create \ - --name=cinder \ - --type=volume \ - --description="Cinder Service") - keystone endpoint-create \ - --region RegionOne \ - --service_id $CINDER_SERVICE \ - --publicurl "http://$SERVICE_HOST:8776/v1/\$(tenant_id)s" \ - --adminurl "http://$SERVICE_HOST:8776/v1/\$(tenant_id)s" \ - --internalurl "http://$SERVICE_HOST:8776/v1/\$(tenant_id)s" -} - -# Change cinder configuration to use keystone -if [ "$cinder" ]; then - openstack-config --set /etc/cinder/cinder.conf DEFAULT auth_strategy keystone - openstack-config --set /etc/cinder/cinder.conf keystone_authtoken admin_tenant_name service - openstack-config --set /etc/cinder/cinder.conf keystone_authtoken admin_user cinder - openstack-config --set /etc/cinder/cinder.conf keystone_authtoken admin_password servicepass - - cinder_keystone_sample_data - - # Start the services - # Note volume requires the cinder-volumes volume group - # to be available, so we don't enable that by default - for svc in api scheduler; do - service openstack-cinder-$svc restart - done -fi - -swift_keystone_sample_data() -{ - # TODO: Move this to openstack-keystone-sample-data - - # Add the swift endpoint - SWIFTSERIVEID=$(keystone service-list | grep object-store | awk '{print $2}') - keystone endpoint-create --service_id $SWIFTSERIVEID \ - --publicurl 'http://127.0.0.1:8080/v1/AUTH_$(tenant_id)s' \ - --adminurl 'http://127.0.0.1:8080/v1' \ - --internalurl 'http://127.0.0.1:8080/v1/AUTH_$(tenant_id)s' -} - -setup_swift() -{ - echo "======= Setting up Swift ======" - - # edit default config - openstack-config --set /etc/swift/proxy-server.conf filter:authtoken admin_tenant_name service - openstack-config --set /etc/swift/proxy-server.conf filter:authtoken admin_user swift - if [ "$os_dist" = 'folsom' ]; then - openstack-config --set /etc/swift/proxy-server.conf filter:authtoken admin_password servicepass - else #>=grizzly - openstack-config --set /etc/swift/proxy-server.conf filter:authtoken admin_password swiftpass - fi - openstack-config --set /etc/swift/swift.conf swift-hash swift_hash_path_suffix $(openssl rand -hex 10) - - swift_keystone_sample_data - - # Create ringfiles and storage devices - swift-ring-builder /etc/swift/account.builder create 12 3 1 - swift-ring-builder /etc/swift/container.builder create 12 3 1 - swift-ring-builder /etc/swift/object.builder create 12 3 1 - for zone in 1 2 3 4; do - truncate /var/tmp/swift-storage-$zone --size 5G - DEVICE=$(losetup --show -f /var/tmp/swift-storage-$zone) - mkfs.ext4 -I 1024 $DEVICE - mkdir -p /srv/node/device$zone - mount -o noatime,nodiratime,nobarrier,user_xattr $DEVICE /srv/node/device$zone - swift-ring-builder /etc/swift/account.builder add z$zone-127.0.0.1:6002/device$zone 100 - swift-ring-builder /etc/swift/container.builder add z$zone-127.0.0.1:6001/device$zone 100 - swift-ring-builder /etc/swift/object.builder add z$zone-127.0.0.1:6000/device$zone 100 - done - swift-ring-builder /etc/swift/account.builder rebalance - swift-ring-builder /etc/swift/container.builder rebalance - swift-ring-builder /etc/swift/object.builder rebalance - - # Make sure swift owns the ring file - chown -R swift:swift /etc/swift/*gz /srv/node - - # Make sure swift owns the keystone signing dir - mkdir -p /tmp/keystone-signing-swift && chown swift: /tmp/keystone-signing-swift - - # Start the services - service memcached start - chkconfig memcached on - service openstack-swift-proxy start - chkconfig openstack-swift-proxy on - for ringtype in account container object; do - service openstack-swift-$ringtype start - chkconfig openstack-swift-$ringtype on - for service in replicator updater auditor; do - if [ $ringtype != 'account' ] || [ $service != 'updater' ]; then - swift-init $ringtype-$service start - fi - done - done -} - -# We can only setup Swift for packages that contain example config files -[ -e /etc/swift/proxy-server.conf ] && setup_swift - -echo "======= Running openstack-status ======" -openstack-status - -echo "The OpenStack web interface is running at http://localhost/dashboard"; -echo "(Use User:$OS_USERNAME and Password:$OS_PASSWORD)" - -if [ "$qpid_auth_disabled" ]; then - echo "Please note that QPID authentication has been disabled in /etc/qpidd.conf" -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/utils/openstack-service new/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-service --- old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/utils/openstack-service 2014-03-06 16:10:31.000000000 +0100 +++ new/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-service 2014-08-29 01:36:20.000000000 +0200 @@ -66,7 +66,7 @@ local svcprefix=$1 enabled_services | - egrep '^(openstack|neutron|quantum)' | + egrep '^(openstack|neutron|quantum)' | grep -v "neutron-.*-cleanup" | ( [ "$svcprefix" ] && egrep "^(openstack-)?${svcprefix}" || cat ) } @@ -88,8 +88,27 @@ action="$1" shift +run_action() { + SVCs=$(cat) + + if [ "$systemctl" ]; then + if [ "$action" = "status" ]; then + # Generate simple status like: service status $SVC + systemctl show --property=Id,MainPID,ActiveState $SVCs | + sed '/^$/d' | paste -d' ' - - - | sed \ + 's/Id=\(.*\)\.service ActiveState=\(.*\) MainPID=\(.*\)/\1 (pid \3) is \2/' + else + systemctl $action $SVCs + fi + else + for SVC in $SVCs; do + service $SVC $action + done + fi +} + # 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. generate_service_list "$@" | -( [ "$action" = "list" ] && cat || xargs -iSVC service SVC $action ) +( [ "$action" = "list" ] && cat || run_action ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/utils/openstack-status new/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-status --- old/openstack-utils-2013.2.3+git.1396353592.c2b8f6c/utils/openstack-status 2014-04-02 01:45:17.000000000 +0200 +++ new/openstack-utils-2014.1.3+git.1409246608.bd34653/utils/openstack-status 2014-07-29 02:05:31.000000000 +0200 @@ -37,11 +37,13 @@ rpm -q openstack-ceilometer-common > /dev/null && ceilometer='ceilometer' 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 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 @@ -71,7 +73,7 @@ if service_enabled openstack-nova-volume 2>/dev/null || service_enabled openstack-cinder-volume 2>/dev/null; then - tgtd='tgtd' + tgtd="$targetd" fi lsb_to_string() { @@ -133,8 +135,9 @@ if test "$dashboard"; then printf "== Horizon service ==\n" - horizon_status="$(curl -s -w '%{http_code}\n' http://localhost/dashboard -o /dev/null)" + horizon_status="$(curl -L -s -w '%{http_code}\n' http://localhost/dashboard -o /dev/null)" [ "$horizon_status" = 200 ] && horizon_status=active + [ "$horizon_status" = 000 ] && horizon_status=uncontactable printf '%-40s%s\n' "openstack-dashboard:" "$horizon_status" fi @@ -147,7 +150,7 @@ check_svc "$neutron-$agent-agent" done # Optional agents - for agent in openvswitch linuxbridge ryu nec mlnx; do + for agent in openvswitch linuxbridge ryu nec mlnx metering; do service_installed $neutron-$agent-agent && check_svc "$neutron-$agent-agent" done @@ -179,7 +182,8 @@ printf "== Ceilometer services ==\n" service_installed openstack-ceilometer-alarm-notifier && notifier=alarm-notifier service_installed openstack-ceilometer-alarm-evaluator && evaluator=alarm-evaluator - for service in api central compute collector $notifier $evaluator; do + service_installed openstack-ceilometer-notification && notification=notification + for service in api central compute collector $notifier $evaluator $notification; do check_svc openstack-ceilometer-$service done fi @@ -198,6 +202,13 @@ done fi +if test "$trove"; then + printf "== Trove services ==\n" + for service in api taskmanager conductor; do + check_svc openstack-trove-$service + done +fi + printf "== Support services ==\n" for svc in $mysqld $libvirtd $openvswitch $dbus $tgtd $qpidd $rabbitmq $memcached; do check_svc "$svc"
