[openstack-quantum/el6-grizzly] Update to grizzly release
Terry Wilson
otherwiseguy at fedoraproject.org
Mon Apr 8 19:42:06 UTC 2013
commit 6ef32fd092748143a093fde8b63d3229d47f7ba6
Author: Gary Kotton <gkotton at redhat.com>
Date: Mon Apr 8 04:20:00 2013 -0400
Update to grizzly release
Conflicts:
openstack-quantum.spec
0001-Add-lbaas_agent-files-to-setup.py.patch | 36 --------------------------
openstack-quantum.spec | 36 +++++++++++++------------
quantum-l3-setup | 26 ++++++++++++++++---
quantum-server-setup | 13 ++++-----
sources | 2 +-
5 files changed, 48 insertions(+), 65 deletions(-)
---
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index ed5de65..3b7a594 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -1,20 +1,18 @@
#
-# This is 2013.1 grizzly milestone 3
+# This is 2013.1 release
#
%global release_name grizzly
-%global milestone rc2
Name: openstack-quantum
Version: 2013.1
-Release: 0.6.%{milestone}%{?dist}
+Release: 1%{?dist}
Summary: OpenStack Networking Service
Group: Applications/System
License: ASL 2.0
URL: http://launchpad.net/quantum/
-#Source0: http://launchpad.net/quantum/%%{release_name}/%%{version}/+download/quantum-%%{version}.tar.gz
-Source0: http://launchpad.net/quantum/%{release_name}/%{release_name}-%{milestone}/+download/quantum-%{version}.%{milestone}.tar.gz
+Source0: http://launchpad.net/quantum/%{release_name}/%{version}/+download/quantum-%{version}.tar.gz
Source1: quantum.logrotate
Source2: quantum-sudoers
Source4: quantum-server-setup
@@ -43,14 +41,12 @@ Source28: quantum-ovs-cleanup.upstart
Source19: quantum-lbaas-agent.init
Source29: quantum-lbaas-agent.upstart
-# This is EPEL specific and not upstream
-Patch100: openstack-quantum-newdeps.patch
-
#
-# patches_base=2013.1.rc2
+# patches_base=2013.1
#
-Patch0001: 0001-Add-lbaas_agent-files-to-setup.py.patch
+# This is EPEL specific and not upstream
+Patch100: openstack-quantum-newdeps.patch
BuildArch: noarch
@@ -307,14 +303,12 @@ networks using multiple other quantum plugins.
%prep
-%setup -q -n quantum-%{version}.%{milestone}
-
-%patch0001 -p1
+%setup -q -n quantum-%{version}
# Apply EPEL patch
%patch100 -p1
-sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO
+sed -i 's/%{version}/%{version}/' PKG-INFO
find quantum -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
@@ -377,9 +371,7 @@ mv %{buildroot}/usr/etc/quantum/* %{buildroot}%{_sysconfdir}/quantum
chmod 640 %{buildroot}%{_sysconfdir}/quantum/plugins/*/*.ini
# Configure agents to use quantum-rootwrap
-for f in %{buildroot}%{_sysconfdir}/quantum/plugins/*/*.ini %{buildroot}%{_sysconfdir}/quantum/*_agent.ini; do
- sed -i 's/^root_helper.*/root_helper = sudo quantum-rootwrap \/etc\/quantum\/rootwrap.conf/g' $f
-done
+sed -i 's/^root_helper.*/root_helper = sudo quantum-rootwrap \/etc\/quantum\/rootwrap.conf/g' %{buildroot}%{_sysconfdir}/quantum/quantum.conf
# Configure quantum-dhcp-agent state_path
sed -i 's/state_path = \/opt\/stack\/data/state_path = \/var\/lib\/quantum/' %{buildroot}%{_sysconfdir}/quantum/dhcp_agent.ini
@@ -749,6 +741,16 @@ fi
%changelog
+* Wed Apr 4 2013 Gary Kotton <gkotton at redhat.com> - 2013.1-1
+- Update to grizzly release
+
+* Wed Apr 4 2013 Gary Kotton <gkotton at redhat.com> - 2013.1-0.7.rc3
+- Update to grizzly rc3
+- Update rootwrap (bug 947793)
+- Update l3-agent-setup to support qpid (bug 947532)
+- Update l3-agent-setup to support metadata-agent credentials
+- Update keystone authentication details (bug 947776)
+
* Tue Mar 26 2013 Terry Wilson <twilson at redhat.com> - 2013.1-0.6.rc2
- Update to grizzly rc2
diff --git a/quantum-l3-setup b/quantum-l3-setup
index f9030af..d572d14 100755
--- a/quantum-l3-setup
+++ b/quantum-l3-setup
@@ -33,6 +33,8 @@ Options:
--plugin | -p
The quantum plugin. Supported plugins:-
${SUPPORTED_PLUGINS[*]}
+ --qhost | -q
+ The Quantum hostname (assumes that this is also the QPID host).
EOF
exit 0
@@ -49,6 +51,7 @@ is_valid_plugin() {
}
L3_CONF=/etc/quantum/l3_agent.ini
+L3_META_CONF=/etc/quantum/metadata_agent.ini
while [ $# -gt 0 ]
do
@@ -60,6 +63,10 @@ do
shift
QUANTUM_PLUGIN=${1}
;;
+ -q|--qhost)
+ shift
+ Q_HOST=${1}
+ ;;
*)
# ignore
shift
@@ -85,6 +92,17 @@ fi
echo "Quantum plugin: ${QUANTUM_PLUGIN}"
+if [ -z ${Q_HOST} ] ; then
+ echo "Please enter the Quantum hostname:"
+ read Q_HOST
+fi
+
+Q_PORT=9696
+Q_CONF=/etc/quantum/quantum.conf
+# QPID
+openstack-config --set ${Q_CONF} DEFAULT rpc_backend quantum.openstack.common.rpc.impl_qpid
+openstack-config --set ${Q_CONF} DEFAULT qpid_hostname ${Q_HOST}
+
case "${QUANTUM_PLUGIN}" in
"linuxbridge")
LINUX_INTERFACE_DRIVER=quantum.agent.linux.interface.BridgeInterfaceDriver
@@ -109,10 +127,10 @@ OS_AUTH_URL=${OS_AUTH_URL:-http://localhost:35357/v2.0/}
OS_TENANT_NAME=${OS_TENANT_NAME:-service}
# Update Keystone
-openstack-config --set ${L3_CONF} DEFAULT auth_url ${OS_AUTH_URL}
-openstack-config --set ${L3_CONF} DEFAULT admin_user ${OS_USERNAME}
-openstack-config --set ${L3_CONF} DEFAULT admin_password ${OS_PASSWORD}
-openstack-config --set ${L3_CONF} DEFAULT admin_tenant_name ${OS_TENANT_NAME}
+openstack-config --set ${L3_META_CONF} DEFAULT auth_url ${OS_AUTH_URL}
+openstack-config --set ${L3_META_CONF} DEFAULT admin_user ${OS_USERNAME}
+openstack-config --set ${L3_META_CONF} DEFAULT admin_password ${OS_PASSWORD}
+openstack-config --set ${L3_META_CONF} DEFAULT admin_tenant_name ${OS_TENANT_NAME}
# Update interface driver
openstack-config --set ${L3_CONF} DEFAULT interface_driver ${LINUX_INTERFACE_DRIVER}
diff --git a/quantum-server-setup b/quantum-server-setup
index 5d182e4..59a3ebe 100755
--- a/quantum-server-setup
+++ b/quantum-server-setup
@@ -85,7 +85,6 @@ ASSUME_YES=""
QUANTUM_USER=quantum
MYSQL_Q_PW=quantum
Q_CONF=/etc/quantum/quantum.conf
-Q_API_PASTE=/etc/quantum/api-paste.ini
LB_CONF=/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini
OVS_CONF=/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
Q_HOST='localhost'
@@ -189,13 +188,13 @@ openstack-config --set ${Q_CONF} DEFAULT qpid_hostname localhost
# Authentication
openstack-config --set ${Q_CONF} DEFAULT auth_strategy keystone
-openstack-config --del ${Q_API_PASTE} filter:authtoken admin_tenant_name
-openstack-config --del ${Q_API_PASTE} filter:authtoken admin_user
-openstack-config --del ${Q_API_PASTE} filter:authtoken admin_password
+openstack-config --del ${Q_CONF} keystone_authtoken admin_tenant_name
+openstack-config --del ${Q_CONF} keystone_authtoken admin_user
+openstack-config --del ${Q_CONF} keystone_authtoken admin_password
-openstack-config --set ${Q_API_PASTE} filter:authtoken admin_tenant_name ${OS_TENANT_NAME}
-openstack-config --set ${Q_API_PASTE} filter:authtoken admin_user ${OS_USERNAME}
-openstack-config --set ${Q_API_PASTE} filter:authtoken admin_password ${OS_PASSWORD}
+openstack-config --set ${Q_CONF} keystone_authtoken admin_tenant_name ${OS_TENANT_NAME}
+openstack-config --set ${Q_CONF} keystone_authtoken admin_user ${OS_USERNAME}
+openstack-config --set ${Q_CONF} keystone_authtoken admin_password ${OS_PASSWORD}
echo "Plugin: ${QUANTUM_PLUGIN} => Database: ${DB_NAME}"
diff --git a/sources b/sources
index ad0387b..93b2eb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe875214170f5a7daa6f895f0ebefaa3 quantum-2013.1.rc2.tar.gz
+1ad2338b25cfde582de479678533113e quantum-2013.1.tar.gz
More information about the scm-commits
mailing list