[openstack-quantum] Various packaging fixes
Robert A. Kukura
rkukura at fedoraproject.org
Fri Sep 14 04:55:59 UTC 2012
commit f1aa065145aae8e11ea65e0040d9721b6f798300
Author: Bob Kukura <rkukura at redhat.com>
Date: Fri Sep 14 00:49:07 2012 -0400
Various packaging fixes
- Fix various issues in setup scripts
- Configure quantum-dhcp-agent to store files under /var/lib/quantum
- Make config files with passwords world-unreadable
- Replace bug workarounds with upstream patches
openstack-quantum.spec | 66 ++++++++++++-------
quantum-dhcp-setup | 12 +++-
quantum-l3-setup | 11 +++-
quantum-node-setup | 13 ++---
...-12e2afc113add0150f3f6f5d2975929367854880.patch | 54 ++++++++++++++++
...-39cce9beddc6d3ed78c8c55bd972465a7af69420.patch | 49 +++++++++++++++
...-713d92e7b1397386be8fbca3a29eaa492e28f2b6.patch | 26 ++++++++
...-7e2db08e6f4ed5f0d640b4c07189a8edd0b28b28.patch | 46 ++++++++++++++
8 files changed, 242 insertions(+), 35 deletions(-)
---
diff --git a/openstack-quantum.spec b/openstack-quantum.spec
index fcfbf87..c5bdae0 100644
--- a/openstack-quantum.spec
+++ b/openstack-quantum.spec
@@ -4,7 +4,7 @@
Name: openstack-quantum
Version: 2012.2
-Release: 0.6.rc1%{?dist}
+Release: 0.7.rc1%{?dist}
Summary: Virtual network service for OpenStack (quantum)
Group: Applications/System
@@ -28,6 +28,19 @@ Source15: quantum-dhcp-agent.service
Source16: quantum-l3-agent.service
+# Remove #!/bin/python (https://bugs.launchpad.net/quantum/+bug/1050053)
+Patch0001: quantum.git-12e2afc113add0150f3f6f5d2975929367854880.patch
+
+# Fix filters_path (https://bugs.launchpad.net/quantum/+bug/1050062)
+Patch0002: quantum.git-713d92e7b1397386be8fbca3a29eaa492e28f2b6.patch
+
+# Missing quantum-nec-agent executable (https://bugs.launchpad.net/quantum/+bug/1050047)
+Patch0003: quantum.git-7e2db08e6f4ed5f0d640b4c07189a8edd0b28b28.patch
+
+# Install rootwrap files (https://bugs.launchpad.net/quantum/+bug/1050045)
+Patch0004: quantum.git-39cce9beddc6d3ed78c8c55bd972465a7af69420.patch
+
+
BuildArch: noarch
BuildRequires: python2-devel
@@ -196,10 +209,12 @@ networks using multiple other quantum plugins.
%prep
%setup -q -n quantum-%{version}
-find quantum -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch0004 -p1
-# Remove interpreter (https://bugs.launchpad.net/quantum/+bug/1050053)
-find quantum/debug -name \*.py -exec sed -i '/\/bin\/python/d' {} \;
+find quantum -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
chmod 644 quantum/plugins/cisco/README
@@ -210,12 +225,6 @@ sed -i 's/\# auth_strategy = keystone/auth_strategy = noauth/' etc/quantum.conf
# Remove unneeded dependency
sed -i '/setuptools_git/d' setup.py
-# Create missing executable (https://bugs.launchpad.net/quantum/+bug/1050047)
-cp bin/quantum-ryu-agent bin/quantum-nec-agent
-sed -i 's/ryu/nec/g' bin/quantum-nec-agent
-
-# Fix filters_path (https://bugs.launchpad.net/quantum/+bug/1050062)
-sed -i 's/\/usr\/share\/quantum\/filters/\/usr\/share\/quantum\/rootwrap/' etc/rootwrap.conf
%build
%{__python} setup.py build
@@ -246,9 +255,9 @@ install -p -D -m 755 bin/quantum-rootwrap %{buildroot}%{_bindir}/quantum-rootwra
install -p -D -m 755 bin/quantum-ryu-agent %{buildroot}%{_bindir}/quantum-ryu-agent
install -p -D -m 755 bin/quantum-server %{buildroot}%{_bindir}/quantum-server
-# Install rootwrap files (https://bugs.launchpad.net/quantum/+bug/1050045)
-mkdir -p %{buildroot}%{_datarootdir}/quantum/rootwrap
-install -p -D -m 644 etc/quantum/rootwrap.d/*.filters %{buildroot}%{_datarootdir}/quantum/rootwrap
+# Move rootwrap files to proper location
+install -d -m 755 %{buildroot}%{_datarootdir}/quantum/rootwrap
+mv %{buildroot}/usr/etc/quantum/rootwrap.d/*.filters %{buildroot}%{_datarootdir}/quantum/rootwrap
# Move config files to proper location
install -d -m 755 %{buildroot}%{_sysconfdir}/quantum
@@ -263,6 +272,9 @@ for f in %{buildroot}%{_sysconfdir}/quantum/plugins/*/*.ini %{buildroot}%{_sysco
sed -i 's/^root_helper.*/root_helper = sudo quantum-rootwrap \/etc\/quantum\/rootwrap.conf/g' $f
done
+# 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
+
# Install logrotate
install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-quantum
@@ -408,11 +420,11 @@ fi
%{_unitdir}/quantum-l3-agent.service
%{_unitdir}/quantum-server.service
%dir %{_sysconfdir}/quantum
-%config(noreplace) %{_sysconfdir}/quantum/api-paste.ini
-%config(noreplace) %{_sysconfdir}/quantum/dhcp_agent.ini
-%config(noreplace) %{_sysconfdir}/quantum/l3_agent.ini
+%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/api-paste.ini
+%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/dhcp_agent.ini
+%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/l3_agent.ini
%config(noreplace) %{_sysconfdir}/quantum/policy.json
-%config(noreplace) %{_sysconfdir}/quantum/quantum.conf
+%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/quantum.conf
%config(noreplace) %{_sysconfdir}/quantum/rootwrap.conf
%dir %{_sysconfdir}/quantum/plugins
%config(noreplace) %{_sysconfdir}/logrotate.d/*
@@ -463,7 +475,7 @@ fi
%{python_sitelib}/quantum/extensions/_qos_view.py*
%{python_sitelib}/quantum/plugins/cisco
%dir %{_sysconfdir}/quantum/plugins/cisco
-%config(noreplace) %attr(-, root, quantum) %{_sysconfdir}/quantum/plugins/cisco/*.ini
+%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/plugins/cisco/*.ini
%files -n openstack-quantum-linuxbridge
@@ -474,7 +486,7 @@ fi
%{python_sitelib}/quantum/plugins/linuxbridge
%{_datarootdir}/quantum/rootwrap/linuxbridge-plugin.filters
%dir %{_sysconfdir}/quantum/plugins/linuxbridge
-%config(noreplace) %attr(-, root, quantum) %{_sysconfdir}/quantum/plugins/linuxbridge/*.ini
+%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/plugins/linuxbridge/*.ini
%files -n openstack-quantum-nicira
@@ -482,7 +494,7 @@ fi
%doc quantum/plugins/nicira/nicira_nvp_plugin/README
%{python_sitelib}/quantum/plugins/nicira
%dir %{_sysconfdir}/quantum/plugins/nicira
-%config(noreplace) %attr(-, root, quantum) %{_sysconfdir}/quantum/plugins/nicira/*.ini
+%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/plugins/nicira/*.ini
%files -n openstack-quantum-openvswitch
@@ -493,7 +505,7 @@ fi
%{python_sitelib}/quantum/plugins/openvswitch
%{_datarootdir}/quantum/rootwrap/openvswitch-plugin.filters
%dir %{_sysconfdir}/quantum/plugins/openvswitch
-%config(noreplace) %attr(-, root, quantum) %{_sysconfdir}/quantum/plugins/openvswitch/*.ini
+%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/plugins/openvswitch/*.ini
%files -n openstack-quantum-ryu
@@ -504,7 +516,7 @@ fi
%{python_sitelib}/quantum/plugins/ryu
%{_datarootdir}/quantum/rootwrap/ryu-plugin.filters
%dir %{_sysconfdir}/quantum/plugins/ryu
-%config(noreplace) %attr(-, root, quantum) %{_sysconfdir}/quantum/plugins/ryu/*.ini
+%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/plugins/ryu/*.ini
%files -n openstack-quantum-nec
@@ -515,7 +527,7 @@ fi
%{python_sitelib}/quantum/plugins/nec
%{_datarootdir}/quantum/rootwrap/nec-plugin.filters
%dir %{_sysconfdir}/quantum/plugins/nec
-%config(noreplace) %attr(-, root, quantum) %{_sysconfdir}/quantum/plugins/nec/*.ini
+%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/plugins/nec/*.ini
%files -n openstack-quantum-metaplugin
@@ -523,10 +535,16 @@ fi
%doc quantum/plugins/metaplugin/README
%{python_sitelib}/quantum/plugins/metaplugin
%dir %{_sysconfdir}/quantum/plugins/metaplugin
-%config(noreplace) %attr(-, root, quantum) %{_sysconfdir}/quantum/plugins/metaplugin/*.ini
+%config(noreplace) %attr(0640, root, quantum) %{_sysconfdir}/quantum/plugins/metaplugin/*.ini
%changelog
+* 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
+- Make config files with passwords world-unreadable
+- Replace bug workarounds with upstream patches
+
* Wed Sep 12 2012 Robert Kukura <rkukura at redhat.com> - 2012.2-0.6.rc1
- Require python-quantumclient >= 2.0.22
- Add bug references for work-arounds
diff --git a/quantum-dhcp-setup b/quantum-dhcp-setup
index 9073094..5d080a9 100755
--- a/quantum-dhcp-setup
+++ b/quantum-dhcp-setup
@@ -118,10 +118,18 @@ case "${QUANTUM_PLUGIN}" in
esac
-OS_AUTH_URL=${OS_AUTH_URL:-http://127.0.0.1:35357/v2.0/}
+# Keystone specific
+OS_USERNAME=${OS_USERNAME:-quantum}
+OS_PASSWORD=${OS_PASSWORD:-servicepass}
+OS_AUTH_URL=${OS_AUTH_URL:-http://localhost:35357/v2.0/}
+OS_TENANT_NAME=${OS_TENANT_NAME:-service}
# Update Keystone
-openstack-config --set ${DHCP_CONF} DEFAULT auth_url ${OS_AUTH_URL}
+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}
+
# Update interface driver
openstack-config --set ${DHCP_CONF} DEFAULT interface_driver ${LINUX_INTERFACE_DRIVER}
diff --git a/quantum-l3-setup b/quantum-l3-setup
index cc76310..a195770 100755
--- a/quantum-l3-setup
+++ b/quantum-l3-setup
@@ -88,6 +88,7 @@ echo "Quantum plugin: ${QUANTUM_PLUGIN}"
case "${QUANTUM_PLUGIN}" in
"linuxbridge")
LINUX_INTERFACE_DRIVER=quantum.agent.linux.interface.BridgeInterfaceDriver
+ openstack-config --set ${L3_CONF} DEFAULT external_network_bridge ''
;;
"openvswitch")
@@ -101,10 +102,18 @@ case "${QUANTUM_PLUGIN}" in
esac
-OS_AUTH_URL=${OS_AUTH_URL:-http://127.0.0.1:35357/v2.0/}
+# Keystone specific
+OS_USERNAME=${OS_USERNAME:-quantum}
+OS_PASSWORD=${OS_PASSWORD:-servicepass}
+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}
+
# Update interface driver
openstack-config --set ${L3_CONF} DEFAULT interface_driver ${LINUX_INTERFACE_DRIVER}
diff --git a/quantum-node-setup b/quantum-node-setup
index 6b587c8..6e2df5a 100755
--- a/quantum-node-setup
+++ b/quantum-node-setup
@@ -116,7 +116,6 @@ openstack-config --set ${Q_CONF} DEFAULT qpid_hostname ${Q_HOST}
case "${QUANTUM_PLUGIN}" in
"linuxbridge")
LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.QuantumLinuxBridgeVIFDriver
- LINUX_INTERFACE_DRIVER=nova.network.linux_net.QuantumLinuxBridgeInterfaceDriver
;;
"openvswitch")
@@ -125,8 +124,6 @@ case "${QUANTUM_PLUGIN}" in
echo "Please install openvswitch"
exit 0
fi
- LIBVIRT_VIF_DRIVER=nova.virt.libvirt.vif.LibvirtOpenVswitchDriver
- LINUX_INTERFACE_DRIVER=nova.network.linux_net.LinuxOVSInterfaceDriver
;;
esac
@@ -142,10 +139,10 @@ y|Y)
esac
# 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}
# If OpenStack is installed then configure nova.conf
if ! [ -e "${NOVA_CONF}" ]; then
@@ -157,7 +154,7 @@ if ! [ -e "${NOVA_CONF}" ]; then
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 " 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
@@ -166,7 +163,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
diff --git a/quantum.git-12e2afc113add0150f3f6f5d2975929367854880.patch b/quantum.git-12e2afc113add0150f3f6f5d2975929367854880.patch
new file mode 100644
index 0000000..29bed24
--- /dev/null
+++ b/quantum.git-12e2afc113add0150f3f6f5d2975929367854880.patch
@@ -0,0 +1,54 @@
+From 12e2afc113add0150f3f6f5d2975929367854880 Mon Sep 17 00:00:00 2001
+From: Jiajun Liu <iamljj at gmail.com>
+Date: Thu, 13 Sep 2012 12:17:49 +0800
+Subject: [PATCH] remove not need shebang line in quantum debug
+
+Fixes bug 1050053.
+
+Change-Id: Ia1d8e665d330698d246bddb57330cb376244a1f9
+---
+ quantum/debug/__init__.py | 1 -
+ quantum/debug/commands.py | 1 -
+ quantum/debug/debug_agent.py | 1 -
+ quantum/debug/shell.py | 1 -
+ 4 files changed, 4 deletions(-)
+
+diff --git a/quantum/debug/__init__.py b/quantum/debug/__init__.py
+index 84aa223..1854ca9 100644
+--- a/quantum/debug/__init__.py
++++ b/quantum/debug/__init__.py
+@@ -1,4 +1,3 @@
+-#!/bin/python
+ # vim: tabstop=4 shiftwidth=4 softtabstop=4
+ #
+ # Copyright 2012, Nachi Ueno, NTT MCL, Inc.
+diff --git a/quantum/debug/commands.py b/quantum/debug/commands.py
+index 92c7e7d..f6dc833 100644
+--- a/quantum/debug/commands.py
++++ b/quantum/debug/commands.py
+@@ -1,4 +1,3 @@
+-#!/bin/python
+ # vim: tabstop=4 shiftwidth=4 softtabstop=4
+ #
+ # Copyright 2012, Nachi Ueno, NTT MCL, Inc.
+diff --git a/quantum/debug/debug_agent.py b/quantum/debug/debug_agent.py
+index 08edb26..2daf19f 100644
+--- a/quantum/debug/debug_agent.py
++++ b/quantum/debug/debug_agent.py
+@@ -1,4 +1,3 @@
+-#!/bin/python
+ # vim: tabstop=4 shiftwidth=4 softtabstop=4
+ #
+ # Copyright 2012, Nachi Ueno, NTT MCL, Inc.
+diff --git a/quantum/debug/shell.py b/quantum/debug/shell.py
+index 28e563b..da82c24 100644
+--- a/quantum/debug/shell.py
++++ b/quantum/debug/shell.py
+@@ -1,4 +1,3 @@
+-#!/bin/python
+ # vim: tabstop=4 shiftwidth=4 softtabstop=4
+ #
+ # Copyright 2012, Nachi Ueno, NTT MCL, Inc.
+--
+1.7.11.3
+
diff --git a/quantum.git-39cce9beddc6d3ed78c8c55bd972465a7af69420.patch b/quantum.git-39cce9beddc6d3ed78c8c55bd972465a7af69420.patch
new file mode 100644
index 0000000..b1a2b3c
--- /dev/null
+++ b/quantum.git-39cce9beddc6d3ed78c8c55bd972465a7af69420.patch
@@ -0,0 +1,49 @@
+From 39cce9beddc6d3ed78c8c55bd972465a7af69420 Mon Sep 17 00:00:00 2001
+From: Jiajun Liu <iamljj at gmail.com>
+Date: Thu, 13 Sep 2012 11:43:54 +0800
+Subject: [PATCH] add missing files from setup.py
+
+Fixes bug 1050045.
+
+Currently, setup.py will not copy l3_agent.ini and rootwrap filters
+into directory /etc/quantum. Add copy operation in setup.py for those
+config files so that those files will be copied into proper directory.
+
+Change-Id: I7052d6c07ffd4d03cafa93187d8072053ee0a832
+---
+ setup.py | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index a40a929..41aec25 100644
+--- a/setup.py
++++ b/setup.py
+@@ -44,6 +44,7 @@ ProjectScripts = [
+
+ config_path = 'etc/quantum/'
+ init_path = 'etc/init.d'
++rootwrap_path = 'etc/quantum/rootwrap.d'
+ ovs_plugin_config_path = 'etc/quantum/plugins/openvswitch'
+ cisco_plugin_config_path = 'etc/quantum/plugins/cisco'
+ linuxbridge_plugin_config_path = 'etc/quantum/plugins/linuxbridge'
+@@ -58,7 +59,16 @@ DataFiles = [
+ 'etc/rootwrap.conf',
+ 'etc/api-paste.ini',
+ 'etc/policy.json',
+- 'etc/dhcp_agent.ini']),
++ 'etc/dhcp_agent.ini',
++ 'etc/l3_agent.ini']),
++ (rootwrap_path,
++ ['etc/quantum/rootwrap.d/dhcp.filters',
++ 'etc/quantum/rootwrap.d/iptables-firewall.filters',
++ 'etc/quantum/rootwrap.d/l3.filters',
++ 'etc/quantum/rootwrap.d/linuxbridge-plugin.filters',
++ 'etc/quantum/rootwrap.d/nec-plugin.filters',
++ 'etc/quantum/rootwrap.d/openvswitch-plugin.filters',
++ 'etc/quantum/rootwrap.d/ryu-plugin.filters']),
+ (init_path, ['etc/init.d/quantum-server']),
+ (ovs_plugin_config_path,
+ ['etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini']),
+--
+1.7.11.3
+
diff --git a/quantum.git-713d92e7b1397386be8fbca3a29eaa492e28f2b6.patch b/quantum.git-713d92e7b1397386be8fbca3a29eaa492e28f2b6.patch
new file mode 100644
index 0000000..6fcd5e3
--- /dev/null
+++ b/quantum.git-713d92e7b1397386be8fbca3a29eaa492e28f2b6.patch
@@ -0,0 +1,26 @@
+From 713d92e7b1397386be8fbca3a29eaa492e28f2b6 Mon Sep 17 00:00:00 2001
+From: Jiajun Liu <iamljj at gmail.com>
+Date: Thu, 13 Sep 2012 10:09:30 +0800
+Subject: [PATCH] make rootwrap filters path consistent with other openstack
+ project
+
+Fixes bug 1050062.
+
+Change-Id: I0c3fc84af8ed9bca2e0bd2f11cbc3b737b6a4001
+---
+ etc/rootwrap.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/rootwrap.conf b/etc/rootwrap.conf
+index 0a1048e..5f88a6a 100644
+--- a/etc/rootwrap.conf
++++ b/etc/rootwrap.conf
+@@ -1,4 +1,4 @@
+ [DEFAULT]
+ # List of directories to load filter definitions from (separated by ',').
+ # These directories MUST all be only writeable by root !
+-filters_path=/etc/quantum/rootwrap.d,/usr/share/quantum/filters
++filters_path=/etc/quantum/rootwrap.d,/usr/share/quantum/rootwrap
+--
+1.7.11.3
+
diff --git a/quantum.git-7e2db08e6f4ed5f0d640b4c07189a8edd0b28b28.patch b/quantum.git-7e2db08e6f4ed5f0d640b4c07189a8edd0b28b28.patch
new file mode 100644
index 0000000..a0c3bb4
--- /dev/null
+++ b/quantum.git-7e2db08e6f4ed5f0d640b4c07189a8edd0b28b28.patch
@@ -0,0 +1,46 @@
+From 7e2db08e6f4ed5f0d640b4c07189a8edd0b28b28 Mon Sep 17 00:00:00 2001
+From: Akihiro MOTOKI <motoki at da.jp.nec.com>
+Date: Thu, 13 Sep 2012 13:36:09 +0900
+Subject: [PATCH] Add quantum-nec-agent to bin directory.
+
+Fixes bug 1050047
+
+Change-Id: I8b946b08b0dc58881a9f149d17623462e058debc
+---
+ bin/quantum-nec-agent | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+ create mode 100755 bin/quantum-nec-agent
+
+diff --git a/bin/quantum-nec-agent b/bin/quantum-nec-agent
+new file mode 100755
+index 0000000..b99e45f
+--- /dev/null
++++ b/bin/quantum-nec-agent
+@@ -0,0 +1,24 @@
++#!/usr/bin/env python
++# vim: tabstop=4 shiftwidth=4 softtabstop=4
++
++# Copyright 2012 NEC Corporation
++# All Rights Reserved.
++#
++# Licensed under the Apache License, Version 2.0 (the "License"); you may
++# not use this file except in compliance with the License. You may obtain
++# a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
++# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
++# License for the specific language governing permissions and limitations
++# under the License.
++
++import os
++import sys
++sys.path.insert(0, os.getcwd())
++from quantum.plugins.nec.agent.nec_quantum_agent import main
++
++main()
+--
+1.7.11.3
+
More information about the scm-commits
mailing list