Hello community,
here is the log from the commit of package openstack-quickstart for
openSUSE:Factory checked in at 2013-09-16 16:23:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-quickstart (Old)
and /work/SRC/openSUSE:Factory/.openstack-quickstart.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-quickstart"
Changes:
--------
---
/work/SRC/openSUSE:Factory/openstack-quickstart/openstack-quickstart.changes
2013-08-18 22:39:07.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.openstack-quickstart.new/openstack-quickstart.changes
2013-09-16 16:23:42.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Sep 13 19:56:41 UTC 2013 - [email protected]
+
+- Update to latest git (d30a080):
+ + Various fixes for openSUSE Factory
+
+-------------------------------------------------------------------
Old:
----
openstack-quickstart-2013.2+git.1373836091.200c026.tar.gz
New:
----
openstack-quickstart-2013.2+git.1379105044.0e0a541.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-quickstart.spec ++++++
--- /var/tmp/diff_new_pack.HsD5hN/_old 2013-09-16 16:23:43.000000000 +0200
+++ /var/tmp/diff_new_pack.HsD5hN/_new 2013-09-16 16:23:43.000000000 +0200
@@ -17,7 +17,7 @@
Name: openstack-quickstart
-Version: 2013.2+git.1373836091.200c026
+Version: 2013.2+git.1379105044.0e0a541
Release: 0
Summary: OpenStack Quickstart
License: MIT
++++++ devstack-master.tar.gz ++++++
++++ 3887 lines of diff (skipped)
++++++ openstack-quickstart-2013.2+git.1373836091.200c026.tar.gz ->
openstack-quickstart-2013.2+git.1379105044.0e0a541.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-quickstart-2013.2+git.1373836091.200c026/etc/openstackquickstartrc
new/openstack-quickstart-2013.2+git.1379105044.0e0a541/etc/openstackquickstartrc
---
old/openstack-quickstart-2013.2+git.1373836091.200c026/etc/openstackquickstartrc
2013-08-07 02:08:37.000000000 +0200
+++
new/openstack-quickstart-2013.2+git.1379105044.0e0a541/etc/openstackquickstartrc
2013-09-16 02:05:08.000000000 +0200
@@ -23,5 +23,8 @@
SERVICE_TOKEN=999888777666
+# Setup Tempest ?
+with_tempest=no
+
# network bridge devive name
br=br0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-quickstart-2013.2+git.1373836091.200c026/scripts/openstack-quickstart-demosetup
new/openstack-quickstart-2013.2+git.1379105044.0e0a541/scripts/openstack-quickstart-demosetup
---
old/openstack-quickstart-2013.2+git.1373836091.200c026/scripts/openstack-quickstart-demosetup
2013-08-07 02:08:37.000000000 +0200
+++
new/openstack-quickstart-2013.2+git.1379105044.0e0a541/scripts/openstack-quickstart-demosetup
2013-09-16 02:05:08.000000000 +0200
@@ -42,7 +42,8 @@
}
function get_service_tenant_id () {
- id=`OS_SERVICE_TOKEN=$SERVICE_TOKEN keystone tenant-get service | awk
'/id/ { print $4 } '`
+ id=`keystone tenant-get service | awk '/id/ { print $4 } '`
+
echo $id
}
@@ -51,7 +52,10 @@
if [ -x $i ] ; then
insserv $1
$i restart
+ $i status
+ [ $? -eq 3 ] && { "Service $i is not running"; exit 1; }
fi
+
}
function stop_and_disable_service () {
@@ -216,49 +220,76 @@
/etc/init.d/network start
fi
-# configure dashboard/apache sample configuration from the package:
-install -m 644 /etc/apache2/conf.d/openstack-dashboard.conf{.sample,}
-a2enmod rewrite
-a2enmod ssl
-a2enmod wsgi
-a2enflag SSL
-
-DASHBOARD_LOCAL_SET=/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py
-if grep -q "^\s*CACHE_BACKEND" $DASHBOARD_LOCAL_SET ; then
- sed -i "s|^\s*CACHE_BACKEND.*$|CACHE_BACKEND =
'memcached://127.0.0.1:11211/'|" $DASHBOARD_LOCAL_SET
-else
- echo "CACHE_BACKEND = 'memcached://127.0.0.1:11211/'" >>
$DASHBOARD_LOCAL_SET
-fi
-if [ "$DB" = "postgresql" ] ; then
-cat >> $DASHBOARD_LOCAL_SET <<EODASHDB
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.postgresql_psycopg2',
- 'NAME': 'horizon',
- 'USER': 'horizon',
- 'PASSWORD': '$mpw',
+#-----------------------------------------
+# setup OpenStack Dashboard (optional)
+#-----------------------------------------
+
+if rpmqpack |grep -qx openstack-dashboard; then
+ # configure dashboard/apache sample configuration from the package:
+ install -m 644 /etc/apache2/conf.d/openstack-dashboard.conf{.sample,}
+ a2enmod rewrite
+ a2enmod ssl
+ a2enmod wsgi
+ a2enflag SSL
+
+
DASHBOARD_LOCAL_SET=/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py
+ if grep -q "^\s*CACHE_BACKEND" $DASHBOARD_LOCAL_SET ; then
+ sed -i "s|^\s*CACHE_BACKEND.*$|CACHE_BACKEND =
'memcached://127.0.0.1:11211/'|" $DASHBOARD_LOCAL_SET
+ else
+ echo "CACHE_BACKEND = 'memcached://127.0.0.1:11211/'" >>
$DASHBOARD_LOCAL_SET
+ fi
+
+ if [ "$DB" = "postgresql" ] ; then
+ cat >> $DASHBOARD_LOCAL_SET <<EODASHDB
+ DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.postgresql_psycopg2',
+ 'NAME': 'horizon',
+ 'USER': 'horizon',
+ 'PASSWORD': '$mpw',
+ }
}
-}
EODASHDB
-fi
+ fi
-if grep -q "^USE_SSL =" $DASHBOARD_LOCAL_SET; then
- sed -i -e "s/^USE_SSL =.*/USE_SSL = True/" $DASHBOARD_LOCAL_SET
-else
- echo "USE_SSL = True" >> $DASHBOARD_LOCAL_SET
-fi
-# Use 'secure' session and CSRF cookies (bnc#753582):
-cat >> $DASHBOARD_LOCAL_SET <<EOSEC
-# Use 'secure' cookies when we use SSL, see
https://docs.djangoproject.com/en/1.4/topics/security/:
-SESSION_COOKIE_SECURE = CSRF_COOKIE_SECURE = USE_SSL
+ if grep -q "^USE_SSL =" $DASHBOARD_LOCAL_SET; then
+ sed -i -e "s/^USE_SSL =.*/USE_SSL = True/" $DASHBOARD_LOCAL_SET
+ else
+ echo "USE_SSL = True" >> $DASHBOARD_LOCAL_SET
+ fi
+ # Use 'secure' session and CSRF cookies (bnc#753582):
+ cat >> $DASHBOARD_LOCAL_SET <<EOSEC
+ # Use 'secure' cookies when we use SSL, see
https://docs.djangoproject.com/en/1.4/topics/security/:
+ SESSION_COOKIE_SECURE = CSRF_COOKIE_SECURE = USE_SSL
EOSEC
+ # sync dashboard DB "after" the database is created
+ run_as wwwrun "cd /usr/share/openstack-dashboard; umask 0027; python -m
'manage' syncdb --noinput"
+fi
+
+KEYSTONE_AUTH_HOST=${KEYSTONE_AUTH_HOST:-$SERVICE_HOST}
+KEYSTONE_AUTH_PORT=${KEYSTONE_AUTH_PORT:-35357}
+KEYSTONE_AUTH_PROTOCOL=${KEYSTONE_AUTH_PROTOCOL:-http}
+SERVICE_ENDPOINT=$KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v2.0
+
+#-----------------------------------------
+# setup keystone client endpoint configuration
+#-----------------------------------------
+
+for c in /etc/glance/glance-api.conf /etc/glance/glance-registry.conf \
+ /etc/neutron/neutron.conf /etc/cinder/cinder.conf ; do
+ openstack-config --set $c keystone_authtoken auth_host $IP
+ openstack-config --set $c keystone_authtoken auth_port 35357
+ openstack-config --set $c keystone_authtoken auth_protocol http
+ openstack-config --set $c keystone_authtoken auth_uri $SERVICE_ENDPOINT
+ openstack-config --set $c keystone_authtoken admin_tenant_name service
+done
+
+#-----------------------------------------
+## setup glance configuration
+#-----------------------------------------
# replace default IP in all configuration files
-sed -i -e "s;127.0.0.1;$IP;" /etc/nova/api-paste.ini
/etc/glance/glance-api.conf /etc/glance/glance-registry.conf
-sed -i -e "s,<IP>,$IP,g" /etc/nova/nova.conf
-#openstack-config --set /etc/nova/nova.conf DEFAULT flat_network_bridge "$br"
-#openstack-config --set /etc/nova/nova.conf DEFAULT bridge_interface "$br"
openstack-config --set /etc/nova/nova.conf DEFAULT sql_connection
"$DB://nova:$mpw@$IP/nova"
openstack-config --set /etc/nova/nova.conf DEFAULT glance_api_servers
"$IP:9292"
openstack-config --set /etc/nova/nova.conf DEFAULT novncproxy_base_url
"http://$IP:6080/vnc_auto.html";
@@ -315,8 +346,7 @@
sudo -u postgres createdb -O $DBNAME $DBNAME || true
done
sudo -u postgres createuser -s root || :
- /etc/init.d/postgresql restart
- insserv postgresql
+ start_and_enable_service postgresql
else
echo | mysql -u root || pwquery=-p
for DBNAME in nova cinder keystone glance horizon neutron ; do
@@ -331,10 +361,6 @@
fi
-# sync dashboard DB "after" the database is created
-run_as wwwrun "cd /usr/share/openstack-dashboard; umask 0027; python -m
'manage' syncdb --noinput"
-
-
run_as $CINDER_SYSTEM_USER "cinder-manage db sync"
run_as $NOVA_SYSTEM_USER "nova-manage db sync"
# optional - makes life better with little RAM
@@ -382,11 +408,10 @@
else
keystone_data=$PREFIX/scripts/keystone_data.sh
fi
-ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-vol,c-api,n-sch,n-novnc,n-xvnc,q-svc,heat,horizon,swift,mysql,rabbit}
-KEYSTONE_AUTH_HOST=${KEYSTONE_AUTH_HOST:-$SERVICE_HOST}
-KEYSTONE_AUTH_PORT=${KEYSTONE_AUTH_PORT:-35357}
-KEYSTONE_AUTH_PROTOCOL=${KEYSTONE_AUTH_PROTOCOL:-http}
-SERVICE_ENDPOINT=$KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v2.0
+ENABLED_SERVICES="g-api,g-reg,key,n-api,n-cpu,n-net,n-vol,c-api,n-sch,n-novnc,n-xvnc,q-svc,heat,horizon,swift,mysql,rabbit"
+if [ "x$with_tempest" = "xyes" ]; then
+ ENABLED_SERVICES+=",tempest"
+fi
ADMIN_PASSWORD=$ADMIN_PASSWORD SERVICE_TOKEN=$SERVICE_TOKEN
SERVICE_ENDPOINT=$SERVICE_ENDPOINT DEVSTACK_DIR=/root
ENABLED_SERVICES=$ENABLED_SERVICES bash $keystone_data
. /etc/bash.bashrc.local
@@ -415,7 +440,7 @@
## setup heat configuration
#-----------------------------------------
-openstack-config --set /etc/heat/heat-engine.conf DEFAULT sql_connection
$DB://heat:$mpw@$IP/heat
+openstack-config --set /etc/heat/heat.conf DEFAULT sql_connection
$DB://heat:$mpw@$IP/heat
#-----------------------------------------
## setup neutron configuration
@@ -490,10 +515,9 @@
done
else
grep -q openstack-loopback-lvm /etc/init.d/boot.local || echo
$openstack_loopback_lvm >> /etc/init.d/boot.local
- for s in api scheduler volume ; do
- /etc/init.d/openstack-cinder-$s restart
- insserv openstack-cinder-$s
- done
+ start_and_enable_service openstack-cinder-api
+ start_and_enable_service openstack-cinder-scheduler
+ start_and_enable_service openstack-cinder-volume
fi
for user in demo admin ; do
@@ -504,3 +528,16 @@
nova secgroup-add-rule default udp 1 65535 0.0.0.0/0 # and all UDP
nova secgroup-list-rules default # lists the rules
done
+
+
+#-----------------------------------------
+# setup tempest configuration
+#-----------------------------------------
+
+if [ "x$with_tempest" = "xyes" ]; then
+ openstack-config --set /etc/tempest/tempest.conf identity uri
$SERVICE_ENDPOINT
+ openstack-config --set /etc/tempest/tempest.conf identity admin_username
admin
+ openstack-config --set /etc/tempest/tempest.conf identity admin_password
$pw
+ openstack-config --set /etc/tempest/tempest.conf identity alt_password $pw
+ openstack-config --set /etc/tempest/tempest.conf identity password $pw
+fi
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
