Hello community,
here is the log from the commit of package openstack-quickstart for
openSUSE:Factory checked in at 2014-01-20 07:30:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-10-21 12:30:35.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.openstack-quickstart.new/openstack-quickstart.changes
2014-01-23 15:50:44.000000000 +0100
@@ -1,0 +2,53 @@
+Thu Jan 16 01:11:56 UTC 2014 - [email protected]
+
+- Update to latest git (9a72985):
+ + Remove extranous database migration runs
+ + Set my_ip addresses properly
+
+-------------------------------------------------------------------
+Tue Jan 14 12:31:36 UTC 2014 - [email protected]
+
+- Update to latest git (cbcfc02):
+ + Set default floating_ip pool name
+
+-------------------------------------------------------------------
+Tue Jan 14 10:38:06 UTC 2014 - [email protected]
+
+- Update to latest git (6b7a6d9):
+ + Fix computev3 api port (contact nova, not neutron :-))
+ + set compute-admin password as well
+
+-------------------------------------------------------------------
+Tue Jan 14 00:39:33 UTC 2014 - [email protected]
+
+- Update to latest git (a9dc3a1):
+ + Switch to Neutron handled security groups
+ + Make script pass run with set -e again
+ + Add Ceilometer catalog information
+ + Correct Heat related endpoints
+ + Setup ML2 Neutron plugin for demo setup
+
+-------------------------------------------------------------------
+Thu Jan 2 18:55:22 UTC 2014 - [email protected]
+
+- Update to latest git (be6901c):
+ + Enable boot.lvm on SLE11 and older
+
+-------------------------------------------------------------------
+Thu Dec 12 09:57:43 UTC 2013 - [email protected]
+
+- update to latest git state
+
+-------------------------------------------------------------------
+Tue Dec 10 01:36:18 UTC 2013 - [email protected]
+
+- Update to latest git (184a1d6):
+ + libvirt_type was renamed to virt_type
+
+-------------------------------------------------------------------
+Thu Nov 21 01:11:38 UTC 2013 - [email protected]
+
+- Update to latest git (e613180):
+ + Use zypper --force-resolution to install patterns.
+
+-------------------------------------------------------------------
Old:
----
devstack-master.tar.gz
openstack-quickstart-2013.2+git.1380614452.cc514df.tar.gz
New:
----
openstack-quickstart-2013.2+git.1389788956.9a72985.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-quickstart.spec ++++++
--- /var/tmp/diff_new_pack.QuF9tr/_old 2014-01-23 15:50:45.000000000 +0100
+++ /var/tmp/diff_new_pack.QuF9tr/_new 2014-01-23 15:50:45.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openstack-quickstart
#
-# 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,14 +17,13 @@
Name: openstack-quickstart
-Version: 2013.2+git.1380614452.cc514df
+Version: 2013.2+git.1389788956.9a72985
Release: 0
Summary: OpenStack Quickstart
License: MIT
Group: System/Management
Url: http://en.opensuse.org/SDB:Cloud_OpenStack_Quickstart
Source0: %{name}-%{version}.tar.gz
-Source1: devstack-master.tar.gz
Suggests: patterns-OpenStack-clients
Suggests: patterns-OpenStack-compute-node
Suggests: patterns-OpenStack-controller
@@ -37,20 +36,13 @@
Scripts and configs to easily generate an openstack demo setup.
%prep
-%setup -q -a 1
+%setup -q
%build
%install
make install DESTDIR=%{buildroot}
-# install some stuff from devstack
-ds=%{buildroot}/usr/lib/devstack
-for i in exercise.sh functions openrc stackrc eucarc exerciserc; do
- install -m 755 devstack-master/$i $ds
-done
-cp -r devstack-master/exercises devstack-master/lib $ds
-
%files
%defattr(-,root,root)
%{_sbindir}/openstack-quickstart-*
++++++ _service ++++++
--- /var/tmp/diff_new_pack.QuF9tr/_old 2014-01-23 15:50:45.000000000 +0100
+++ /var/tmp/diff_new_pack.QuF9tr/_new 2014-01-23 15:50:45.000000000 +0100
@@ -12,19 +12,6 @@
<param name="compression">gz</param>
</service>
- <service name="tar_scm" mode="disabled">
- <param name="url">git://github.com/openstack-dev/devstack.git</param>
- <param name="scm">git</param>
- <param name="exclude">.git</param>
- <param name="versionformat">master</param>
- <param name="revision">master</param>
- </service>
-
- <service name="recompress" mode="disabled">
- <param name="file">devstack-master.tar</param>
- <param name="compression">gz</param>
- </service>
-
<service name="set_version" mode="disabled">
<param name="basename">openstack-quickstart</param>
</service>
++++++ openstack-quickstart-2013.2+git.1380614452.cc514df.tar.gz ->
openstack-quickstart-2013.2+git.1389788956.9a72985.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-quickstart-2013.2+git.1380614452.cc514df/scripts/keystone_data.sh
new/openstack-quickstart-2013.2+git.1389788956.9a72985/scripts/keystone_data.sh
---
old/openstack-quickstart-2013.2+git.1380614452.cc514df/scripts/keystone_data.sh
2013-10-21 02:01:24.000000000 +0200
+++
new/openstack-quickstart-2013.2+git.1389788956.9a72985/scripts/keystone_data.sh
2014-01-16 01:53:19.000000000 +0100
@@ -128,9 +128,9 @@
keystone endpoint-create \
--region RegionOne \
--service_id $NOVA_V3_SERVICE \
- --publicurl "http://$SERVICE_HOST:9696/v3"; \
- --adminurl "http://$SERVICE_HOST:9696/v3"; \
- --internalurl "http://$SERVICE_HOST:9696/v3";
+ --publicurl "http://$SERVICE_HOST:8774/v3"; \
+ --adminurl "http://$SERVICE_HOST:8774/v3"; \
+ --internalurl "http://$SERVICE_HOST:8774/v3";
fi
# Nova needs ResellerAdmin role to download images when accessing
@@ -163,6 +163,9 @@
# Heat
if [[ "$ENABLED_SERVICES" =~ "heat" ]]; then
+ HEAT_API_CFN_PORT=${HEAT_API_CFN_PORT:-8000}
+ HEAT_API_PORT=${HEAT_API_PORT:-8004}
+
HEAT_USER=$(get_id keystone user-create --name=heat \
--pass="$SERVICE_PASSWORD" \
--tenant-id $SERVICE_TENANT \
@@ -170,17 +173,33 @@
keystone user-role-add --tenant-id $SERVICE_TENANT \
--user-id $HEAT_USER \
--role-id $ADMIN_ROLE
+ # heat_stack_user role is for users created by Heat
+ keystone role-create --name heat_stack_user
+
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
HEAT_CFN_SERVICE=$(get_id keystone service-create \
- --name=heat \
- --type=orchestration \
- --description="Heat Service")
+ --name=heat-cfn \
+ --type=cloudformation \
+ --description="Heat CloudFormation Service")
+
keystone endpoint-create \
--region RegionOne \
--service_id $HEAT_CFN_SERVICE \
--publicurl "http://$SERVICE_HOST:$HEAT_API_CFN_PORT/v1"; \
--adminurl "http://$SERVICE_HOST:$HEAT_API_CFN_PORT/v1"; \
--internalurl "http://$SERVICE_HOST:$HEAT_API_CFN_PORT/v1";
+
+ HEAT_SERVICE=$(get_id keystone service-create \
+ --name=heat \
+ --type=orchestration \
+ --description="Heat Service")
+
+ keystone endpoint-create \
+ --region RegionOne \
+ --service_id $HEAT_SERVICE \
+ --publicurl
"http://$SERVICE_HOST:$HEAT_API_PORT/v1/\$(tenant_id)s" \
+ --adminurl "http://$SERVICE_HOST:$HEAT_API_PORT/v1/\$(tenant_id)s"
\
+ --internalurl
"http://$SERVICE_HOST:$HEAT_API_PORT/v1/\$(tenant_id)s"
fi
fi
@@ -340,3 +359,31 @@
fi
fi
+# Ceilometer
+if [[ "$ENABLED_SERVICES" =~ "ceilometer-api" ]]; then
+ CEILOMETER_SERVICE_PROTOCOL=http
+ CEILOMETER_SERVICE_HOST=$SERVICE_HOST
+ CEILOMETER_SERVICE_PORT=${CEILOMETER_SERVICE_PORT:-8777}
+
+ CEILOMETER_USER=$(get_id keystone user-create \
+ --name=ceilometer \
+ --pass="$SERVICE_PASSWORD" \
+ --tenant-id $SERVICE_TENANT \
+ [email protected])
+ keystone user-role-add \
+ --tenant-id $SERVICE_TENANT \
+ --user-id $CEILOMETER_USER \
+ --role-id $ADMIN_ROLE
+ if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
+ CEILOMETER_SERVICE=$(get_id keystone service-create \
+ --name=ceilometer \
+ --type=metering \
+ --description="OpenStack Telemetry Service")
+ keystone endpoint-create \
+ --region RegionOne \
+ --service_id $CEILOMETER_SERVICE \
+ --publicurl
"$CEILOMETER_SERVICE_PROTOCOL://$CEILOMETER_SERVICE_HOST:$CEILOMETER_SERVICE_PORT/"
\
+ --adminurl
"$CEILOMETER_SERVICE_PROTOCOL://$CEILOMETER_SERVICE_HOST:$CEILOMETER_SERVICE_PORT/"
\
+ --internalurl
"$CEILOMETER_SERVICE_PROTOCOL://$CEILOMETER_SERVICE_HOST:$CEILOMETER_SERVICE_PORT/"
+ fi
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-quickstart-2013.2+git.1380614452.cc514df/scripts/openstack-quickstart-demosetup
new/openstack-quickstart-2013.2+git.1389788956.9a72985/scripts/openstack-quickstart-demosetup
---
old/openstack-quickstart-2013.2+git.1380614452.cc514df/scripts/openstack-quickstart-demosetup
2013-10-21 02:01:24.000000000 +0200
+++
new/openstack-quickstart-2013.2+git.1389788956.9a72985/scripts/openstack-quickstart-demosetup
2014-01-16 02:11:55.000000000 +0100
@@ -9,12 +9,6 @@
ADMIN_PASSWORD=$pw
SERVICE_HOST=$IP
-KEYSTONE_SYSTEM_USER=openstack-keystone
-GLANCE_SYSTEM_USER=openstack-glance
-CINDER_SYSTEM_USER=openstack-cinder
-NEUTRON_SYTEM_USER=openstack-neutron
-NOVA_SYSTEM_USER=openstack-nova
-
echo "Setting up OpenStack demo controller..."
function install_packages () {
@@ -28,7 +22,7 @@
}
function get_router_id () {
- eval `neutron router-show -f shell -F id main`
+ eval `neutron router-show -f shell -F id public`
echo $id
}
@@ -134,7 +128,8 @@
. /etc/bash.openstackrc
setcreds admin $pw" >> /etc/bash.bashrc.local
-install_packages patterns-OpenStack-controller patterns-OpenStack-compute-node
patterns-OpenStack-clients patterns-OpenStack-network-node crudini psmisc
+#NOTE(saschpe): Force resolution to avoid zypper ask for user-input where 'c'
(cancel) would be the default (like packages replacing one another).
+install_packages --force-resolution patterns-OpenStack-controller
patterns-OpenStack-compute-node patterns-OpenStack-clients
patterns-OpenStack-network-node crudini psmisc openstack-nova-objectstore
if [ "$DB" = "postgresql" ] ; then
if grep -q "SUSE Linux Enterprise Server 11" /etc/SuSE-release; then
@@ -254,6 +249,8 @@
fi
echo 1 > /proc/sys/net/ipv4/ip_forward
+set -e
+
# configure bridge
if [ ! -e /etc/sysconfig/network/ifcfg-$br ] ; then
echo "net.ipv4.conf.all.proxy_arp = 1" >> /etc/sysctl.conf
@@ -365,22 +362,18 @@
#-----------------------------------------
sed -i "s%sql_connection =.*%sql_connection = $DB://glance:$mpw@$IP/glance%"
/etc/glance/glance-registry.conf /etc/glance/glance-api.conf # db_sync is
broken for postgresql
-#sed -i 's%sql_connection =.*%sql_connection =
sqlite:////var/lib/glance/glance.sqlite%' /etc/glance/glance-registry.conf
-run_as $GLANCE_SYSTEM_USER "glance-manage db_sync"
#-----------------------------------------
## setup nova configuration
#-----------------------------------------
# replace default IP in all configuration files
-crudini --set /etc/nova/nova.conf DEFAULT sql_connection
"$DB://nova:$mpw@$IP/nova"
+crudini --set /etc/nova/nova.conf database connection
"$DB://nova:$mpw@$IP/nova"
crudini --set /etc/nova/nova.conf DEFAULT glance_api_servers "$IP:9292"
crudini --set /etc/nova/nova.conf DEFAULT novncproxy_base_url
"http://$IP:6080/vnc_auto.html";
-# TODO: neutron security group is broken for network shared beetwen
-# multiple tenants https://bugs.launchpad.net/neutron/+bug/1171997
-# we revert to nova one
-crudini --set /etc/nova/nova.conf DEFAULT security_group_api nova
crudini --set /etc/nova/nova.conf DEFAULT allow_resize_to_same_host True
+crudini --set /etc/nova/nova.conf DEFAULT default_floating_pool ext
+crudini --set /etc/nova/nova.conf DEFAULT my_ip "$IP"
extensions_path=$(ls -d /usr/lib*/python*/site-packages/extensions 2>
/dev/null | head -n 1)
if [ -n "$extensions_path" ]; then
@@ -388,7 +381,8 @@
fi
# configure cinder
-crudini --set /etc/cinder/cinder.conf DEFAULT sql_connection
"$DB://cinder:${mpw}@${IP}/cinder"
+crudini --set /etc/cinder/cinder.conf DEFAULT my_ip "$IP"
+crudini --set /etc/cinder/cinder.conf database connection
"$DB://cinder:${mpw}@${IP}/cinder"
for m in cinder heat nova glance neutron ; do
sed -i -e 's/%SERVICE_TENANT_NAME%/service/' \
@@ -398,36 +392,13 @@
done
-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
-if [ "$DB" = "postgresql" ] ; then
- echo "
- update instance_types set memory_mb=3072 where name='m1.medium';
- update instance_types set memory_mb=4096 where name='m1.large';
- update instance_types set memory_mb=5120 where name='m1.xlarge';
- " | sudo -u postgres psql -d nova
-else
- echo "
- use nova;
- update instance_types set memory_mb=3072 where name='m1.medium';
- update instance_types set memory_mb=4096 where name='m1.large';
- update instance_types set memory_mb=5120 where name='m1.xlarge';
- " | mysql -u root $pwquery
-fi
-
# keystone demo setup, based on devstack.sh
sed -i -e 's/kvs/sql/' -e "s,^.*connection =.*,connection =
$DB://keystone:$mpw@$IP/keystone," /etc/keystone/keystone.conf
rm -f /var/lib/keystone/keystone.sqlite # cleanup DB as devstack's script
fails otherwise
-KEYSTONE_CATALOG=/etc/keystone/default_catalog.templates
-sed -e "s,%SERVICE_HOST%,$SERVICE_HOST,g" -e "s/%S3_SERVICE_PORT%/8080/"
$KEYSTONE_CATALOG.sample > $KEYSTONE_CATALOG
crudini --set /etc/keystone/keystone.conf DEFAULT admin_token "$SERVICE_TOKEN"
-# Upgrade the database to the latest schema
-run_as $KEYSTONE_SYSTEM_USER "keystone-manage
--config-file=/etc/keystone/keystone.conf db_sync"
-
/etc/init.d/openstack-keystone restart
keystone_data=/usr/lib/devstack/keystone_data.sh
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,mysql,rabbit"
@@ -438,7 +409,10 @@
ENABLED_SERVICES+=",tempest"
fi
SERVICE_ENDPOINT=$KEYSTONE_AUTH_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v2.0
-ADMIN_PASSWORD=$ADMIN_PASSWORD SERVICE_TOKEN=$SERVICE_TOKEN
SERVICE_ENDPOINT=$SERVICE_ENDPOINT DEVSTACK_DIR=/root
ENABLED_SERVICES=$ENABLED_SERVICES bash $keystone_data
+
+ADMIN_PASSWORD=$ADMIN_PASSWORD KEYSTONE_CATALOG_BACKEND=sql
SERVICE_HOST=$SERVICE_HOST \
+ SERVICE_TOKEN=$SERVICE_TOKEN SERVICE_ENDPOINT=$SERVICE_ENDPOINT
DEVSTACK_DIR=/root \
+ ENABLED_SERVICES=$ENABLED_SERVICES bash $keystone_data
. /etc/bash.bashrc.local
@@ -457,15 +431,14 @@
#-----------------------------------------
crudini --set /etc/neutron/neutron.conf database connection
$DB://neutron:$mpw@$IP/neutron
-crudini --set /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
SECURITYGROUP firewall_driver neutron.agent.firewall.NoopFirewallDriver
-crudini --set /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini DATABASE
sql_connection $DB://neutron:$mpw@$IP/neutron
-crudini --set /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
LINUX_BRIDGE physical_interface_mappings root-bridge:vefq,physnet1:eth0
-crudini --set /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini VLANS
network_vlan_ranges root-bridge,physnet1
-# TODO: should be default openstack-neutron-l3-agent package
-crudini --set /etc/neutron/l3_agent.ini DEFAULT external_network_bridge ""
+
+crudini --set /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
linux_bridge physical_interface_mappings root-bridge:vefq,physnet1:eth0
+# crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2 tenant_network_types
vlan
+crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2_type_vlan
network_vlan_ranges root-bridge,physnet1
### turnof namespace to allow connecting to VMs from demo admin node (simple
setup for demo purposes only)
-crudini --set /etc/neutron/dhcp_agent.ini DEFAULT use_namespaces False
-### start neutron api
+crudini --set /etc/neutron/dhcp_agent.ini DEFAULT use_namespaces false
+crudini --set /etc/neutron/neutron.conf DEFAULT allow_overlapping_ips true
+
start_and_enable_service rabbitmq-server
# Start Keystone and Neutron
@@ -493,16 +466,17 @@
### create subnets
## fixed
SERVICE_TENANT_ID=`get_service_tenant_id`
-neutron net-create fixed --shared --provider:network_type flat
--provider:physical_network root-bridge
+neutron net-create fixed --tenant-id $SERVICE_TENANT_ID --shared
--provider:network_type flat --provider:physical_network root-bridge
neutron subnet-create --name fixed --dns-nameserver 8.8.8.8 --dns-nameserver
8.8.4.4 fixed $testnet
-neutron router-create main
-neutron router-interface-add main fixed
+neutron router-create --tenant-id $SERVICE_TENANT_ID public
+neutron router-interface-add public fixed
+
## floating/external
neutron net-create ext --tenant-id $SERVICE_TENANT_ID --provider:network_type
local --router:external True
+
ext_network_id=$(neutron net-list | grep ' ext ' | cut -d' ' -f2)
-ext_router_id=$(neutron router-list | grep $ext_network_id | cut -d' ' -f2)
neutron subnet-create --name ext --disable-dhcp --tenant-id $SERVICE_TENANT_ID
ext $floatingnet
-neutron router-gateway-set main ext
+neutron router-gateway-set public ext
# create four floatingip pools
for i in 1 2 3 4; do
neutron floatingip-create ext
@@ -525,6 +499,10 @@
start_and_enable_service $s
done
+if [ "x$with_tempest" = "xyes" ]; then
+ start_and_enable_service openstack-nova-objectstore
+fi
+
#-----------------------------------------
## setup heat configuration
#-----------------------------------------
@@ -549,6 +527,11 @@
done
else
grep -q openstack-loopback-lvm /etc/init.d/boot.local || echo
$openstack_loopback_lvm >> /etc/init.d/boot.local
+ # SLE11 and other old distros need boot.lvm enabled
+ if [ -z "$(type -p systemctl)" ]; then
+ insserv boot.lvm
+ /etc/init.d/boot.lvm start
+ fi
start_and_enable_service openstack-cinder-volume
start_and_enable_service openstack-cinder-scheduler
start_and_enable_service openstack-cinder-api
@@ -573,8 +556,13 @@
crudini --set /etc/tempest/tempest.conf identity admin_password $pw
crudini --set /etc/tempest/tempest.conf identity alt_password $pw
crudini --set /etc/tempest/tempest.conf identity password $pw
+ #crudini --set /etc/tempest/tempest.conf compute allow_tenant_isolation
true
+ crudini --set /etc/tempest/tempest.conf compute allow_tenant_isolation
false
+ crudini --set /etc/tempest/tempest.conf compute fixed_network_name fixed
+ crudini --set /etc/tempest/tempest.conf compute network_for_ssh ext
+ crudini --set /etc/tempest/tempest.conf compute-admin password $pw
crudini --set /etc/tempest/tempest.conf network public_network_id
$ext_network_id
- crudini --set /etc/tempest/tempest.conf network public_router_id
$ext_router_id
+ crudini --set /etc/tempest/tempest.conf network public_router_id
$(get_router_id)
crudini --set /etc/tempest/tempest.conf service_available neutron True
crudini --set /etc/tempest/tempest.conf service_available swift False
crudini --set /etc/tempest/tempest.conf stress max_instances 2
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
