Hello community,
here is the log from the commit of package openstack-quickstart for
openSUSE:Factory checked in at 2013-08-18 22:39:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-07-02 12:26:33.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.openstack-quickstart.new/openstack-quickstart.changes
2013-08-18 22:39:07.000000000 +0200
@@ -1,0 +2,8 @@
+Sun Jul 14 23:50:47 UTC 2013 - [email protected]
+
+- Update to latest git (200c026):
+ + Setup heat
+ + add missing comment
+ + Setup database connection in neutron
+
+-------------------------------------------------------------------
Old:
----
openstack-quickstart-2013.1+git.1370075232.e1b6374.tar.gz
New:
----
devstack-master.tar.gz
openstack-quickstart-2013.2+git.1373836091.200c026.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-quickstart.spec ++++++
--- /var/tmp/diff_new_pack.QSBPIE/_old 2013-08-18 22:39:08.000000000 +0200
+++ /var/tmp/diff_new_pack.QSBPIE/_new 2013-08-18 22:39:08.000000000 +0200
@@ -17,13 +17,14 @@
Name: openstack-quickstart
-Version: 2013.1+git.1370075232.e1b6374
+Version: 2013.2+git.1373836091.200c026
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
@@ -36,16 +37,23 @@
Scripts and configs to easily generate an openstack demo setup.
%prep
-%setup -q
+%setup -q -a 1
%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)
-%config %{_sbindir}/openstack-quickstart-*
+%{_sbindir}/openstack-quickstart-*
%{_sbindir}/openstack-loopback-lvm
%{_bindir}/getkstoken
/usr/lib/devstack
++++++ _service ++++++
--- /var/tmp/diff_new_pack.QSBPIE/_old 2013-08-18 22:39:08.000000000 +0200
+++ /var/tmp/diff_new_pack.QSBPIE/_new 2013-08-18 22:39:08.000000000 +0200
@@ -12,6 +12,19 @@
<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.1+git.1370075232.e1b6374.tar.gz ->
openstack-quickstart-2013.2+git.1373836091.200c026.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-quickstart-2013.1+git.1370075232.e1b6374/etc/bash.openstackrc
new/openstack-quickstart-2013.2+git.1373836091.200c026/etc/bash.openstackrc
--- old/openstack-quickstart-2013.1+git.1370075232.e1b6374/etc/bash.openstackrc
2013-06-02 02:02:52.000000000 +0200
+++ new/openstack-quickstart-2013.2+git.1373836091.200c026/etc/bash.openstackrc
2013-08-07 02:08:37.000000000 +0200
@@ -1,44 +1,27 @@
-# adjusted by bmw
-# default credentials for SUSE OpenStack appliance
+# default credentials for SUSE OpenStack Appliance
# input: optional username
# input: optional password
-# sets required variables for nova, will read from stdin if param not given
+# sets required variables for OpenStack services, reads from stdin if not given
function setcreds() {
- export NOVA_PROJECT_ID=$1
- if [ -z "$NOVA_PROJECT_ID" ] ; then
+ export OS_USERNAME=$1
+ if [ -z "$OS_USERNAME" ] ; then
echo -n "username: "
- read NOVA_PROJECT_ID
+ read OS_USERNAME
fi
- export NOVA_USERNAME=$NOVA_PROJECT_ID
- export NOVA_API_KEY=$2
- if [ -z "$NOVA_API_KEY" ] ; then
+ export OS_PASSWORD=$2
+ if [ -z "$OS_PASSWORD" ] ; then
echo "password (will not be echoed): "
- read -s NOVA_API_KEY
+ read -s OS_PASSWORD
fi
- export EC2_ACCESS_KEY=$NOVA_PROJECT_ID
- export EC2_SECRET_KEY=$NOVA_API_KEY
- # for glance/keystone
- export OS_AUTH_USER=$NOVA_USERNAME
- export OS_USERNAME=$NOVA_USERNAME
- export OS_TENANT_NAME=$NOVA_PROJECT_ID
- export OS_AUTH_KEY=$NOVA_API_KEY
- export OS_PASSWORD=$NOVA_API_KEY
- export OS_AUTH_TENANT=$NOVA_PROJECT_ID
- export OS_AUTH_URL=$NOVA_URL
+ export EC2_ACCESS_KEY=$1
+ export EC2_SECRET_KEY=$2
+ export OS_TENANT_NAME=admin
+ export OS_AUTH_URL=http://127.0.0.1:5000/v2.0/
export OS_AUTH_STRATEGY=keystone
}
-export NOVA_URL=http://127.0.0.1:5000/v2.0/
-export NOVA_VERSION=1.1
-export NOVA_REGION_NAME=RegionOne
-export NOVA_AUTH_STRATEGY=keystone
#setcreds demo openstack
# for euca2ools
export EC2_URL=http://127.0.0.1:8773/services/Cloud
-
-# for keystone administration
-export SERVICE_ENDPOINT=http://127.0.0.1:35357/v2.0
-# don't put secrets in world readable files - this line is just for reference
-#export SERVICE_TOKEN=999888777666
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-quickstart-2013.1+git.1370075232.e1b6374/scripts/getkstoken
new/openstack-quickstart-2013.2+git.1373836091.200c026/scripts/getkstoken
--- old/openstack-quickstart-2013.1+git.1370075232.e1b6374/scripts/getkstoken
2013-02-27 13:08:22.000000000 +0100
+++ new/openstack-quickstart-2013.2+git.1373836091.200c026/scripts/getkstoken
2013-08-07 02:08:37.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/sh
-NOVA_USERNAME=${NOVA_USERNAME:-admin}
-NOVA_API_KEY=${NOVA_API_KEY:-openstack}
+OS_AUTH_USER=${OS_AUTH_USER:-admin}
+OS_AUTH_PASSWORD=${OS_AUTH_PASSWORD:-openstack}
HOST_IP=${HOST_IP:-127.0.0.1}
-curl -s -d "{\"auth\":{\"passwordCredentials\": {\"username\":
\"$NOVA_USERNAME\", \"password\": \"$NOVA_API_KEY\"}}}" -H "Content-type:
application/json" http://$HOST_IP:5000/v2.0/tokens | python -c "import sys;
import json; tok = json.loads(sys.stdin.read()); print
tok['access']['token']['id'];"
+curl -s -d "{\"auth\":{\"passwordCredentials\": {\"username\":
\"$OS_AUTH_USER\", \"password\": \"$OS_AUTH_PASSWORD\"}}}" -H "Content-type:
application/json" http://$HOST_IP:5000/v2.0/tokens | python -c "import sys;
import json; tok = json.loads(sys.stdin.read()); print
tok['access']['token']['id'];"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-quickstart-2013.1+git.1370075232.e1b6374/scripts/keystone_data.sh
new/openstack-quickstart-2013.2+git.1373836091.200c026/scripts/keystone_data.sh
---
old/openstack-quickstart-2013.1+git.1370075232.e1b6374/scripts/keystone_data.sh
2013-02-27 13:08:22.000000000 +0100
+++
new/openstack-quickstart-2013.2+git.1373836091.200c026/scripts/keystone_data.sh
2013-08-07 02:08:37.000000000 +0200
@@ -7,7 +7,7 @@
# admin admin admin
# service glance admin
# service nova admin, [ResellerAdmin (swift only)]
-# service quantum admin # if enabled
+# service neutron admin # if enabled
# service swift admin # if enabled
# service cinder admin # if enabled
# service heat admin # if enabled
@@ -64,8 +64,6 @@
# -----
ADMIN_ROLE=$(get_id keystone role-create --name=admin)
-KEYSTONEADMIN_ROLE=$(get_id keystone role-create --name=KeystoneAdmin)
-KEYSTONESERVICE_ROLE=$(get_id keystone role-create --name=KeystoneServiceAdmin)
# ANOTHER_ROLE demonstrates that an arbitrary role may be created and used
# TODO(sleepsonthefloor): show how this can be used for rbac in the future!
ANOTHER_ROLE=$(get_id keystone role-create --name=anotherrole)
@@ -76,11 +74,6 @@
keystone user-role-add --user_id $ADMIN_USER --role_id $ADMIN_ROLE --tenant_id
$DEMO_TENANT
keystone user-role-add --user_id $DEMO_USER --role_id $ANOTHER_ROLE
--tenant_id $DEMO_TENANT
-# TODO(termie): these two might be dubious
-keystone user-role-add --user_id $ADMIN_USER --role_id $KEYSTONEADMIN_ROLE
--tenant_id $ADMIN_TENANT
-keystone user-role-add --user_id $ADMIN_USER --role_id $KEYSTONESERVICE_ROLE
--tenant_id $ADMIN_TENANT
-
-
# The Member role is used by Horizon and Swift so we need to keep it:
MEMBER_ROLE=$(get_id keystone role-create --name=Member)
keystone user-role-add --user_id $DEMO_USER --role_id $MEMBER_ROLE --tenant_id
$DEMO_TENANT
@@ -229,23 +222,23 @@
fi
if [[ "$ENABLED_SERVICES" =~ "q-svc" ]]; then
- QUANTUM_USER=$(get_id keystone user-create \
- --name=quantum \
+ NEUTRON_USER=$(get_id keystone user-create \
+ --name=neutron \
--pass="$SERVICE_PASSWORD" \
--tenant_id $SERVICE_TENANT \
- [email protected])
+ [email protected])
keystone user-role-add \
--tenant_id $SERVICE_TENANT \
- --user_id $QUANTUM_USER \
+ --user_id $NEUTRON_USER \
--role_id $ADMIN_ROLE
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
- QUANTUM_SERVICE=$(get_id keystone service-create \
- --name=quantum \
+ NEUTRON_SERVICE=$(get_id keystone service-create \
+ --name=neutron \
--type=network \
--description="Quantum Service")
keystone endpoint-create \
--region RegionOne \
- --service_id $QUANTUM_SERVICE \
+ --service_id $NEUTRON_SERVICE \
--publicurl "http://$SERVICE_HOST:9696/"; \
--adminurl "http://$SERVICE_HOST:9696/"; \
--internalurl "http://$SERVICE_HOST:9696/";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openstack-quickstart-2013.1+git.1370075232.e1b6374/scripts/openstack-quickstart-demosetup
new/openstack-quickstart-2013.2+git.1373836091.200c026/scripts/openstack-quickstart-demosetup
---
old/openstack-quickstart-2013.1+git.1370075232.e1b6374/scripts/openstack-quickstart-demosetup
2013-06-02 02:02:53.000000000 +0200
+++
new/openstack-quickstart-2013.2+git.1373836091.200c026/scripts/openstack-quickstart-demosetup
2013-08-07 02:08:37.000000000 +0200
@@ -18,8 +18,8 @@
GLANCE_SYSTEM_GROUP=openstack-glance
CINDER_SYSTEM_USER=openstack-cinder
CINDER_SYSTEM_GROUP=openstack-cinder
-QUANTUM_SYSTEM_USER=openstack-quantum
-QUANTUM_SYSTEM_GROUP=openstack-quantum
+NEUTRON_SYTEM_USER=openstack-neutron
+NEUTRON_SYTEM_GROUP=openstack-neutron
NOVA_SYSTEM_USER=openstack-nova
NOVA_SYSTEM_GROUP=openstack-nova
HORIZON_SYSTEM_USER=openstack-horizon
@@ -37,7 +37,7 @@
}
function get_router_id () {
- eval `quantum router-show -f shell -F id main`
+ eval `neutron router-show -f shell -F id main`
echo $id
}
@@ -64,26 +64,26 @@
function get_ext_bridge_name () {
local id
- eval `quantum net-show -f shell -F id ext`
+ eval `neutron net-show -f shell -F id ext`
echo "brq"${id:0:11}
}
function get_ext_bridge_ip () {
local gateway_ip
- eval `quantum subnet-show -f shell -F gateway_ip ext`
+ eval `neutron subnet-show -f shell -F gateway_ip ext`
echo $gateway_ip
}
function get_ext_bridge_ip_prefix () {
local cidr
- eval `quantum subnet-show -f shell -F cidr ext`
+ eval `neutron subnet-show -f shell -F cidr ext`
echo $cidr | cut -f2 -d/
}
function get_ext_bridge_cidr () {
local cidr
- eval `quantum subnet-show -f shell -F cidr ext`
+ eval `neutron subnet-show -f shell -F cidr ext`
echo $cidr
}
@@ -95,18 +95,17 @@
IPADDR='$2'
STARTMODE='onboot'
USERCONTROL='no'
-POST_UP_SCRIPT='openstack-quickstart-quantum-$1'
+POST_UP_SCRIPT='openstack-quickstart-neutron-$1'
EOF
- cat >/etc/sysconfig/network/scripts/openstack-quickstart-quantum-$1<<EOF
+ cat >/etc/sysconfig/network/scripts/openstack-quickstart-neutron-$1<<EOF
iptables -t nat -A POSTROUTING -s $3 -o $br -j MASQUERADE
EOF
- chmod 755 /etc/sysconfig/network/scripts/openstack-quickstart-quantum-$1
+ chmod 755 /etc/sysconfig/network/scripts/openstack-quickstart-neutron-$1
}
# iproute2 on 12.3 is broken, bnc#816215
function update_iproute2_on_opensuse_12_3 () {
- grep -q 'openSUSE 12.3' /etc/SuSE-release
- if [[ $? -eq 0 ]] ; then
+ if grep -q 'openSUSE 12.3' /etc/SuSE-release; then
OUT=`zypper lr -u | grep 'http://download.opensuse.org/update/12.3/'`
echo $OUT | grep -q 'http://download.opensuse.org/update/12.3/'
if [[ $? -ne 0 ]] ; then
@@ -130,13 +129,10 @@
. /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
-# this will be removed when openstack-utils will be attached to one of the
patterns above
-install_packages openstack-utils
+install_packages patterns-OpenStack-controller patterns-OpenStack-compute-node
patterns-OpenStack-clients patterns-OpenStack-network-node openstack-utils
if [ "$DB" = "postgresql" ] ; then
- grep -q "SUSE Linux Enterprise Server 11" /etc/SuSE-release
- if test $? -eq 0; then
+ if grep -q "SUSE Linux Enterprise Server 11" /etc/SuSE-release; then
install_packages postgresql91-server python-psycopg2
else
install_packages postgresql-server python-psycopg2
@@ -193,13 +189,13 @@
ifdown eth0 # because systemd ignores the above
sed -i -e "s/\(BOOTPROTO\).*/\1='static'/" \
-e "s|^\(IPADDR\).*|\1='0.0.0.0\\/32'|"
/etc/sysconfig/network/ifcfg-eth0
- cat >/etc/sysconfig/network/scripts/openstack-quickstart-quantum-$br<<EOF
+ cat >/etc/sysconfig/network/scripts/openstack-quickstart-neutron-$br<<EOF
ip link add name vefr type veth peer name vefq
ip link set vefr up
ip link set vefq up
brctl addif $br vefr
EOF
-chmod 755 /etc/sysconfig/network/scripts/openstack-quickstart-quantum-$br
+chmod 755 /etc/sysconfig/network/scripts/openstack-quickstart-neutron-$br
cat >/etc/sysconfig/network/ifcfg-$br <<EOF
BOOTPROTO='dhcp4'
BRIDGE='yes'
@@ -215,7 +211,7 @@
REMOTE_IPADDR=''
STARTMODE='onboot'
USERCONTROL='no'
-POST_UP_SCRIPT='openstack-quickstart-quantum-$br'
+POST_UP_SCRIPT='openstack-quickstart-neutron-$br'
EOF
/etc/init.d/network start
fi
@@ -260,21 +256,19 @@
# 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
-
-# configure nova
-perl -i.bak -pe
"s,sql_connection=\w+://\w+:[^\@:]*,sql_connection=$DB://nova:$mpw,;
s/<IP>/$IP/g;" /etc/nova/nova.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";
-# TODO: quantum security group is broken for network shared beetwen
-# multiple tenants https://bugs.launchpad.net/quantum/+bug/1171997
+# TODO: neutron security group is broken for network shared beetwen
+# multiple tenants https://bugs.launchpad.net/neutron/+bug/1171997
# we revert to nova one
openstack-config --set /etc/nova/nova.conf DEFAULT security_group_api nova
-openstack-config --set /etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
SECURITYGROUP firewall_driver quantum.agent.firewall.NoopFirewallDriver
+openstack-config --set /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
SECURITYGROUP firewall_driver neutron.agent.firewall.NoopFirewallDriver
# TODO: this needs to be set as a default in openstack-nova package
-#openstack-config --set /etc/nova/nova.conf DEFAULT
service_quantum_metadata_proxy true
+#openstack-config --set /etc/nova/nova.conf DEFAULT service_neutron true
extensions_path=$(ls -d /usr/lib*/python*/site-packages/extensions 2>
/dev/null | head -n 1)
if [ -n "$extensions_path" ]; then
@@ -285,12 +279,18 @@
openstack-config --set /etc/cinder/cinder.conf DEFAULT sql_connection
"$DB://cinder:${mpw}@${IP}/cinder"
# configure tgt for cinder
-grep -q "include /var/lib/cinder/volumes" /etc/tgt/targets.conf || echo
"include /var/lib/cinder/volumes/*" >> /etc/tgt/targets.conf
-rctgtd restart
+if [ -f /etc/tgt/targets.conf ]; then
+ grep -q "include /var/lib/cinder/volumes" /etc/tgt/targets.conf || {
+ echo "include /var/lib/cinder/volumes/*" >> /etc/tgt/targets.conf
+ rctgtd restart
+ }
+fi
-perl -i -pe "s/%SERVICE_TOKEN%/$SERVICE_TOKEN/;" /etc/nova/api-paste.ini #
obsolete 2012-03-19?
-for m in cinder nova glance quantum ; do
- sed -i -e 's/%SERVICE_TENANT_NAME%/service/' -e "s/%SERVICE_USER%/$m/" -e
"s/%SERVICE_PASSWORD%/$SERVICE_TOKEN\nadmin_token = $SERVICE_TOKEN/"
/etc/$m/*.ini /etc/$m/*.conf
+for m in cinder heat nova glance neutron ; do
+ sed -i -e 's/%SERVICE_TENANT_NAME%/service/' \
+ -e "s/%SERVICE_USER%/$m/" \
+ -e "s/%SERVICE_PASSWORD%/$ADMIN_PASSWORD/" \
+ /etc/$m/*.ini /etc/$m/$m*.conf
done
if [ "$DB" = "postgresql" ] ; then
@@ -307,19 +307,19 @@
fi
fi
sudo -u postgres dropdb keystone || true # needed for keystone_data.sh
- for DBNAME in nova cinder keystone glance horizon quantum ; do
+ for DBNAME in nova cinder keystone glance horizon heat neutron ; do
# use ALTER if CREATE fails: the role probably already exists
# in that case
sudo -u postgres psql -c "CREATE ROLE $DBNAME PASSWORD '$mpw' LOGIN;"
|| \
sudo -u postgres psql -c "ALTER ROLE $DBNAME PASSWORD '$mpw' LOGIN;"
sudo -u postgres createdb -O $DBNAME $DBNAME || true
done
- sudo -u postgres createuser -s root
+ sudo -u postgres createuser -s root || :
/etc/init.d/postgresql restart
insserv postgresql
else
echo | mysql -u root || pwquery=-p
- for DBNAME in nova cinder keystone glance horizon quantum ; do
+ for DBNAME in nova cinder keystone glance horizon neutron ; do
echo "
set global character_set_server=latin1;
set session character_set_server=latin1;
@@ -354,7 +354,7 @@
fi
#run_as $NOVA_SYSTEM_USER "nova-manage network create 10.10.134.32/27 1 32"
-#migrated to quantum
+#migrated to neutron
#run_as $NOVA_SYSTEM_USER "nova-manage network create
--fixed_range_v4=$testnet --label=testnet"
@@ -387,7 +387,9 @@
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
-ADMIN_PASSWORD=$ADMIN_PASSWORD SERVICE_TENANT_NAME=service
SERVICE_PASSWORD=$SERVICE_TOKEN SERVICE_TOKEN=$SERVICE_TOKEN
SERVICE_ENDPOINT=$SERVICE_ENDPOINT DEVSTACK_DIR=/root
ENABLED_SERVICES=$ENABLED_SERVICES bash $keystone_data
+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
if which aa-complain >&/dev/null; then
aa-complain /etc/apparmor.d/usr.sbin.libvirtd
@@ -404,32 +406,40 @@
# change libvirt to run qemu as user qemu
sed -i -e 's;.*user.*=.*;user = "qemu";' /etc/libvirt/qemu.conf
-chown root:kvm /dev/kvm
-chmod 660 /dev/kvm
+if [ -e /dev/kvm ]; then
+ chown root:kvm /dev/kvm
+ chmod 660 /dev/kvm
+fi
#-----------------------------------------
-## setup quantum configuration
+## setup heat configuration
#-----------------------------------------
-openstack-config --set /etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
DATABASE sql_connection $DB://quantum:$mpw@$IP/quantum
-openstack-config --set /etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
LINUX_BRIDGE physical_interface_mappings root-bridge:vefq,physnet1:eth0
-openstack-config --set /etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
VLANS network_vlan_ranges root-bridge,physnet1
-# TODO: should be default openstack-quantum-l3-agent package
-openstack-config --set /etc/quantum/l3_agent.ini DEFAULT
external_network_bridge ""
+openstack-config --set /etc/heat/heat-engine.conf DEFAULT sql_connection
$DB://heat:$mpw@$IP/heat
+
+#-----------------------------------------
+## setup neutron configuration
+#-----------------------------------------
+
+openstack-config --set /etc/neutron/neutron.conf database connection
$DB://neutron:$mpw@$IP/neutron
+openstack-config --set /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
DATABASE sql_connection $DB://neutron:$mpw@$IP/neutron
+openstack-config --set /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
LINUX_BRIDGE physical_interface_mappings root-bridge:vefq,physnet1:eth0
+openstack-config --set /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
VLANS network_vlan_ranges root-bridge,physnet1
+# TODO: should be default openstack-neutron-l3-agent package
+openstack-config --set /etc/neutron/l3_agent.ini DEFAULT
external_network_bridge ""
### turnof namespace to allow connecting to VMs from demo admin node (simple
setup for demo purposes only)
-openstack-config --set /etc/quantum/dhcp_agent.ini DEFAULT use_namespaces
False
-### start quantum api
+openstack-config --set /etc/neutron/dhcp_agent.ini DEFAULT use_namespaces False
+### start neutron api
start_and_enable_service rabbitmq-server
-start_and_enable_service openstack-quantum
-. /etc/bash.bashrc.local
-### wait until quantum will start
+start_and_enable_service openstack-neutron
+### wait until neutron will start
cnt=0
while : ; do
if [[ $cnt -gt 6 ]] ; then
- echo "Can't reach quantum server. Exiting !!!" >&2
+ echo "Can't reach neutron server. Exiting !!!" >&2
exit 1
fi
- quantum net-list
+ neutron net-list
if [[ $? -eq 0 ]] ; then
break
fi
@@ -439,17 +449,17 @@
### create subnets
## fixed
SERVICE_TENANT_ID=`get_service_tenant_id`
-quantum net-create fixed --shared --provider:network_type flat
--provider:physical_network root-bridge
-quantum subnet-create --name fixed --dns-nameserver 8.8.8.8 --dns-nameserver
8.8.4.4 fixed $testnet
-quantum router-create main
-quantum router-interface-add main fixed
+neutron net-create fixed --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
## floating/external
-quantum net-create ext --tenant-id $SERVICE_TENANT_ID --provider:network_type
local --router:external True
-quantum subnet-create --name ext --disable-dhcp --tenant-id $SERVICE_TENANT_ID
ext $floatingnet
-quantum router-gateway-set main ext
- create four floatingip pools
+neutron net-create ext --tenant-id $SERVICE_TENANT_ID --provider:network_type
local --router:external True
+neutron subnet-create --name ext --disable-dhcp --tenant-id $SERVICE_TENANT_ID
ext $floatingnet
+neutron router-gateway-set main ext
+# create four floatingip pools
for i in 1 2 3 4; do
-quantum floatingip-create ext
+neutron floatingip-create ext
done
### create routing configuration for external bridge
ext_bridge_name=`get_ext_bridge_name`
@@ -458,11 +468,11 @@
setup_ext_bridge_on_boot $ext_bridge_name $ext_bridge_ip $ext_bridge_cidr
ifup $ext_bridge_name
#-----------------------------------------
-## end quantum setup configuration
+## end neutron setup configuration
#---------------------------------------
# start services
-for s in ntp libvirtd $DB iscsitarget open-iscsi tgtd memcached apache2
openstack-nova-api openstack-nova-conductor openstack-nova-scheduler
openstack-nova-compute openstack-nova-vncproxy openstack-glance-api
openstack-glance-registry openstack-keystone openstack-nova-consoleauth
openstack-novncproxy openstack-quantum-linuxbridge-agent
openstack-quantum-dhcp-agent openstack-quantum-l3-agent
openstack-quantum-metadata-agent
+for s in ntp libvirtd $DB iscsitarget open-iscsi tgtd memcached apache2
openstack-nova-api openstack-nova-conductor openstack-nova-scheduler
openstack-nova-compute openstack-nova-vncproxy openstack-glance-api
openstack-glance-registry openstack-keystone openstack-nova-consoleauth
openstack-novncproxy openstack-neutron-linuxbridge-agent
openstack-neutron-dhcp-agent openstack-neutron-l3-agent
openstack-neutron-metadata-agent
do
start_and_enable_service $s
done
@@ -486,8 +496,6 @@
done
fi
-. /etc/bash.bashrc.local
-
for user in demo admin ; do
setcreds $user $pw
nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0 # to allow ping
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
