From bec5fbe8093ddcabd0b05b92e496e7ae794c4b42 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Sat, 5 Mar 2016 18:34:58 +0300 Subject: [PATCH] Update to 8.0.0~b3 * DEB: - Source [0] - Add missing dependencies (radvd, python-openvswitch, python-pyroute2) Commits 918a100 a5a14ee - Update references to Nicira NVP plugin (e839df9) - Add doc package and git as a build dependency * RPM: - Source [1] - Add doc package * Updated dependencies according to global requirements [2] * Updated tests [0] http://anonscm.debian.org/git/openstack/neutron.git/tree/debian?h=debian/mitaka [1] https://github.com/openstack-packages/neutron [2] https://github.com/openstack/requirements/blob/master/global-requirements.txt Change-Id: I2c248190d78401eb882562cac47099ad3a16529e --- .../rpm/SOURCES/neutron-macvtap-agent.service | 13 + centos7/rpm/SPECS/openstack-neutron.spec | 166 +++-- tests/runtests.sh | 6 +- trusty/debian/changelog | 44 ++ trusty/debian/control | 133 ++-- trusty/debian/copyright | 47 +- trusty/debian/neutron-common.config.in | 10 + trusty/debian/neutron-common.dirs | 2 +- trusty/debian/neutron-common.install | 1 - trusty/debian/neutron-common.links | 1 - trusty/debian/neutron-common.postinst.in | 20 + trusty/debian/neutron-common.templates | 32 + trusty/debian/neutron-dhcp-agent.install | 1 - trusty/debian/neutron-l3-agent.install | 1 - .../debian/neutron-linuxbridge-agent.init.in | 2 +- trusty/debian/neutron-metadata-agent.install | 1 - trusty/debian/neutron-metering-agent.install | 1 - .../debian/neutron-openvswitch-agent.init.in | 2 +- .../neutron-openvswitch-agent.upstart.in | 39 -- .../debian/neutron-plugin-sriov-agent.init.in | 22 - trusty/debian/neutron-server.manpages | 2 +- trusty/debian/neutron-sriov-agent.init.in | 21 + trusty/debian/po/pt_BR.po | 658 ++++++++++++++++++ trusty/debian/rules | 125 +++- trusty/debian/source/options | 1 + 25 files changed, 1081 insertions(+), 270 deletions(-) create mode 100644 centos7/rpm/SOURCES/neutron-macvtap-agent.service delete mode 100644 trusty/debian/neutron-common.links delete mode 100644 trusty/debian/neutron-metadata-agent.install delete mode 100644 trusty/debian/neutron-metering-agent.install delete mode 100644 trusty/debian/neutron-openvswitch-agent.upstart.in delete mode 100644 trusty/debian/neutron-plugin-sriov-agent.init.in create mode 100644 trusty/debian/neutron-sriov-agent.init.in create mode 100644 trusty/debian/po/pt_BR.po create mode 100644 trusty/debian/source/options diff --git a/centos7/rpm/SOURCES/neutron-macvtap-agent.service b/centos7/rpm/SOURCES/neutron-macvtap-agent.service new file mode 100644 index 000000000..c62f1d653 --- /dev/null +++ b/centos7/rpm/SOURCES/neutron-macvtap-agent.service @@ -0,0 +1,13 @@ +[Unit] +Description=OpenStack Neutron macvtap L2 agent +After=syslog.target + +[Service] +Type=simple +User=neutron +ExecStart=/usr/bin/neutron-macvtap-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-macvtap-agent --log-file /var/log/neutron/macvtap-agent.log +PrivateTmp=true +KillMode=process + +[Install] +WantedBy=multi-user.target diff --git a/centos7/rpm/SPECS/openstack-neutron.spec b/centos7/rpm/SPECS/openstack-neutron.spec index c5f1c1bbf..d77bb9ab3 100644 --- a/centos7/rpm/SPECS/openstack-neutron.spec +++ b/centos7/rpm/SPECS/openstack-neutron.spec @@ -1,8 +1,8 @@ %global service neutron Name: openstack-%{service} -Version: 8.0.0.0b2 -Release: 1%{?dist}~mos2 +Version: 8.0.0.0b3 +Release: 1%{?dist} Epoch: 1 Summary: OpenStack Networking Service @@ -20,6 +20,7 @@ Source15: neutron-dhcp-agent.service Source16: neutron-l3-agent.service Source17: neutron-metadata-agent.service Source18: neutron-ovs-cleanup.service +Source19: neutron-macvtap-agent.service Source20: neutron-metering-agent.service Source21: neutron-sriov-nic-agent.service Source22: neutron-netns-cleanup.service @@ -101,44 +102,44 @@ capabilities (e.g., QoS, ACLs, network monitoring, etc.) %package -n python-%{service} Summary: Neutron Python libraries Requires: python-alembic >= 0.8.0 -Requires: python-debtcollector >= 0.3.0 -Requires: python-eventlet >= 0.17.4 +Requires: python-debtcollector >= 1.2.0 +Requires: python-eventlet >= 0.18.2 Requires: python-greenlet >= 0.3.2 Requires: python-httplib2 >= 0.7.5 -Requires: python-jinja2 >= 2.6 +Requires: python-jinja2 >= 2.8 Requires: python-keystoneauth1 >= 2.1.0 Requires: python-keystoneclient >= 1.6.0 -Requires: python-keystonemiddleware >= 2.0.0 +Requires: python-keystonemiddleware >= 4.0.0 Requires: python-netaddr >= 0.7.12 Requires: python-neutronclient >= 2.6.0 Requires: python-neutron-lib -Requires: python-novaclient >= 2.26.0 +Requires: python-novaclient >= 2.29.0 Requires: python-openvswitch -Requires: python-oslo-concurrency >= 2.3.0 -Requires: python-oslo-config >= 2:2.1.0 +Requires: python-oslo-concurrency >= 3.5.0 +Requires: python-oslo-config >= 2:3.7.0 Requires: python-oslo-context >= 0.2.0 -Requires: python-oslo-db >= 2.0 -Requires: python-oslo-i18n >= 1.5.0 -Requires: python-oslo-log >= 1.8.0 -Requires: python-oslo-messaging >= 1.16.0 -Requires: python-oslo-middleware >= 2.4.0 +Requires: python-oslo-db >= 4.1.0 +Requires: python-oslo-i18n >= 2.1.0 +Requires: python-oslo-log >= 1.14.0 +Requires: python-oslo-messaging >= 4.0.0 +Requires: python-oslo-middleware >= 3.0.0 Requires: python-oslo-policy >= 0.5.0 Requires: python-oslo-reports >= 0.6.0 Requires: python-oslo-rootwrap >= 2.0.0 -Requires: python-oslo-serialization >= 1.4.0 -Requires: python-oslo-service >= 0.6.0 -Requires: python-oslo-utils >= 2.0.0 -Requires: python-oslo-versionedobjects >= 0.6.0 +Requires: python-oslo-serialization >= 1.10.0 +Requires: python-oslo-service >= 1.0.0 +Requires: python-oslo-utils >= 3.5.0 +Requires: python-oslo-versionedobjects >= 1.5.0 Requires: python-oslo-context >= 0.2.0 Requires: python-paste Requires: python-paste-deploy >= 1.5.0 Requires: python-pecan >= 1.0.0 Requires: python-pbr Requires: python-pyroute2 -Requires: python-requests >= 2.5.2 +Requires: python-requests >= 2.8.1 Requires: python-retrying >= 1.2.3 Requires: python-routes >= 1.12.3 -Requires: python-ryu >= 3.23.2 +Requires: python-ryu >= 3.30 Requires: python-six >= 1.9.0 Requires: python-sqlalchemy >= 1.0.10 Requires: python-stevedore >= 1.5.0 @@ -208,6 +209,19 @@ This package contains the Neutron plugin that implements virtual networks as VLANs using Linux bridging. +%package macvtap-agent +Summary: Neutron macvtap agent +Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} + + +%description macvtap-agent +Neutron provides an API to dynamically request and configure virtual +networks. + +This package contains the Neutron agent that implements +macvtap attachments for libvirt qemu/kvm instances. + + %package ml2 Summary: Neutron ML2 plugin Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} @@ -279,62 +293,49 @@ This package contains the Neutron agent to support advanced features of SR-IOV network cards. -%package macvtap-agent -Summary: Neutron Macvtap L2 Agent -Requires: openstack-%{service}-common = %{epoch}:%{version}-%{release} - - -%description macvtap-agent -Neutron supports macvtap ml2 driver - -This package contains the Neutron agent to support macvtap attachments for -libvirt qemu/kvm instances. - - %package doc Summary: Documentation for OpenStack Neutron Group: Documentation BuildRequires: python-sphinx BuildRequires: python-oslo-sphinx -BuildRequires: python-alembic >= 0.8.0 -BuildRequires: python-debtcollector >= 0.3.0 -BuildRequires: python-eventlet >= 0.17.4 -BuildRequires: python-greenlet >= 0.3.2 -BuildRequires: python-httplib2 >= 0.7.5 -BuildRequires: python-jinja2 >= 2.6 -BuildRequires: python-keystoneclient >= 1:1.6.0 -BuildRequires: python-keystonemiddleware >= 2.0.0 -BuildRequires: python-netaddr >= 0.7.12 -BuildRequires: python-neutronclient >= 2.6.0 -BuildRequires: python-novaclient >= 1:2.26.0 -BuildRequires: python-oslo-concurrency >= 2.3.0 -BuildRequires: python-oslo-config >= 2:2.1.0 -BuildRequires: python-oslo-context >= 0.2.0 -BuildRequires: python-oslo-db >= 2.0 -BuildRequires: python-oslo-i18n >= 1.5.0 -BuildRequires: python-oslo-log >= 1.8.0 -BuildRequires: python-oslo-messaging >= 1.16.0 -BuildRequires: python-oslo-middleware >= 2.4.0 -BuildRequires: python-oslo-policy >= 0.5.0 -BuildRequires: python-oslo-rootwrap >= 2.0.0 -BuildRequires: python-oslo-serialization >= 1.4.0 -BuildRequires: python-oslo-service >= 0.6.0 -BuildRequires: python-oslo-utils >= 2.0.0 -BuildRequires: python-oslo-versionedobjects >= 0.6.0 -BuildRequires: python-oslo-context >= 0.2.0 +BuildRequires: python-alembic +BuildRequires: python-debtcollector +BuildRequires: python-eventlet +BuildRequires: python-greenlet +BuildRequires: python-httplib2 +BuildRequires: python-jinja2 +BuildRequires: python-keystoneclient +BuildRequires: python-keystonemiddleware +BuildRequires: python-netaddr +BuildRequires: python-neutronclient +BuildRequires: python-novaclient +BuildRequires: python-oslo-concurrency +BuildRequires: python-oslo-config +BuildRequires: python-oslo-context +BuildRequires: python-oslo-db +BuildRequires: python-oslo-i18n +BuildRequires: python-oslo-log +BuildRequires: python-oslo-messaging +BuildRequires: python-oslo-middleware +BuildRequires: python-oslo-policy +BuildRequires: python-oslo-rootwrap +BuildRequires: python-oslo-serialization +BuildRequires: python-oslo-service +BuildRequires: python-oslo-utils +BuildRequires: python-oslo-versionedobjects +BuildRequires: python-oslo-context BuildRequires: python-paste -BuildRequires: python-paste-deploy >= 1.5.0 -BuildRequires: python-pecan >= 1.0.0 +BuildRequires: python-paste-deploy +BuildRequires: python-pecan BuildRequires: python-pbr -BuildRequires: python-pyroute2 -BuildRequires: python-requests >= 2.5.2 -BuildRequires: python-retrying >= 1.2.3 -BuildRequires: python-routes >= 1.12.3 -BuildRequires: python-six >= 1.9.0 -BuildRequires: python-sqlalchemy >= 0.9.7 -BuildRequires: python-stevedore >= 1.5.0 -BuildRequires: python-webob >= 1.2.3 +BuildRequires: python-requests +BuildRequires: python-retrying +BuildRequires: python-routes +BuildRequires: python-six +BuildRequires: python-sqlalchemy +BuildRequires: python-stevedore +BuildRequires: python-webob BuildRequires: python-testresources BuildRequires: python-testscenarios BuildRequires: python-oslotest @@ -420,6 +421,7 @@ install -p -D -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/neutron-dhcp-agent.serv install -p -D -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/neutron-l3-agent.service install -p -D -m 644 %{SOURCE17} %{buildroot}%{_unitdir}/neutron-metadata-agent.service install -p -D -m 644 %{SOURCE18} %{buildroot}%{_unitdir}/neutron-ovs-cleanup.service +install -p -D -m 644 %{SOURCE19} %{buildroot}%{_unitdir}/neutron-macvtap-agent.service install -p -D -m 644 %{SOURCE20} %{buildroot}%{_unitdir}/neutron-metering-agent.service install -p -D -m 644 %{SOURCE21} %{buildroot}%{_unitdir}/neutron-sriov-nic-agent.service install -p -D -m 644 %{SOURCE22} %{buildroot}%{_unitdir}/neutron-netns-cleanup.service @@ -449,7 +451,7 @@ mkdir -p %{buildroot}%{_datadir}/%{service}/server # Create configuration directories for all services that can be populated by users with custom *.conf files mkdir -p %{buildroot}/%{_sysconfdir}/%{service}/conf.d/common -for service in server rpc-server ovs-cleanup netns-cleanup linuxbridge-cleanup bgp-dragent; do +for service in server rpc-server ovs-cleanup netns-cleanup linuxbridge-cleanup bgp-dragent macvtap-agent; do mkdir -p %{buildroot}/%{_sysconfdir}/%{service}/conf.d/%{service}-$service done for service in linuxbridge openvswitch dhcp l3 metadata metering sriov-nic; do @@ -504,6 +506,18 @@ exit 0 %systemd_postun_with_restart neutron-bgp-dragent.service +%post macvtap-agent +%systemd_post neutron-macvtap-agent.service + + +%preun macvtap-agent +%systemd_preun neutron-macvtap-agent.service + + +%postun macvtap-agent +%systemd_postun_with_restart neutron-macvtap-agent.service + + %post linuxbridge %systemd_post neutron-linuxbridge-agent.service oldconf=%{_sysconfdir}/%{service}/plugins/linuxbridge/linuxbridge_conf.ini @@ -669,6 +683,13 @@ fi %dir %{_sysconfdir}/%{service}/conf.d/%{service}-linuxbridge-agent +%files macvtap-agent +%license LICENSE +%{_bindir}/neutron-macvtap-agent +%{_unitdir}/neutron-macvtap-agent.service +%dir %{_sysconfdir}/%{service}/conf.d/%{service}-macvtap-agent + + %files ml2 %license LICENSE %doc %{service}/plugins/ml2/README @@ -711,17 +732,14 @@ fi %dir %{_sysconfdir}/%{service}/conf.d/%{service}-sriov-nic-agent -%files macvtap-agent -%license LICENSE -%{_bindir}/neutron-macvtap-agent - - %files doc %license LICENSE %doc html %changelog +* Sun Mar 6 2016 Sergey Kolekonov 1:8.0.0.0b3-1.el7 +- Rebuild for Mitaka-b3 * Thu Feb 25 2016 Jerzy Mikolajczak 1:8.0.0.0b2-1%{?dist}~mos2 - Update specs for Mitaka release - Remove vendor specific subpackages (mellanox, bigswitch, cisco, etc) diff --git a/tests/runtests.sh b/tests/runtests.sh index ba8e0322a..91f3d1209 100755 --- a/tests/runtests.sh +++ b/tests/runtests.sh @@ -86,10 +86,6 @@ setup_database() { setup_keystone() { #Setup Keystone - if ! $UBUNTU - then - cp /usr/share/keystone/keystone-dist-paste.ini /etc/keystone/keystone-paste.ini - fi cat > /etc/keystone/keystone.conf << EOF [DEFAULT] admin_token=$TOKEN @@ -99,6 +95,7 @@ connection=mysql://keystone:keystone@localhost/keystone provider=keystone.token.providers.uuid.Provider EOF keystone-manage db_sync + keystone-manage bootstrap --bootstrap-password $TOKEN chown -R keystone:keystone /var/log/keystone/ if $UBUNTU then @@ -110,7 +107,6 @@ EOF #Setup Neutron credentials keystone $AUTH user-create --name neutron --pass neutron keystone $AUTH tenant-create --name neutron - keystone $AUTH role-create --name=admin keystone $AUTH user-role-add --user neutron --role admin --tenant neutron NEUTRON_SERVICE=`keystone $AUTH service-create --name=neutron --type=network --description="Neutron Networking Service" | grep id | awk -F '|' '{print $3}' | tr -d ' '` keystone $AUTH endpoint-create --region RegionOne --service-id=$NEUTRON_SERVICE --publicurl=http://localhost:9696 --internalurl=http://localhost:9696 --adminurl=http://localhost:9696 diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 2992bcaa3..1aa9653cd 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,47 @@ +neutron (2:8.0.0~b3-1~u14.04+mos1) mos9.0; urgency=medium + + * Source [0] + [0] http://anonscm.debian.org/git/openstack/neutron.git/tree/debian?h=debian/mitaka + + -- Sergey Kolekonov Sat, 05 Mar 2016 18:12:28 +0300 + +neutron (2:8.0.0~b3-1) experimental; urgency=medium + + [ Ondřej Nový ] + * Fixed VCS URLs (https). + + [ Thomas Goirand ] + * New upstream release. + * Fixed (build-)depends for this release. + + -- Thomas Goirand Thu, 03 Mar 2016 20:40:19 +0800 + +neutron (2:8.0.0~b2-4) experimental; urgency=medium + + [ Thomas Goirand ] + * Added a neutron-sriov-agent package. + * Added Ivan in the upload list. + + [ Ivan Udovichenko] + * d/neutron-openvswitch-agent.upstart.in: Remove legacy custom Upstart script. + * d/neutron-linuxbridge-agent.init.in d/neutron-openvswitch-agent.init.in: + Add custom ML2 config files instead of the default one (LP: #1527005). + + -- Thomas Goirand Fri, 26 Feb 2016 14:15:35 +0000 + +neutron (2:8.0.0~b2-3) experimental; urgency=medium + + * Bumped EPOCH to align with Ubuntu. + * Allow unit test to fail, because they do in Trusty. + * Do not -X/usr/bin when calling dh_install. + * Fixed auth_protocol to be http and not https by default. + * Drop Provides: argparse (Closes: #810728). + * neutron-linuxbridge-agent Breaks + Replaes older neutron-common + (Closes: #813068). + * New pt_BR.po debconf translation (Closes: #811530). + + -- Thomas Goirand Thu, 28 Jan 2016 07:34:12 +0000 + neutron (2:8.0.0~b1-1~u14.04+mos1) mos9.0; urgency=medium * Source [0] diff --git a/trusty/debian/control b/trusty/debian/control index 28742bec8..4ba653efb 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -4,11 +4,12 @@ Priority: optional Maintainer: PKG OpenStack Uploaders: Thomas Goirand , Gustavo Panizzo , + Ivan Udovichenko , Build-Depends: debhelper (>= 9), dh-python, dh-systemd, git, - openstack-pkg-tools (>= 23~), + openstack-pkg-tools (>= 38~), po-debconf, python-all, python-pbr (>= 1.8), @@ -19,51 +20,54 @@ Build-Depends-Indep: alembic (>= 0.8.0), python-cliff (>= 1.15.0), python-coverage, python-ddt (>= 1.0.1), - python-debtcollector (>= 0.3.0), - python-eventlet (>= 0.17.4), + python-debtcollector (>= 1.2.0), + python-designateclient (>= 1.5.0), + python-eventlet (>= 0.18.4), python-fixtures (>= 1.3.1), python-gflags, python-greenlet, python-hacking, python-httplib2, python-jinja2 (>= 2.8), - python-keystoneclient (>= 1:1.6.0), + python-keystoneauth1 (>= 2.1.0), python-keystonemiddleware (>= 4.0.0), python-mock (>= 1.3), python-netaddr (>= 0.7.12), python-neutronclient (>= 1:2.6.0), + python-neutron-lib, python-novaclient (>= 2:2.30.1), + python-openvswitch, python-os-testr (>= 0.4.2), - python-oslo.concurrency (>= 2.3.0), - python-oslo.config (>= 1:3.2.0), + python-oslo.concurrency (>= 3.5.0), + python-oslo.config (>= 1:3.7.0), python-oslo.context (>= 0.2.0), python-oslo.db (>= 4.1.0), - python-oslo.i18n (>= 1.5.0), + python-oslo.i18n (>= 2.1.0), python-oslo.log (>= 2.0.0), - python-oslo.messaging (>= 3.0.0), + python-oslo.messaging (>= 4.0.0), python-oslo.middleware (>= 3.0.0), python-oslo.policy (>= 0.5.0), + python-oslo.reports (>= 0.6.0), python-oslo.rootwrap (>= 2.0.0), python-oslo.serialization (>= 2.0.0), python-oslo.service (>= 1.0.0), - python-oslo.utils (>= 3.4.0), - python-oslo.versionedobjects (>= 1.0.0), + python-oslo.utils (>= 3.5.0), + python-oslo.versionedobjects (>= 1.5.0), python-oslosphinx (>= 2.5.0), python-oslotest (>= 1.10.0), python-paste, python-pastedeploy, python-pecan (>= 1.0.0), - python-pyudev, python-pymysql, + python-pyudev, python-requests (>= 2.8.1), python-requests-mock (>= 0.7.0), python-retrying, python-routes, - python-ryu (>= 3.24), + python-ryu (>= 3.30), python-six (>= 1.9.0), python-sqlalchemy (>= 1.0.10), python-stevedore (>= 1.5.0), - python-tempest-lib (>= 0.13.0), python-testresources, python-testscenarios, python-testtools (>= 1.4.0), @@ -74,8 +78,8 @@ Build-Depends-Indep: alembic (>= 0.8.0), testrepository, Standards-Version: 3.9.6 Homepage: http://neutron.openstack.org/ -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/neutron.git;a=summary -Vcs-Git: git://anonscm.debian.org/openstack/neutron.git +Vcs-Browser: https://anonscm.debian.org/cgit/openstack/neutron.git/ +Vcs-Git: https://anonscm.debian.org/git/openstack/neutron.git Package: python-neutron Architecture: all @@ -84,37 +88,40 @@ Depends: alembic (>= 0.8.0), conntrack, iproute2, ipset, - python-debtcollector (>= 0.3.0), - python-eventlet (>= 0.17.4), + python-debtcollector (>= 1.2.0), + python-designateclient (>= 1.5.0), + python-eventlet (>= 0.18.4), python-gflags, python-greenlet, python-httplib2, python-jinja2 (>= 2.8), - python-keystoneclient (>= 1:1.6.0), + python-keystoneauth1 (>= 2.1.0), python-keystonemiddleware (>= 4.0.0), python-mysqldb, python-netaddr (>= 0.7.12), python-neutronclient (>= 1:2.6.0), + python-neutron-lib, python-novaclient (>= 2:2.30.1), python-openvswitch, - python-oslo.concurrency (>= 2.3.0), - python-oslo.config (>= 1:3.2.0), + python-oslo.concurrency (>= 3.5.0), + python-oslo.config (>= 1:3.7.0), python-oslo.context (>= 0.2.0), python-oslo.db (>= 4.1.0), - python-oslo.i18n (>= 1.5.0), + python-oslo.i18n (>= 2.1.0), python-oslo.log (>= 2.0.0), - python-oslo.messaging (>= 3.0.0), + python-oslo.messaging (>= 4.0.0), python-oslo.middleware (>= 3.0.0), python-oslo.policy (>= 0.5.0), + python-oslo.reports (>= 0.6.0), python-oslo.rootwrap (>= 2.0.0), python-oslo.serialization (>= 2.0.0), python-oslo.service (>= 1.0.0), - python-oslo.utils (>= 3.4.0), - python-oslo.versionedobjects (>= 1.0.0), + python-oslo.utils (>= 3.5.0), + python-oslo.versionedobjects (>= 1.5.0), python-paste, python-pastedeploy, - python-pecan (>= 1.0.0), python-pbr (>= 1.8), + python-pecan (>= 1.0.0), python-psycopg2, python-pymysql, python-pyroute2, @@ -122,7 +129,7 @@ Depends: alembic (>= 0.8.0), python-requests (>= 2.8.1), python-retrying, python-routes, - python-ryu (>= 3.24), + python-ryu (>= 3.30), python-six (>= 1.9.0), python-sqlalchemy (>= 1.0.10), python-stevedore (>= 1.5.0), @@ -152,7 +159,6 @@ Depends: adduser, python-openstackclient, ${misc:Depends}, ${python:Depends}, - ${shlibs:Depends}, Description: OpenStack virtual network service - server Neutron provides an API to dynamically request and configure virtual networks. These networks connect "interfaces" from other OpenStack services (such as @@ -169,7 +175,7 @@ Depends: adduser, dpkg-dev, python-mysqldb, python-neutron (= ${source:Version}), - python-pyparsing (>=2.0.1), + python-pyparsing (>=1.5.7), python-sqlalchemy, sqlite3, ${misc:Depends}, @@ -187,7 +193,6 @@ Provides: neutron-plugin, neutron-plugin-openvswitch, neutron-plugin-plumgrid, neutron-plugin-ryu, - python-argparse, Replaces: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1), neutron-plugin-openvswitch-agent (<<2015.1~b3-1), Breaks: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1), @@ -207,7 +212,6 @@ Depends: neutron-common (= ${source:Version}), sudo, ${misc:Depends}, ${python:Depends}, - ${shlibs:Depends}, Description: OpenStack virtual network service - NEC agent Neutron provides an API to dynamically request and configure virtual networks. These networks connect "interfaces" from other OpenStack services (such as @@ -227,7 +231,6 @@ Depends: adduser, sudo, ${misc:Depends}, ${python:Depends}, - ${shlibs:Depends}, Recommends: openvswitch-switch, Conflicts: neutron-vpn-agent, Description: OpenStack virtual network service - l3 agent @@ -247,7 +250,6 @@ Depends: adduser, sudo, ${misc:Depends}, ${python:Depends}, - ${shlibs:Depends}, Description: OpenStack virtual network service - DHCP agent Neutron provides an API to dynamically request and configure virtual networks. These networks connect "interfaces" from other OpenStack services (such as @@ -262,7 +264,6 @@ Depends: adduser, neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, - ${shlibs:Depends}, Description: OpenStack virtual network service - metadata agent Neutron provides an API to dynamically request and configure virtual networks. These networks connect "interfaces" from other OpenStack services (such as @@ -279,7 +280,6 @@ Depends: adduser, neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, - ${shlibs:Depends}, Provides: neutron-plugin-metering-agent, Description: OpenStack virtual network service - metering agent Neutron provides an API to dynamically request and configure virtual networks. @@ -299,7 +299,6 @@ Depends: neutron-common (= ${source:Version}), sudo, ${misc:Depends}, ${python:Depends}, - ${shlibs:Depends}, Recommends: openvswitch-datapath-dkms, Description: OpenStack virtual network service - Open vSwitch agent Neutron provides an API to dynamically request and configure virtual networks. @@ -312,15 +311,16 @@ Description: OpenStack virtual network service - Open vSwitch agent Package: neutron-linuxbridge-agent Architecture: all -Replaces: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1), -Breaks: neutron-plugin-linuxbridge-agent (<<2015.1~b3-1), +Replaces: neutron-common (<< 1:8.0.0~b1), + neutron-plugin-linuxbridge-agent (<<2015.1~b3-1), +Breaks: neutron-common (<< 1:8.0.0~b1), + neutron-plugin-linuxbridge-agent (<<2015.1~b3-1), Provides: neutron-plugin-linuxbridge-agent, Depends: bridge-utils, neutron-common (= ${source:Version}), sudo, ${misc:Depends}, ${python:Depends}, - ${shlibs:Depends}, Description: OpenStack virtual network service - Linux bridge agent Neutron provides an API to dynamically request and configure virtual networks. These networks connect "interfaces" from other OpenStack services (such as @@ -335,57 +335,36 @@ Depends: neutron-linuxbridge-agent, ${misc:Depends}, Architecture: all Section: oldlibs -description: transitional dummy package for switching to Neutron Linuxbridge agent. - This is a transitional dummy package due to the move of the Linuxbridge agent from - core plugin to ML2 MechanismDriver. - Once you have upgraded, this package can safely be removed. This package provides a - transition path from neutron-plugin-linuxbridge-agent to neutron-linuxbridge-agent. +description: transitional dummy package for switching to Neutron Linuxbridge agent + This is a transitional dummy package due to the move of the Linuxbridge agent + from core plugin to ML2 MechanismDriver. + Once you have upgraded, this package can safely be removed. This package + provides a transition path from neutron-plugin-linuxbridge-agent to + neutron-linuxbridge-agent. Package: neutron-plugin-openvswitch-agent Depends: neutron-openvswitch-agent, ${misc:Depends}, Architecture: all Section: oldlibs -description: transitional dummy package for switching to Neutron OpenVswitch agent. - This is a transitional dummy package due to the move of the OpenVswitch agent from - core plugin to ML2 MechanismDriver. - Once you have upgraded, this package can safely be removed. This package provides a - transition path from neutron-plugin-openvswitch-agent to neutron-openvswitch-agent. +description: transitional dummy package for switching to Neutron OpenVswitch agent + This is a transitional dummy package due to the move of the OpenVswitch agent + from core plugin to ML2 MechanismDriver. + Once you have upgraded, this package can safely be removed. This package + provides a transition path from neutron-plugin-openvswitch-agent to + neutron-openvswitch-agent. -Package: neutron-plugin-ml2 +Package: neutron-sriov-agent Architecture: all -Provides: neutron-plugin, Depends: neutron-common (= ${source:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, -Description: Neutron is a virtual network service for Openstack - ML2 plugin - Neutron is a virtual network service for Openstack, and a part of - Netstack. Just like OpenStack Nova provides an API to dynamically - request and configure virtual servers, Neutron provides an API to - dynamically request and configure virtual networks. These networks - connect "interfaces" from other OpenStack services (e.g., virtual NICs - from Nova VMs). The Neutron API supports extensions to provide - advanced network capabilities (e.g., QoS, ACLs, network monitoring, - etc.) - . - This package provides the Modular Layer 2 plugin. - -Package: neutron-plugin-sriov-agent -Architecture: all -Depends: neutron-plugin-ml2 (= ${source:Version}), - ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends}, -Description: Neutron is a virtual network service for Openstack - IBM agent - Neutron is a virtual network service for Openstack, and a part of - Netstack. Just like OpenStack Nova provides an API to dynamically - request and configure virtual servers, Neutron provides an API to - dynamically request and configure virtual networks. These networks - connect "interfaces" from other OpenStack services (e.g., virtual NICs - from Nova VMs). The Neutron API supports extensions to provide - advanced network capabilities (e.g., QoS, ACLs, network monitoring, - etc.) +Description: OpenStack virtual network service - SR-IOV agent + Neutron provides an API to dynamically request and configure virtual networks. + These networks connect "interfaces" from other OpenStack services (such as + vNICs from Nova VMs). The Neutron API supports extensions to provide advanced + network capabilities, including QoS, ACLs, and network monitoring. . This package provides the Mellanox SR-IOV agent. diff --git a/trusty/debian/copyright b/trusty/debian/copyright index 1f001462b..faf7b38c1 100644 --- a/trusty/debian/copyright +++ b/trusty/debian/copyright @@ -2,19 +2,44 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Neutron Source: git://github.com/openstack/neutron.git -Files: debian/* -Copyright: 2012-2013, Thomas Goirand - (c) 2012, Mehdi Abaakouk - (c) 2011-2012, Ghe Rivero - (c) 2012, Loic Dachary (OuoU) - (c) 2012, Ola Lundqvist +Files: * +Copyright: (c) 2011-2016, OpenStack Foundation + (c) 2011-2016, Cisco Systems + (c) 2011-2016, Nicira Networks + (c) 2011-2016, Citrix Systems + (c) 2012-2016, Hewlett-Packard Development Company, L.P. + (c) 2011-2016, VMware, Inc + (c) 2012, Nachi Ueno, NTT MCL, Inc. + (c) 2012-2016, Intel Corporation + (c) 2012-2016, Mirantis Inc. + (c) 2013-2016, Red Hat, Inc. + (c) 2013-2016, IBM Corp. + (c) 2014-2016, VA Linux Systems Japan K.K. + (c) 2014-2015, Thales Services SAS + (c) 2014-2015, Deutsche Telekom AG + (c) 2014-2015, SUSE Linux Products GmbH + (c) 2013-2015, NEC Corporation + (c) 2011-2015, VMware, Inc. + (c) 2012-2015, Cisco Systems, Inc. + (c) 2013, Huawei Technologies Co.,LTD. + (c) 2012-2015, New Dream Network, LLC (DreamHost) + (c) 2014-2015, Mellanox Technologies, Ltd + (c) 2013-2015, eNovance SAS + (c) 2013-2015, Rackspace, Inc. + (c) 2015, Infoblox Inc. + (c) 2015, Cloudbase Solutions. + (c) 2015, Infoblox Inc. + (c) 2015, Taturiello Consulting, Meh. + (c) 2001-2010, Twisted Matrix Laboratories. + (c) 2012, Locaweb. License: Apache-2.0 -Files: * -Copyright: 2011 OpenStack, LLC. - 2011 Cisco Systems - 2011 Nicira Networks - 2011 Citrix Systems +Files: debian/* +Copyright: (c) 2012-2016, Thomas Goirand + (c) 2012, Mehdi Abaakouk + (c) 2011-2012, Ghe Rivero + (c) 2012, Loic Dachary (OuoU) + (c) 2012, Ola Lundqvist License: Apache-2.0 License: Apache-2.0 diff --git a/trusty/debian/neutron-common.config.in b/trusty/debian/neutron-common.config.in index c890d4eda..46e8e8ed5 100644 --- a/trusty/debian/neutron-common.config.in +++ b/trusty/debian/neutron-common.config.in @@ -87,6 +87,14 @@ db_go db_get neutron/plugin-select NEUTRON_PLUGIN_NAME=${RET} +read_nova_admin_credentials () { + pkgos_read_config -p high ${N_CONF} nova url neutron/nova_url + pkgos_read_config -p high ${N_CONF} nova region_name neutron/nova_region + pkgos_read_config -p medium ${N_CONF} nova project_name neutron/nova_admin_tenant_name + pkgos_read_config -p medium ${N_CONF} nova username neutron/nova_admin_username + pkgos_read_config -p high ${N_CONF} nova password neutron/nova_admin_password +} + # OVS specific configurations (if that's the one selected) if [ "${NEUTRON_PLUGIN_NAME}" = "OpenVSwitch" ] ; then # Various network config... @@ -94,6 +102,8 @@ if [ "${NEUTRON_PLUGIN_NAME}" = "OpenVSwitch" ] ; then pkgos_read_config ${OVS_CONF} OVS enable_tunneling neutron/enable_tunneling pkgos_read_config ${OVS_CONF} OVS tunnel_id_ranges neutron/tunnel_id_ranges + read_nova_admin_credentials + # Guess values to put in the local_ip directive IF=`LC_ALL=C route | grep default |awk -- '{ print $8 }'` guessed_ip_addr=`LC_ALL=C ifconfig ${IF} | grep 'inet addr' | sed 's/.\+inet addr:\([0-9.]\+\).\+/\1/'` diff --git a/trusty/debian/neutron-common.dirs b/trusty/debian/neutron-common.dirs index 72cd82b4d..2b06aa26a 100644 --- a/trusty/debian/neutron-common.dirs +++ b/trusty/debian/neutron-common.dirs @@ -1,2 +1,2 @@ -etc/neutron/rootwrap.d etc/neutron/plugins +etc/neutron/rootwrap.d diff --git a/trusty/debian/neutron-common.install b/trusty/debian/neutron-common.install index bf9ca9e4c..e4c3949c3 100644 --- a/trusty/debian/neutron-common.install +++ b/trusty/debian/neutron-common.install @@ -2,7 +2,6 @@ debian/dnsmasq-neutron.conf /etc/neutron debian/neutron_sudoers /etc/sudoers.d debian/plugin_guess_func /usr/share/neutron-common etc/api-paste.ini /usr/share/neutron-common -etc/neutron.conf /usr/share/neutron-common etc/neutron/plugins /etc/neutron etc/neutron/rootwrap.d/* /etc/neutron/rootwrap.d etc/policy.json /etc/neutron diff --git a/trusty/debian/neutron-common.links b/trusty/debian/neutron-common.links deleted file mode 100644 index 94996d528..000000000 --- a/trusty/debian/neutron-common.links +++ /dev/null @@ -1 +0,0 @@ -/var/lib/neutron /var/lib/quantum diff --git a/trusty/debian/neutron-common.postinst.in b/trusty/debian/neutron-common.postinst.in index c9010ea71..e65290df9 100644 --- a/trusty/debian/neutron-common.postinst.in +++ b/trusty/debian/neutron-common.postinst.in @@ -57,6 +57,25 @@ neutron_core_plugin_class () { esac } +write_nova_admin_credentials () { + db_get neutron/nova_url + pkgos_inifile set ${N_CONF} nova url ${RET} + + db_get neutron/nova_region + pkgos_inifile set ${N_CONF} nova region_name ${RET} + + db_get neutron/nova_admin_tenant_name + NOVA_TENANT_NAME_IN_NEUTRON=${RET} + pkgos_inifile set ${N_CONF} nova tenant_name ${RET} + pkgos_inifile set ${N_CONF} nova project_name ${RET} + + db_get neutron/nova_admin_username + pkgos_inifile set ${N_CONF} nova username ${RET} + + db_get neutron/nova_admin_password + pkgos_inifile set ${N_CONF} nova password ${RET} +} + if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then . /usr/share/debconf/confmodule @@ -109,6 +128,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then pkgos_inifile set ${OVS_CONF} OVS local_ip "${RET}" fi + write_nova_admin_credentials db_stop chown -R neutron:adm /var/log/neutron/ diff --git a/trusty/debian/neutron-common.templates b/trusty/debian/neutron-common.templates index d70480bdf..3b0910bc8 100644 --- a/trusty/debian/neutron-common.templates +++ b/trusty/debian/neutron-common.templates @@ -126,3 +126,35 @@ Template: neutron/local_ip Type: string _Description: Local IP address of this hypervisor: Please enter the local IP address for this hypervisor. + +Template: neutron/nova_url +Type: string +Default: http://127.0.0.1:8774/v2 +_Description: Nova server URL: + Please enter the URL of the Nova server. + +Template: neutron/nova_region +Type: string +Default: regionOne +_Description: Nova server region name: + Please enter the region of the Nova server. + +Template: neutron/nova_admin_tenant_name +Type: string +Default: admin +_Description: Nova admin tenant name: + Neutron needs to be able to communicate with Nova through Keystone. Therefore + Neutron needs to know the Nova admin tenant name, username and password. + . + Please enter the ID of the admin tenant for Nova. + +Template: neutron/nova_admin_username +Type: string +Default: admin +_Description: Neutron administrator username: + Please enter the username of the Nova administrator. + +Template: neutron/nova_admin_password +Type: password +_Description: Nova administrator password: + Please enter the password of the Nova administrator. diff --git a/trusty/debian/neutron-dhcp-agent.install b/trusty/debian/neutron-dhcp-agent.install index 131644060..568ca1f03 100644 --- a/trusty/debian/neutron-dhcp-agent.install +++ b/trusty/debian/neutron-dhcp-agent.install @@ -1,2 +1 @@ debian/cron.d/neutron-dhcp-agent-netns-cleanup etc/cron.d -etc/dhcp_agent.ini etc/neutron diff --git a/trusty/debian/neutron-l3-agent.install b/trusty/debian/neutron-l3-agent.install index 5134363b1..913f215ee 100644 --- a/trusty/debian/neutron-l3-agent.install +++ b/trusty/debian/neutron-l3-agent.install @@ -1,2 +1 @@ debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d -etc/l3_agent.ini etc/neutron diff --git a/trusty/debian/neutron-linuxbridge-agent.init.in b/trusty/debian/neutron-linuxbridge-agent.init.in index da1fdb02a..a79ed95e9 100644 --- a/trusty/debian/neutron-linuxbridge-agent.init.in +++ b/trusty/debian/neutron-linuxbridge-agent.init.in @@ -25,5 +25,5 @@ NAME=${PROJECT_NAME}-linuxbridge-agent # replaced by ml2 as core_plugin and lb as agent. Making ml2 mandatory # to use this agent -DAEMON_ARGS="--config-file=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini" +DAEMON_ARGS="--config-file=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini --config-file=/etc/neutron/plugins/ml2/linuxbridge_agent.ini" diff --git a/trusty/debian/neutron-metadata-agent.install b/trusty/debian/neutron-metadata-agent.install deleted file mode 100644 index 32d783fec..000000000 --- a/trusty/debian/neutron-metadata-agent.install +++ /dev/null @@ -1 +0,0 @@ -etc/metadata_agent.ini /usr/share/neutron-metadata-agent diff --git a/trusty/debian/neutron-metering-agent.install b/trusty/debian/neutron-metering-agent.install deleted file mode 100644 index da7be40f4..000000000 --- a/trusty/debian/neutron-metering-agent.install +++ /dev/null @@ -1 +0,0 @@ -etc/metering_agent.ini etc/neutron diff --git a/trusty/debian/neutron-openvswitch-agent.init.in b/trusty/debian/neutron-openvswitch-agent.init.in index bc6af291d..03c7e63e7 100644 --- a/trusty/debian/neutron-openvswitch-agent.init.in +++ b/trusty/debian/neutron-openvswitch-agent.init.in @@ -21,4 +21,4 @@ CONFIG_FILE=/etc/neutron/plugins/ml2/openvswitch_agent.ini # Since Juno OVS plugin as been deprecated as core_plugin, it has been # replaced by ml2 as core_plugin and ovs as agent. Making ml2 mandatory # to use this agent -DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini" +DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf" diff --git a/trusty/debian/neutron-openvswitch-agent.upstart.in b/trusty/debian/neutron-openvswitch-agent.upstart.in deleted file mode 100644 index 256e9a5f6..000000000 --- a/trusty/debian/neutron-openvswitch-agent.upstart.in +++ /dev/null @@ -1,39 +0,0 @@ -description "Neutron openvswitch plugin agent" -author "Thomas Goirand " - -start on runlevel [2345] -stop on runlevel [016] - -chdir /var/run - -pre-start script - mkdir -p /var/run/neutron - chown neutron:root /var/run/neutron -end script - -script - [ -r /usr/share/neutron-common/plugin_guess_func ] || exit 0 - . /usr/share/neutron-common/plugin_guess_func - - if ! [ -r /etc/neutron/neutron.conf ] ; then - echo "Cloud not read /etc/neutron/neutron.conf: exiting" - exit 0 - fi - CURRENT_PLUGIN=`grep "^[ \t]*core_plugin[ \t]*=[ \t]*[._a-zA-Z0-9]*\$" /etc/neutron/neutron.conf | sed -e 's/^[ \t]*core_plugin[ \t]*=[ \t]*//'` - if [ -z "${CURRENT_PLUGIN}" ] ; then - echo "No core_plugin= value found: please set it and try again" - exit 0 - fi - - neutron_core_plugin_to_plugin_name ${CURRENT_PLUGIN} - neutron_plugin_ini_path ${NEUTRON_PLUGIN_NAME} - [ -r "$NEUTRON_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $NEUTRON_PLUGIN_CONFIG" - [ -r /etc/default/openstack ] && . /etc/default/openstack - [ -r /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB - - [ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog" - [ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=/var/log/neutron/ovs-agent.log" - exec start-stop-daemon --start --chuid neutron:neutron --exec /usr/bin/neutron-openvswitch-agent -- \ - --config-file=/etc/neutron/neutron.conf \ - $CONF_ARG $DAEMON_ARGS -end script diff --git a/trusty/debian/neutron-plugin-sriov-agent.init.in b/trusty/debian/neutron-plugin-sriov-agent.init.in deleted file mode 100644 index 92bf0437a..000000000 --- a/trusty/debian/neutron-plugin-sriov-agent.init.in +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: neutron-plugin-sriov-agent -# Required-Start: $network $local_fs $remote_fs $syslog -# Required-Stop: $remote_fs -# Should-Start: mysql postgresql rabbitmq-server keystone -# Should-Stop: mysql postgresql rabbitmq-server keystone -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Neutron SRIOV Agent -# Description: SRIOV agent for OpenStack Neutron -### END INIT INFO - -# Authors: James Page - -DESC="OpenStack Neutron SRIOV Plugin Agent" -PROJECT_NAME=neutron -NAME=${PROJECT_NAME}-plugin-sriov-agent -DAEMON=/usr/bin/neutron-sriov-nic-agent -# --config-file=/etc/neutron/neutron.conf will be happened -# to DAEMON_ARGS later by openstack-pkg-tools -DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/ml2_conf_sriov.ini --config-file=/etc/neutron/plugins/ml2/sriov_agent.ini" diff --git a/trusty/debian/neutron-server.manpages b/trusty/debian/neutron-server.manpages index 6d556fbdb..2c37937c8 100644 --- a/trusty/debian/neutron-server.manpages +++ b/trusty/debian/neutron-server.manpages @@ -1,2 +1,2 @@ -debian/mans/neutron-server.8 debian/mans/neutron-rootwrap.8 +debian/mans/neutron-server.8 diff --git a/trusty/debian/neutron-sriov-agent.init.in b/trusty/debian/neutron-sriov-agent.init.in new file mode 100644 index 000000000..ba535e192 --- /dev/null +++ b/trusty/debian/neutron-sriov-agent.init.in @@ -0,0 +1,21 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: neutron-sriov-agent +# Required-Start: $network $local_fs $remote_fs $syslog +# Required-Stop: $remote_fs +# Should-Start: mysql postgresql rabbitmq-server keystone +# Should-Stop: mysql postgresql rabbitmq-server keystone +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: SRIOV Agent +# Description: This is the Neutron SRIOV agent +### END INIT INFO + +# Authors: Thomas Goirand +DESC="OpenStack Neutron SRIOV Agent" +PROJECT_NAME=neutron +NAME=${PROJECT_NAME}-sriov-agent +DAEMON=/usr/bin/neutron-sriov-nic-agent +# --config-file=/etc/neutron/neutron.conf will be happened +# to DAEMON_ARGS later by openstack-pkg-tools +DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/sriov_agent.ini" diff --git a/trusty/debian/po/pt_BR.po b/trusty/debian/po/pt_BR.po new file mode 100644 index 000000000..b25e22722 --- /dev/null +++ b/trusty/debian/po/pt_BR.po @@ -0,0 +1,658 @@ +# Debconf translations for neutron. +# Copyright (C) 2016 THE neutron'S COPYRIGHT HOLDER +# This file is distributed under the same license as the neutron package. +# Adriano Rafael Gomes , 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: neutron\n" +"Report-Msgid-Bugs-To: neutron@packages.debian.org\n" +"POT-Creation-Date: 2015-02-02 01:45+0100\n" +"PO-Revision-Date: 2016-01-10 15:25-0200\n" +"Last-Translator: Adriano Rafael Gomes \n" +"Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../neutron-common.templates:2001 +msgid "Authentication server hostname:" +msgstr "Nome de máquina do servidor de autenticação:" + +#. Type: string +#. Description +#: ../neutron-common.templates:2001 +msgid "" +"Please specify the hostname of your Neutron authentication server. Typically " +"this is also the hostname of your OpenStack Identity Service (Keystone)." +msgstr "" +"Por favor, especifique o nome de máquina do seu servidor de autenticação " +"para o Neutron. Tipicamente, esse é também o nome de máquina do Serviço de " +"Identidade do OpenStack (Keystone)." + +#. Type: string +#. Description +#: ../neutron-common.templates:3001 +msgid "Authentication server tenant name:" +msgstr "Nome de locatário (\"tenant\") do servidor de autenticação:" + +#. Type: string +#. Description +#: ../neutron-common.templates:3001 +msgid "Please specify the authentication server tenant name." +msgstr "" +"Por favor, especifique o nome de locatário (\"tenant\") do servidor de " +"autenticação." + +#. Type: string +#. Description +#: ../neutron-common.templates:4001 +msgid "Authentication server username:" +msgstr "Nome de usuário do servidor de autenticação:" + +#. Type: string +#. Description +#: ../neutron-common.templates:4001 +msgid "Please specify the username to use with the authentication server." +msgstr "" +"Por favor, especifique o nome de usuário para usar com o servidor de " +"autenticação." + +#. Type: password +#. Description +#: ../neutron-common.templates:5001 +msgid "Authentication server password:" +msgstr "Senha do servidor de autenticação:" + +#. Type: password +#. Description +#: ../neutron-common.templates:5001 +msgid "Please specify the password to use with the authentication server." +msgstr "" +"Por favor, especifique a senha para usar com o servidor de autenticação." + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "OpenVSwitch" +msgstr "OpenVSwitch" + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "LinuxBridge" +msgstr "LinuxBridge" + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "ml2" +msgstr "ml2" + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "Brocade" +msgstr "Brocade" + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "Nicira" +msgstr "Nicira" + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "Midonet" +msgstr "Midonet" + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "NEC" +msgstr "NEC" + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "Mellanox" +msgstr "Mellanox" + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "Hyper-V" +msgstr "Hyper-V" + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "RYU" +msgstr "RYU" + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "MetaPlugin" +msgstr "MetaPlugin" + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "BigSwitch" +msgstr "BigSwitch" + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "Cisco" +msgstr "Cisco" + +#. Type: select +#. Choices +#: ../neutron-common.templates:6001 +msgid "PLUMgrid" +msgstr "PLUMgrid" + +#. Type: select +#. Description +#: ../neutron-common.templates:6002 +msgid "Neutron plugin:" +msgstr "Plugin do Neutron:" + +#. Type: select +#. Description +#: ../neutron-common.templates:6002 +msgid "" +"Neutron uses a plugin architecture to manage networking. When starting the " +"Neutron server daemon, the configuration file corresponding to the plugin " +"you wish to use needs to be loaded, by giving it as a parameter when " +"starting the neutron-server daemon. Also, the core_plugin directive needs to " +"match. Please select which plugin to use." +msgstr "" +"O Neutron usa uma arquitetura de plugins para gerenciar a rede. Ao iniciar o " +"daemon do servidor Neutron, o arquivo de configuração correspondente ao " +"plugin que você deseja usar precisa ser carregado, informando-o como " +"parâmetro ao iniciar o daemon neutron-server. Também, a diretiva core_plugin " +"precisa combinar. Por favor, selecione qual plugin usar." + +#. Type: boolean +#. Description +#: ../neutron-common.templates:7001 +msgid "Set up a database for Neutron?" +msgstr "Configurar um banco de dados para o Neutron?" + +#. Type: boolean +#. Description +#: ../neutron-common.templates:7001 +msgid "" +"No database has been set up for Neutron to use. Before continuing, you " +"should make sure you have the following information:" +msgstr "" +"Nenhum banco de dados foi configurado para ser usado com o Neutron. Antes de " +"continuar, você deve se certificar que você tem as seguintes informações:" + +#. Type: boolean +#. Description +#: ../neutron-common.templates:7001 +msgid "" +" * the type of database that you want to use;\n" +" * the database server hostname (that server must allow TCP connections from " +"this\n" +" machine);\n" +" * a username and password to access the database." +msgstr "" +" * o tipo de banco de dados que você quer usar;\n" +" * o nome de máquina do servidor de banco de dados (tal servidor deve\n" +" permitir conexões TCP a partir deste computador);\n" +" * um nome de usuário e uma senha para acessar o banco de dados." + +#. Type: boolean +#. Description +#: ../neutron-common.templates:7001 +msgid "" +"If some of these requirements are missing, do not choose this option and run " +"with regular SQLite support." +msgstr "" +"Se algum desses requisitos estiver faltando, rejeite essa opção e execute " +"com suporte regular ao SQLite." + +#. Type: boolean +#. Description +#: ../neutron-common.templates:7001 +msgid "" +"You can change this setting later on by running \"dpkg-reconfigure -plow " +"neutron\"." +msgstr "" +"Você pode mudar essa configuração depois, executando \"dpkg-reconfigure -" +"plow neutron\"." + +#. Type: string +#. Description +#: ../neutron-common.templates:8001 +msgid "IP address of your RabbitMQ host:" +msgstr "Endereço IP da sua máquina RabbitMQ:" + +#. Type: string +#. Description +#. Type: string +#. Description +#. Type: password +#. Description +#: ../neutron-common.templates:8001 ../neutron-common.templates:9001 +#: ../neutron-common.templates:10001 +msgid "" +"In order to interoperate with other components of OpenStack, this package " +"needs to connect to a central RabbitMQ server." +msgstr "" +"Para interoperar com outros componentes do OpenStack, esse pacote precisa " +"conectar a um servidor RabbitMQ central." + +#. Type: string +#. Description +#: ../neutron-common.templates:8001 +msgid "Please specify the IP address of that server." +msgstr "Por favor, especifique o endereço IP de tal servidor." + +#. Type: string +#. Description +#: ../neutron-common.templates:9001 +msgid "Username for connection to the RabbitMQ server:" +msgstr "Nome de usuário para conexão ao servidor RabbitMQ:" + +#. Type: string +#. Description +#: ../neutron-common.templates:9001 +msgid "Please specify the username used to connect to the RabbitMQ server." +msgstr "" +"Por favor, especifique o nome de usuário usado para conectar ao servidor " +"RabbitMQ." + +#. Type: password +#. Description +#: ../neutron-common.templates:10001 +msgid "Password for connection to the RabbitMQ server:" +msgstr "Senha para conexão com o servidor RabbitMQ:" + +#. Type: password +#. Description +#: ../neutron-common.templates:10001 +msgid "Please specify the password used to connect to the RabbitMQ server." +msgstr "" +"Por favor, especifique a senha usada para conectar ao servidor RabbitMQ." + +#. Type: select +#. Choices +#: ../neutron-common.templates:11001 +msgid "local" +msgstr "local" + +#. Type: select +#. Choices +#: ../neutron-common.templates:11001 +msgid "gre" +msgstr "gre" + +#. Type: select +#. Choices +#: ../neutron-common.templates:11001 +msgid "vlan" +msgstr "vlan" + +#. Type: select +#. Choices +#: ../neutron-common.templates:11001 +msgid "none" +msgstr "nenhuma" + +#. Type: select +#. Description +#. Translators: a "tenant" in OpenStack world is +#. an entity that contains one or more username/password couples. +#. It's typically the tenant that will be used for billing. Having more than one +#. username/password is very helpful in larger organization. +#. You're advised to either keep "tenant" without translating it +#. or keep it parenthezised. Example for French: +#. locataire ("tenant") +#: ../neutron-common.templates:11002 +msgid "Type of network to allocate for tenant networks:" +msgstr "Tipo de rede para alocar para redes de locatários (\"tenants\"):" + +#. Type: select +#. Description +#. Translators: a "tenant" in OpenStack world is +#. an entity that contains one or more username/password couples. +#. It's typically the tenant that will be used for billing. Having more than one +#. username/password is very helpful in larger organization. +#. You're advised to either keep "tenant" without translating it +#. or keep it parenthezised. Example for French: +#. locataire ("tenant") +#: ../neutron-common.templates:11002 +msgid "" +"The value \"local\" is useful only for single-box testing. In order for " +"tenant networks to provide connectivity between hosts, it is necessary to " +"either choose \"vlan\" and then configure \"network_vlan_ranges\" or to " +"choose \"gre\" and then configure \"tunnel_id_ranges\". Choose \"none\" to " +"disable creation of tenant networks." +msgstr "" +"O valor \"local\" é útil somente para testes de \"single-box\". Para que " +"redes de locatários (\"tenant\") forneçam conectividade entre máquinas, é " +"necessário escolher ou \"vlan\" e então configurar \"network_vlan_ranges\" " +"ou escolher \"gre\" e então configurar \"tunnel_id_ranges\". Escolha " +"\"nenhuma\" para desabilitar a criação de redes de locatários (\"tenant\")." + +#. Type: boolean +#. Description +#: ../neutron-common.templates:12001 +msgid "Enable tunneling?" +msgstr "Habilitar tunelamento?" + +#. Type: boolean +#. Description +#: ../neutron-common.templates:12001 +msgid "" +"Please choose whether support should be activated for GRE networks on the " +"server and agents. This requires kernel support for OVS patch ports and GRE " +"tunneling." +msgstr "" +"Por favor, escolher se deverá ser ativado o suporte para redes GRE no " +"servidor e nos agentes. Isso requer suporte no kernel para portas \"patch\" " +"OVS e tunelamento GRE." + +#. Type: string +#. Description +#: ../neutron-common.templates:13001 +msgid "Tunnel id ranges:" +msgstr "Faixas de id de túnel:" + +#. Type: string +#. Description +#: ../neutron-common.templates:13001 +msgid "" +"Please enter a comma-separated list of : tuples " +"enumerating ranges of GRE tunnel IDs that are available for tenant network " +"allocation if tenant_network_type is \"gre\"." +msgstr "" +"Por favor, informe uma lista separada por vírgulas de tuplas :" +", enumerando as faixas de IDs de túnel GRE que estão disponíveis " +"para alocação de rede de locatário (\"tenant\") se tenant_network_type for " +"\"gre\"." + +#. Type: string +#. Description +#: ../neutron-common.templates:14001 +msgid "Local IP address of this hypervisor:" +msgstr "Endereço IP local desse hypervisor:" + +#. Type: string +#. Description +#: ../neutron-common.templates:14001 +msgid "Please enter the local IP address for this hypervisor." +msgstr "Por favor, informe o endereço IP local para esse hypervisor." + +#. Type: string +#. Description +#: ../neutron-common.templates:15001 +msgid "Nova server URL:" +msgstr "URL do servidor Nova:" + +#. Type: string +#. Description +#: ../neutron-common.templates:15001 +msgid "Please enter the URL of the Nova server." +msgstr "Por favor, informe a URL do servidor Nova." + +#. Type: string +#. Description +#: ../neutron-common.templates:16001 +msgid "Nova server region name:" +msgstr "Nome da região do servidor Nova:" + +#. Type: string +#. Description +#: ../neutron-common.templates:16001 +msgid "Please enter the region of the Nova server." +msgstr "Por favor, informe a região do servidor Nova." + +#. Type: string +#. Description +#: ../neutron-common.templates:17001 +msgid "Nova admin tenant ID:" +msgstr "ID de locatário (\"tenant\") do administrador do Nova:" + +#. Type: string +#. Description +#: ../neutron-common.templates:17001 +msgid "" +"Neutron needs to be able to communicate with Nova through Keystone. " +"Therefore Neutron needs to know the Nova admin tenant ID, username and " +"password." +msgstr "" +"O Neutron precisa ser capaz de se comunicar com o Nova através do Keystone. " +"Portanto, o Neutron precisa saber o ID de locatário (\"tenant\"), nome de " +"usuário e senha do administrador do Nova." + +#. Type: string +#. Description +#: ../neutron-common.templates:17001 +msgid "Please enter the ID of the admin tenant for Nova." +msgstr "" +"Por favor, informe o ID de locatário (\"tenant\") do administrador para o " +"Nova." + +#. Type: string +#. Description +#: ../neutron-common.templates:18001 +msgid "Neutron administrator username:" +msgstr "Nome de usuário do administrador do Neutron:" + +#. Type: string +#. Description +#: ../neutron-common.templates:18001 +msgid "Please enter the username of the Nova administrator." +msgstr "Por favor, informe o nome de usuário do administrador do Nova." + +#. Type: password +#. Description +#: ../neutron-common.templates:19001 +msgid "Nova administrator password:" +msgstr "Senha do administrador do Nova:" + +#. Type: password +#. Description +#: ../neutron-common.templates:19001 +msgid "Please enter the password of the Nova administrator." +msgstr "Por favor, informe a senha do administrador do Nova." + +#. Type: boolean +#. Description +#: ../neutron-server.templates:2001 +msgid "Register Neutron in the Keystone endpoint catalog?" +msgstr "Registrar o Neutron no catálogo de \"endpoint\" do Keystone?" + +#. Type: boolean +#. Description +#: ../neutron-server.templates:2001 +msgid "" +"Each OpenStack service (each API) should be registered in order to be " +"accessible. This is done using \"keystone service-create\" and \"keystone " +"endpoint-create\". This can be done automatically now." +msgstr "" +"Cada serviço OpenStack (cada API) deve ser registrado para ser acessível. " +"Isso é feito usando \"keystone service-create\" e \"keystone endpoint-create" +"\". Isso pode ser feito automaticamente agora." + +#. Type: boolean +#. Description +#: ../neutron-server.templates:2001 +msgid "" +"Note that you will need to have an up and running Keystone server on which " +"to connect using the Keystone authentication token." +msgstr "" +"Note que você precisará ter um servidor Keystone configurado e em execução " +"no qual conectar usando o \"token\" de autenticação do Keystone." + +#. Type: string +#. Description +#: ../neutron-server.templates:3001 +msgid "Keystone server IP address:" +msgstr "Endereço IP do servidor Keystone:" + +#. Type: string +#. Description +#: ../neutron-server.templates:3001 +msgid "" +"Please enter the IP address of the Keystone server, so that neutron-api can " +"contact Keystone to do the Neutron service and endpoint creation." +msgstr "" +"Por favor, informe o endereço IP do servidor Keystone, de forma que o " +"neutron-api possa contatar o Keystone para efetuar a criação do \"endpoint\" " +"e do serviço Neutron." + +#. Type: password +#. Description +#: ../neutron-server.templates:4001 +msgid "Keystone authentication token:" +msgstr "\"Token\" de autenticação Keystone:" + +#. Type: password +#. Description +#: ../neutron-server.templates:4001 +msgid "" +"To configure its endpoint in Keystone, neutron-server needs the Keystone " +"auth token." +msgstr "" +"Para configurar o seu \"endpoint\" no Keystone, o neutron-server precisa do " +"\"token\" de autenticação do Keystone." + +#. Type: string +#. Description +#: ../neutron-server.templates:5001 +msgid "Neutron endpoint IP address:" +msgstr "Endereço IP do \"endpoint\" Neutron:" + +#. Type: string +#. Description +#: ../neutron-server.templates:5001 +msgid "Please enter the IP address that will be used to contact Neutron." +msgstr "" +"Por favor, informe o endereço IP que será usado para contatar o Neutron." + +#. Type: string +#. Description +#: ../neutron-server.templates:5001 +msgid "" +"This IP address should be accessible from the clients that will use this " +"service, so if you are installing a public cloud, this should be a public IP " +"address." +msgstr "" +"Esse endereço IP deveria ser acessível a partir dos clientes que usarão esse " +"serviço, assim se você está instalando uma nuvem pública, ele deveria ser um " +"endereço IP público." + +#. Type: string +#. Description +#: ../neutron-server.templates:6001 +msgid "Name of the region to register:" +msgstr "Nome da região para registrar:" + +#. Type: string +#. Description +#: ../neutron-server.templates:6001 +msgid "" +"OpenStack supports using availability zones, with each region representing a " +"location. Please enter the zone that you wish to use when registering the " +"endpoint." +msgstr "" +"O OpenStack suporta usar zonas de disponibilidade, com cada região " +"representando uma localidade. Por favor, informe a zona que você deseja usar " +"ao registrar o \"endpoint\"." + +#. Type: string +#. Description +#: ../neutron-metadata-agent.templates:2001 +msgid "Auth server hostname:" +msgstr "Nome de máquina do servidor de autenticação:" + +#. Type: string +#. Description +#: ../neutron-metadata-agent.templates:2001 +msgid "" +"Please specify the URL of your Neutron authentication server. Typically this " +"is also the URL of your OpenStack Identity Service (Keystone)." +msgstr "" +"Por favor, especifique a URL do seu servidor de autenticação do Neutron. " +"Tipicamente, essa é também a URL do seu Serviço de Identidade do OpenStack " +"(Keystone)." + +#. Type: string +#. Description +#: ../neutron-metadata-agent.templates:3001 +msgid "Auth server tenant name:" +msgstr "Nome de locatário (\"tenant\") do servidor de autenticação:" + +#. Type: string +#. Description +#: ../neutron-metadata-agent.templates:4001 +msgid "Auth server username:" +msgstr "Nome de usuário do servidor de autenticação:" + +#. Type: password +#. Description +#: ../neutron-metadata-agent.templates:5001 +msgid "Auth server password:" +msgstr "Senha do servidor de autenticação:" + +#. Type: string +#. Description +#: ../neutron-metadata-agent.templates:6001 +msgid "Name of the region to be used by the metadata server:" +msgstr "Nome da região para ser usada pelo servidor de metadados:" + +#. Type: string +#. Description +#: ../neutron-metadata-agent.templates:6001 +msgid "" +"Openstack can be used using availability zones, with each region " +"representing a location. Please enter the zone that the metadata server " +"should use." +msgstr "" +"O OpenStack suporta usar zonas de disponibilidade, com cada região " +"representando uma localidade. Por favor, informe a zona que o servidor de " +"metadados deverá usar." + +#. Type: password +#. Description +#: ../neutron-metadata-agent.templates:7001 +msgid "Metadata proxy shared secret:" +msgstr "Segredo compartilhado do proxy de metadados:" + +#. Type: password +#. Description +#: ../neutron-metadata-agent.templates:7001 +msgid "" +"VM instances using Neutron to handle networking retrieve their metadata " +"through the Neutron metadata agent, which serves as a proxy to the Nova " +"metadata REST API server." +msgstr "" +"Instâncias de VMs usando o Neutron para controlar a rede recuperam seus " +"metadados através do agente de metadados do Neutron, o qual serve como um " +"proxy para o servidor de API REST de metadados do Nova." + +#. Type: password +#. Description +#: ../neutron-metadata-agent.templates:7001 +msgid "" +"Please enter the password that should be used to protect communications " +"between the Neutron metadata proxy agent and the Nova metadata server. The " +"same shared password should be used when setting up the nova-common package." +msgstr "" +"Por favor, informe a senha que deverá ser usada para proteger a comunicação " +"entre o agente de proxy de metadados do Neutron e o servidor de metadados do " +"Nova. A mesma senha compartilhada deverá ser usada ao configurar o pacote " +"nova-common." diff --git a/trusty/debian/rules b/trusty/debian/rules index 305551355..e8567ecae 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/openstack-pkg-tools/pkgos.make -export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog -S Version | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/') +export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1) PYTHONS:=$(shell pyversions -vr) @@ -9,44 +9,105 @@ PYTHONS:=$(shell pyversions -vr) dh $@ --buildsystem=python_distutils --with python2,systemd,sphinxdoc override_dh_auto_install: - echo "Nothing to do!" -# dh_auto_install -# find . -type d -name tests | xargs rm -fr -# for i in neutron/db/migration/alembic_migrations/versions/*.py ; do \ -# install -D -m 0664 $$i debian/tmp/usr/lib/python2.6/dist-packages/$$i ; \ -# install -D -m 0664 $$i debian/tmp/usr/lib/python2.7/dist-packages/$$i ; \ -# done + echo "Do nothing" override_dh_install: - set -e ; for pyvers in $(PYTHONS) ; do \ - python$$pyvers setup.py install --install-layout=deb --root=$(CURDIR)/debian/neutron-common ; \ - python$$pyvers setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp ; \ - mkdir -p $(CURDIR)/debian/python-neutron/usr/lib/python$$pyvers/dist-packages ; \ - cp -auxf neutron $(CURDIR)/debian/python-neutron/usr/lib/python$$pyvers/dist-packages ; \ - done - tools/generate_config_file_samples.sh - bash -c 'for i in $$(find etc/ -name *.ini.sample); do mv $$i $$(dirname $$i)/$$(basename "$$i" .ini.sample).ini; done' - mv etc/neutron.conf.sample etc/neutron.conf - dh_install -O--buildsystem=python_distutils --fail-missing -X/usr/etc -X/usr/bin - rm -rf $(CURDIR)/debian/neutron-common/usr/lib - rm -rf $(CURDIR)/debian/neutron-common/usr/bin/quantum* - rm -rf $(CURDIR)/debian/neutron-common/usr/etc - - install -D -m 0640 etc/neutron/plugins/ml2/openvswitch_agent.ini $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini - - install -D -m 0640 etc/metadata_agent.ini $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini - sed -i -e 's|^# nova_metadata_ip = 127.0.0.1|nova_metadata_ip = 127.0.0.1|' $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini - - # Move the OVS config file, since we use debconf for it - rm $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/openvswitch_agent.ini - install -D -m 0640 etc/neutron/plugins/ml2/openvswitch_agent.ini $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini + rm -rf $(CURDIR)/debian/tmp + python2.7 setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp + cp -auxf neutron $(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages + rm -rf $(CURDIR)/debian/tmp/usr/etc + + # dhcp_agent.ini + mkdir -p $(CURDIR)/debian/neutron-dhcp-agent/etc/neutron + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-dhcp-agent/etc/neutron/dhcp_agent.ini \ + --wrap-width 140 \ + --namespace neutron.base.agent \ + --namespace neutron.dhcp.agent \ + --namespace oslo.log + + # l3_agent.ini + mkdir -p $(CURDIR)/debian/neutron-l3-agent/etc/neutron + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-l3-agent/etc/neutron/l3_agent.ini \ + --wrap-width 140 \ + --namespace neutron.base.agent \ + --namespace neutron.l3.agent \ + --namespace oslo.log + + # linuxbridge_agent.ini + mkdir -p $(CURDIR)/debian/neutron-linuxbridge-agent/etc/neutron/plugins/ml2 + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-linuxbridge-agent/etc/neutron/plugins/ml2/linuxbridge_agent.ini \ + --wrap-width 140 \ + --namespace neutron.ml2.linuxbridge.agent \ + --namespace oslo.log + + # metadata_agent.ini + mkdir -p $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini \ + --wrap-width 140 \ + --namespace neutron.metadata.agent \ + --namespace oslo.log + + # metering_agent.ini + mkdir -p $(CURDIR)/debian/neutron-metering-agent/etc/neutron + PYTHONPATH=$(CURDIR)/debian/tmp oslo-config-generator --output-file $(CURDIR)/debian/neutron-metering-agent/etc/neutron/metering_agent.ini \ + --wrap-width 140 \ + --namespace neutron.metering.agent \ + --namespace oslo.log + + # ml2_conf.ini + mkdir -p $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2 + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/ml2_conf.ini \ + --wrap-width 140 \ + --namespace neutron.ml2 \ + --namespace oslo.log + + # ml2_conf_sriov.ini + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/ml2_conf_sriov.ini \ + --wrap-width 140 \ + --namespace neutron.ml2.sriov \ + --namespace oslo.log + + # neutron.conf + mkdir -p $(CURDIR)/debian/neutron-common/usr/share/neutron-common + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf \ + --wrap-width 140 \ + --namespace neutron \ + --namespace neutron.agent \ + --namespace neutron.db \ + --namespace neutron.extensions \ + --namespace neutron.qos \ + --namespace nova.auth \ + --namespace oslo.log \ + --namespace oslo.db \ + --namespace oslo.policy \ + --namespace oslo.concurrency \ + --namespace oslo.messaging \ + --namespace oslo.middleware.cors \ + --namespace oslo.service.sslutils \ + --namespace oslo.service.wsgi \ + --namespace keystonemiddleware.auth_token + + + # openvswitch_agent.ini + mkdir -p $(CURDIR)/debian/neutron-common/usr/share/neutron-common + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini \ + --wrap-width 140 \ + --namespace neutron.ml2.ovs.agent \ + --namespace oslo.log + + # sriov_agent.ini + mkdir -p $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2 + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/sriov_agent.ini \ + --wrap-width 140 \ + --namespace neutron.ml2.sriov.agent \ + --namespace oslo.log + + dh_install --fail-missing -X/usr/etc override_dh_auto_clean: dh_auto_clean - rm -f neutron/vcsversion.py find . -type f -name "*.pyc" | xargs rm -fr rm -rf build neutron.egg-info - rm -rf setuptools_git-*-py*.egg/ rm -f debian/neutron-common.config \ debian/neutron-common.postinst \ debian/neutron-server.config \ diff --git a/trusty/debian/source/options b/trusty/debian/source/options new file mode 100644 index 000000000..cb61fa526 --- /dev/null +++ b/trusty/debian/source/options @@ -0,0 +1 @@ +extend-diff-ignore = "^[^/]*[.]egg-info/" -- 2.32.3