[openstack-quantum] Setup script fixes from garyk
Robert A. Kukura
rkukura at fedoraproject.org
Fri Sep 14 15:46:18 UTC 2012
commit e7b0eb8fcd183f7bc7f128444fd6df77513c8ba9
Author: Bob Kukura <rkukura at redhat.com>
Date: Fri Sep 14 11:44:23 2012 -0400
Setup script fixes from garyk
- Fix openvswitch service config file path
- Make log file names consistent with service names
openstack-quantum.spec | 7 ++++-
quantum-dhcp-agent.service | 2 +-
quantum-dhcp-setup | 8 ++--
quantum-l3-agent.service | 2 +-
quantum-linuxbridge-agent.service | 2 +-
quantum-nec-agent.service | 2 +-
quantum-openvswitch-agent.service | 2 +-
quantum-ryu-agent.service | 2 +-
quantum-server-setup | 60 +++++++++++++++++++++---------------
9 files changed, 51 insertions(+), 36 deletions(-)
---
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index c5bdae0..1baf9dc 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -4,7 +4,7 @@
Name: openstack-quantum
Version: 2012.2
-Release: 0.7.rc1%{?dist}
+Release: 0.8.rc1%{?dist}
Summary: Virtual network service for OpenStack (quantum)
Group: Applications/System
@@ -539,6 +539,11 @@ fi
%changelog
+* Fri Sep 14 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.8.rc1
+- Setup script fixes from garyk
+- Fix openvswitch service config file path
+- Make log file names consistent with service names
+
* Thu Sep 13 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.7.rc1
- Fix various issues in setup scripts
- Configure quantum-dhcp-agent to store files under /var/lib/quantum
diff --git a/quantum-dhcp-agent.service b/quantum-dhcp-agent.service
index 4f12698..32ede44 100644
--- a/quantum-dhcp-agent.service
+++ b/quantum-dhcp-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=quantum
-ExecStart=/usr/bin/quantum-dhcp-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/dhcp_agent.ini --log-file /var/log/quantum/dhcp_agent.log
+ExecStart=/usr/bin/quantum-dhcp-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/dhcp_agent.ini --log-file /var/log/quantum/dhcp-agent.log
PrivateTmp=true
[Install]
diff --git a/quantum-dhcp-setup b/quantum-dhcp-setup
index 5d080a9..ddbc444 100755
--- a/quantum-dhcp-setup
+++ b/quantum-dhcp-setup
@@ -125,10 +125,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_username ${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 ${DHCP_CONF} DEFAULT auth_url ${OS_AUTH_URL}
+openstack-config --set ${DHCP_CONF} DEFAULT admin_username ${OS_USERNAME}
+openstack-config --set ${DHCP_CONF} DEFAULT admin_password ${OS_PASSWORD}
+openstack-config --set ${DHCP_CONF} DEFAULT admin_tenant_name ${OS_TENANT_NAME}
# Update interface driver
openstack-config --set ${DHCP_CONF} DEFAULT interface_driver ${LINUX_INTERFACE_DRIVER}
diff --git a/quantum-l3-agent.service b/quantum-l3-agent.service
index 5031422..b6266dc 100644
--- a/quantum-l3-agent.service
+++ b/quantum-l3-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=quantum
-ExecStart=/usr/bin/quantum-l3-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/l3_agent.ini --log-file /var/log/quantum/l3_agent.log
+ExecStart=/usr/bin/quantum-l3-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/l3_agent.ini --log-file /var/log/quantum/l3-agent.log
PrivateTmp=true
[Install]
diff --git a/quantum-linuxbridge-agent.service b/quantum-linuxbridge-agent.service
index 8f5bfa3..5ef2b73 100644
--- a/quantum-linuxbridge-agent.service
+++ b/quantum-linuxbridge-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=quantum
-ExecStart=/usr/bin/quantum-linuxbridge-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini --log-file /var/log/quantum/linuxbridge.log
+ExecStart=/usr/bin/quantum-linuxbridge-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini --log-file /var/log/quantum/linuxbridge-agent.log
PrivateTmp=true
[Install]
diff --git a/quantum-nec-agent.service b/quantum-nec-agent.service
index d5d557a..5bb3563 100644
--- a/quantum-nec-agent.service
+++ b/quantum-nec-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=quantum
-ExecStart=/usr/bin/quantum-nec-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/nec/nec.ini --log-file /var/log/quantum/nec.log
+ExecStart=/usr/bin/quantum-nec-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/nec/nec.ini --log-file /var/log/quantum/nec-agent.log
PrivateTmp=true
[Install]
diff --git a/quantum-openvswitch-agent.service b/quantum-openvswitch-agent.service
index 0bbc995..8c15411 100644
--- a/quantum-openvswitch-agent.service
+++ b/quantum-openvswitch-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=quantum
-ExecStart=/usr/bin/quantum-openvswitch-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/linuxbridge/ovs_quantum_plugin.ini --log-file /var/log/quantum/ovs_quantum.log
+ExecStart=/usr/bin/quantum-openvswitch-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini --log-file /var/log/quantum/openvswitch-agent.log
PrivateTmp=true
[Install]
diff --git a/quantum-ryu-agent.service b/quantum-ryu-agent.service
index d44266c..0bca829 100644
--- a/quantum-ryu-agent.service
+++ b/quantum-ryu-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=simple
User=quantum
-ExecStart=/usr/bin/quantum-ryu-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/ryu/ryu.ini --log-file /var/log/quantum/ryu.log
+ExecStart=/usr/bin/quantum-ryu-agent --config-file /etc/quantum/quantum.conf --config-file /etc/quantum/plugins/ryu/ryu.ini --log-file /var/log/quantum/ryu-agent.log
PrivateTmp=true
[Install]
diff --git a/quantum-server-setup b/quantum-server-setup
index a3d23f2..5d182e4 100755
--- a/quantum-server-setup
+++ b/quantum-server-setup
@@ -85,23 +85,23 @@ 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='hostname'
+Q_HOST='localhost'
Q_PORT=9696
# Keystone specific
-OS_USERNAME=${OS_USERNAME:-admin}
-OS_PASSWORD=${OS_PASSWORD:-verybadpass}
+OS_USERNAME=${OS_USERNAME:-quantum}
+OS_PASSWORD=${OS_PASSWORD:-servicepass}
OS_AUTH_URL=${OS_AUTH_URL:-http://127.0.0.1:35357/v2.0/}
-OS_TENANT_NAME=${OS_TENANT_NAME:-admin}
+OS_TENANT_NAME=${OS_TENANT_NAME:-service}
# Nova specific
NOVA_CONF=/etc/nova/nova.conf
SCHEDULER_DRIVER=""
LIBVIRT_VIF_DRIVER=""
LIBVIRT_VIF_TYPE=""
-LINUX_INTERFACE_DRIVER=""
while [ $# -gt 0 ]
do
@@ -186,6 +186,16 @@ openstack-config --set ${Q_CONF} DEFAULT core_plugin $Q_PLUGIN_CLASS
# QPID
openstack-config --set ${Q_CONF} DEFAULT rpc_backend quantum.openstack.common.rpc.impl_qpid
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 --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}
echo "Plugin: ${QUANTUM_PLUGIN} => Database: ${DB_NAME}"
@@ -318,7 +328,6 @@ case "${QUANTUM_PLUGIN}" in
openstack-config --set ${LB_CONF} LINUX_BRIDGE physical_interface ${NETWORK_DEVICE}
LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.QuantumLinuxBridgeVIFDriver
- LINUX_INTERFACE_DRIVER=nova.network.linux_net.QuantumLinuxBridgeInterfaceDriver
ln -s ${LB_CONF} /etc/quantum/plugin.ini
;;
@@ -326,33 +335,34 @@ case "${QUANTUM_PLUGIN}" in
mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on ovs_quantum.* to '${QUANTUM_USER}'@'%'"
mysql -u root ${MYSQL_ROOT_PW_ARG} -e "grant all on ovs_quantum.* to '${QUANTUM_USER}'@'localhost'"
openstack-config --set ${OVS_CONF} DATABASE sql_connection mysql://${QUANTUM_USER}:${MYSQL_Q_PW}@`hostname`/ovs_quantum
- LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.LibvirtOpenVswitchDriver
- LINUX_INTERFACE_DRIVER=nova.network.linux_net.LinuxOVSInterfaceDriver
+ LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver
ln -s ${OVS_CONF} /etc/quantum/plugin.ini
;;
esac
-echo "Would you like to update the nova configuration files? (y/n): "
-read response
-case "$response" in
-y|Y)
- ;;
-*)
- echo "Complete!"
- exit 0
-esac
+if [ -z "${ASSUME_YES}" ] ; then
+ echo "Would you like to update the nova configuration files? (y/n): "
+ read response
+ case "$response" in
+ y|Y)
+ ;;
+ *)
+ echo "Complete!"
+ exit 0
+ esac
+fi
# If OpenStack is installed then configure nova.conf
if ! [ -e "${NOVA_CONF}" ]; then
echo "Please install OpenStack compute and then set the values"
echo "in /etc/nova/nova.conf DEFAULT section"
- echo " network_api_class nova.network.quantumv2.api.API"
- echo " quantum_admin_username ${OS_USERNAME}"
- echo " quantum_admin_password ${OS_PASSWORD}"
- echo " quantum_admin_auth_url ${OS_AUTH_URL}"
- echo " quantum_auth_strategy keystone"
- echo " quantum_admin_tenant_name ${OS_TENANT_NAME}"
- echo " quantum_url=http://${Q_HOST}:${Q_PORT}"
+ echo " network_api_classi=nova.network.quantumv2.api.API"
+ echo " quantum_admin_username=${OS_USERNAME}"
+ echo " quantum_admin_password=${OS_PASSWORD}"
+ echo " quantum_admin_auth_url=${OS_AUTH_URL}"
+ echo " quantum_auth_strategy=keystone"
+ echo " quantum_admin_tenant_name=${OS_TENANT_NAME}"
+ echo " quantum_url=http://${Q_HOST}:${Q_PORT}/"
echo " libvirt_vif_driver=${LIBVIRT_VIF_DRIVER}"
else
openstack-config --set ${NOVA_CONF} DEFAULT network_api_class nova.network.quantumv2.api.API
@@ -361,7 +371,7 @@ else
openstack-config --set ${NOVA_CONF} DEFAULT quantum_admin_auth_url ${OS_AUTH_URL}
openstack-config --set ${NOVA_CONF} DEFAULT quantum_auth_strategy keystone
openstack-config --set ${NOVA_CONF} DEFAULT quantum_admin_tenant_name ${OS_TENANT_NAME}
- openstack-config --set ${NOVA_CONF} DEFAULT quantum_url=http://${Q_HOST}:${Q_PORT}
+ openstack-config --set ${NOVA_CONF} DEFAULT quantum_url http://${Q_HOST}:${Q_PORT}/
openstack-config --set ${NOVA_CONF} DEFAULT libvirt_vif_driver ${LIBVIRT_VIF_DRIVER}
fi
More information about the scm-commits
mailing list