[MOS 10.0] Update neutron package 78/27978/4
authorIvan Udovichenko <iudovichenko@mirantis.com>
Sat, 29 Oct 2016 11:25:00 +0000 (14:25 +0300)
committerIvan Udovichenko <iudovichenko@mirantis.com>
Sat, 29 Oct 2016 12:53:33 +0000 (15:53 +0300)
Version: 2:9.0.0-1~u16.04+mos0
Fix (build-)dependencies.

Change-Id: I3e474425e529c670396693dc7a7c216a1237ef45

xenial/debian/changelog
xenial/debian/control
xenial/debian/debian_control_vars [new file with mode: 0644]
xenial/debian/designate-addition.txt [new file with mode: 0644]
xenial/debian/neutron-linuxbridge-agent.init.in
xenial/debian/patches/fix-requirements.txt.patch
xenial/debian/po/it.po
xenial/debian/po/pt.po
xenial/debian/rules
xenial/debian/source/options
xenial/debian/ubuntu_control_vars [new file with mode: 0644]

index 31d52164f9778d482fc5bd52d903ec111176f207..7a137dbf66c66fc0cec31074b42370998f8f8650 100644 (file)
@@ -1,3 +1,63 @@
+neutron (2:9.0.0-1~u16.04+mos0) mos10.0; urgency=medium
+
+  * Fix (build-)dependencies.
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Sat, 29 Oct 2016 14:49:16 +0300
+
+neutron (2:9.0.0-4) unstable; urgency=medium
+
+  * Fixed path of ml2_conf.ini in debian/neutron-linuxbridge-agent.init.in.
+  * Correctly runtime depends: on lsb-base.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 17 Oct 2016 11:13:41 +0200
+
+neutron (2:9.0.0-3) unstable; urgency=medium
+
+  * Add a [designate] configuration example (Closes: #831697).
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 10 Oct 2016 16:12:34 +0200
+
+neutron (2:9.0.0-2) unstable; urgency=medium
+
+  * Debconf translation:
+    - pt (Closes: #840059).
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 10 Oct 2016 13:36:10 +0200
+
+neutron (2:9.0.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 06 Oct 2016 18:12:16 +0200
+
+neutron (2:9.0.0~rc1-2) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * d/s/options: extend-diff-ignore of .gitreview
+  * d/control: Use correct branch in Vcs-* fields
+
+  [ Thomas Goirand ]
+  * Uploading to unstable.
+  * Build-Depends on openstack-pkg-tools >= 53~.
+  * Fixed oslotest EPOCH.
+  * Added a new neutron-macvtap-agent package.
+  * Fixed oslo-config-gnenerator namespaces for a number of config file.
+  * Debconf translation:
+    - it (Closes: #838501).
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 28 Sep 2016 10:01:19 +0200
+
+neutron (2:9.0.0~rc1-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+  * Using OpenStack's Gerrit as VCS URLs.
+  * Rebased fix-requirements.txt.patch.
+  * Re-enabled tests.
+  * Add flake8-legacy.patch (idea taken from Ubuntu).
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 16 Sep 2016 20:14:17 +0200
+
 neutron (2:9.0.0~b3-1~u16.04+mos1) mos10.0; urgency=medium
 
   * Update to latest  Newton b3 release
@@ -155,6 +215,30 @@ neutron (2:8.0.0~b2-3) experimental; urgency=medium
 
  -- Thomas Goirand <zigo@debian.org>  Thu, 28 Jan 2016 07:34:12 +0000
 
+neutron (1:8.0.0~b2-2) experimental; urgency=medium
+
+  * Fixed config file generation.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 21 Jan 2016 15:23:22 +0000
+
+neutron (1:8.0.0~b2-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depeneds for this release.
+  * Rebased better-config-defaults.patch.
+  * Added extend-diff-ignore = "^[^/]*[.]egg-info/" in d/source/options.
+  * Did some cleanups in debian/rules.
+  * Using oslo-config-generator to generate config files, as upstream moved to
+    use that as well.
+  * export OSLO_PACKAGE_VERSION now compatible with Trusty version of dpkg.
+  * Fixed debian/copyright.
+  * Fixed too long lines in long description.
+  * Removed all shlibs:Depends from debian/control.
+  * Removed neutron-common.links (for symlink to /var/lib/quantum).
+  * Fails build on unit test failures.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 04 Dec 2015 09:03:42 +0100
+
 neutron (2:8.0.0~b1-1~u14.04+mos1) mos9.0; urgency=medium
 
   * Source [0]
index a9dce559f9cf93cbac27d0cec4219532e7c2bc99..e22afb288be1d5f9b5734974bb66b8da8549806b 100644 (file)
@@ -9,40 +9,41 @@ Build-Depends: debhelper (>= 9),
                dh-python,
                dh-systemd,
                git,
-               openstack-pkg-tools (>= 40~),
+               openstack-pkg-tools (>= 53~),
                po-debconf,
                python-all,
                python-pbr (>= 1.8),
                python-setuptools,
-               python-sphinx,
+               python-sphinx (>= 1.2.1),
 Build-Depends-Indep: alembic (>= 0.8.4),
                      bridge-utils,
                      python-cliff (>= 1.15.0),
-                     python-coverage,
+                     python-coverage (>= 3.6),
                      python-ddt (>= 1.0.1),
                      python-debtcollector (>= 1.2.0),
                      python-designateclient (>= 1.5.0),
                      python-eventlet (>= 0.18.4),
                      python-fixtures (>= 3.0.0),
+                     python-flake8,
                      python-gflags,
-                     python-greenlet,
-                     python-hacking,
-                     python-httplib2,
+                     python-greenlet (>= 0.3.2),
+                     python-hacking (>= 0.10.0),
+                     python-httplib2 (>= 0.7.5),
                      python-jinja2 (>= 2.8),
                      python-keystoneauth1 (>= 2.10.0),
                      python-keystonemiddleware (>= 4.0.0),
                      python-mock (>= 2.0),
-                     python-netaddr (>= 0.7.12),
+                     python-netaddr (>= 0.7.13),
                      python-netifaces (>= 0.10.4),
                      python-neutron-lib (>= 0.3.0),
-                     python-neutronclient (>= 1:4.2.0),
+                     python-neutronclient (>= 1:5.1.0),
                      python-novaclient (>= 2:2.30.1),
                      python-openvswitch,
                      python-os-testr (>= 0.7.0),
                      python-oslo.cache (>= 1.5.0),
                      python-oslo.concurrency (>= 3.8.0),
                      python-oslo.config (>= 1:3.14.0),
-                     python-oslo.context (>= 2.6.0),
+                     python-oslo.context (>= 2.9.0),
                      python-oslo.db (>= 4.10.0),
                      python-oslo.i18n (>= 2.1.0),
                      python-oslo.log (>= 2.0.0),
@@ -59,30 +60,33 @@ Build-Depends-Indep: alembic (>= 0.8.4),
                      python-oslotest (>= 1.10.0),
                      python-osprofiler (>= 1.4.0),
                      python-paste,
-                     python-pastedeploy,
+                     python-pastedeploy (>= 1.5.0),
                      python-pecan (>= 1.0.0),
-                     python-pymysql,
+                     python-pep8,
+                     python-pymysql (>= 0.6.2),
                      python-pyudev,
                      python-requests (>= 2.10.0),
-                     python-requests-mock,
-                     python-retrying,
-                     python-routes,
+                     python-requests-mock (>= 1.0),
+                     python-retrying (>= 1.2.3),
+                     python-routes (>= 1.12.3),
                      python-ryu (>= 3.30),
                      python-six (>= 1.9.0),
                      python-sqlalchemy (>= 1.0.12),
                      python-stevedore (>= 1.16.0),
-                     python-testresources,
-                     python-testscenarios,
+                     python-tempest,
+                     python-testresources (>= 0.2.4),
+                     python-testscenarios (>= 0.4),
                      python-testtools (>= 1.4.0),
                      python-unittest2,
-                     python-webob,
-                     python-webtest,
+                     python-webob (>= 1.2.3),
+                     python-webtest (>= 2.0),
                      subunit,
+                     tempest,
                      testrepository,
 Standards-Version: 3.9.8
 Homepage: http://neutron.openstack.org/
-Vcs-Browser: https://anonscm.debian.org/cgit/openstack/neutron.git/
-Vcs-Git: https://anonscm.debian.org/git/openstack/neutron.git
+Vcs-Browser: https://git.openstack.org/cgit/openstack/deb-neutron?h=debian%2Fnewton
+Vcs-Git: https://git.openstack.org/openstack/deb-neutron -b debian/newton
 
 Package: python-neutron
 Architecture: all
@@ -94,13 +98,14 @@ Depends: alembic (>= 0.8.4),
          python-debtcollector (>= 1.2.0),
          python-designateclient (>= 1.5.0),
          python-eventlet (>= 0.18.4),
+         python-gflags,
          python-greenlet (>= 0.3.2),
          python-httplib2 (>= 0.7.5),
          python-jinja2 (>= 2.8),
          python-keystoneauth1 (>= 2.10.0),
          python-keystonemiddleware (>= 4.0.0),
          python-mysqldb,
-         python-netaddr (>= 0.7.12),
+         python-netaddr (>= 0.7.13),
          python-netifaces (>= 0.10.4),
          python-neutron-lib (>= 0.4.0),
          python-neutronclient (>= 1:5.1.0),
@@ -124,7 +129,7 @@ Depends: alembic (>= 0.8.4),
          python-oslo.versionedobjects (>= 1.13.0),
          python-osprofiler (>= 1.4.0),
          python-paste,
-         python-pastedeploy,
+         python-pastedeploy (>= 1.5.0),
          python-pbr (>= 1.8),
          python-pecan (>= 1.0.0),
          python-psycopg2,
@@ -132,13 +137,13 @@ Depends: alembic (>= 0.8.4),
          python-pyroute2,
          python-pyudev,
          python-requests (>= 2.10.0),
-         python-retrying,
-         python-routes,
+         python-retrying (>= 1.2.3),
+         python-routes (>= 1.12.3),
          python-ryu (>= 3.30),
          python-six (>= 1.9.0),
          python-sqlalchemy (>= 1.0.12),
          python-stevedore (>= 1.16.0),
-         python-webob,
+         python-webob (>= 1.2.3),
          ${misc:Depends},
          ${python:Depends},
 Recommends: iputils-arping,
@@ -164,6 +169,7 @@ Depends: adduser,
          python-openstackclient,
          q-text-as-data,
          ${misc:Depends},
+         ${ostack-lsb-base},
          ${python:Depends},
 Description: OpenStack virtual network service - server
  Neutron provides an API to dynamically request and configure virtual networks.
@@ -181,7 +187,7 @@ Depends: adduser,
          dpkg-dev,
          python-mysqldb,
          python-neutron (= ${source:Version}),
-         python-pyparsing (>=1.5.7),
+         python-pyparsing (>= 1.5.7),
          python-sqlalchemy (>= 1.0.12),
          sqlite3,
          ${misc:Depends},
@@ -236,6 +242,7 @@ Depends: adduser,
          radvd,
          sudo,
          ${misc:Depends},
+         ${ostack-lsb-base},
          ${python:Depends},
 Recommends: openvswitch-switch,
 Conflicts: neutron-vpn-agent,
@@ -255,6 +262,7 @@ Depends: adduser,
          neutron-common (= ${source:Version}),
          sudo,
          ${misc:Depends},
+         ${ostack-lsb-base},
          ${python:Depends},
 Description: OpenStack virtual network service - DHCP agent
  Neutron provides an API to dynamically request and configure virtual networks.
@@ -269,6 +277,7 @@ Architecture: all
 Depends: adduser,
          neutron-common (= ${source:Version}),
          ${misc:Depends},
+         ${ostack-lsb-base},
          ${python:Depends},
 Description: OpenStack virtual network service - metadata agent
  Neutron provides an API to dynamically request and configure virtual networks.
@@ -285,6 +294,7 @@ Depends: adduser,
          lsb-base,
          neutron-common (= ${source:Version}),
          ${misc:Depends},
+         ${ostack-lsb-base},
          ${python:Depends},
 Provides: neutron-plugin-metering-agent,
 Description: OpenStack virtual network service - metering agent
@@ -304,6 +314,7 @@ Provides: neutron-plugin-openvswitch-agent,
 Depends: neutron-common (= ${source:Version}),
          sudo,
          ${misc:Depends},
+         ${ostack-lsb-base},
          ${python:Depends},
 Recommends: openvswitch-datapath-dkms,
 Description: OpenStack virtual network service - Open vSwitch agent
@@ -326,6 +337,7 @@ Depends: bridge-utils,
          neutron-common (= ${source:Version}),
          sudo,
          ${misc:Depends},
+         ${ostack-lsb-base},
          ${python:Depends},
 Description: OpenStack virtual network service - Linux bridge agent
  Neutron provides an API to dynamically request and configure virtual networks.
@@ -365,6 +377,7 @@ Architecture: all
 Depends: neutron-common (= ${source:Version}),
          ${misc:Depends},
          ${python:Depends},
+         ${ostack-lsb-base},
          ${shlibs:Depends},
 Description: OpenStack virtual network service - SR-IOV agent
  Neutron provides an API to dynamically request and configure virtual networks.
@@ -374,10 +387,25 @@ Description: OpenStack virtual network service - SR-IOV agent
  .
  This package provides the Mellanox SR-IOV agent.
 
+Package: neutron-macvtap-agent
+Architecture: all
+Depends: neutron-common (= ${source:Version}),
+         ${misc:Depends},
+         ${python:Depends},
+         ${ostack-lsb-base},
+         ${shlibs:Depends},
+Description: OpenStack virtual network service - MacVTap 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 MacVTap Agent.
+
 Package: neutron-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends},
 Description: Neutron is a virtual network service for Openstack - Docs
  Neutron is a virtual network service for Openstack, and a part of
  Netstack. Just like OpenStack Nova provides an API to dynamically
diff --git a/xenial/debian/debian_control_vars b/xenial/debian/debian_control_vars
new file mode 100644 (file)
index 0000000..81c3723
--- /dev/null
@@ -0,0 +1 @@
+ostack-lsb-base= lsb-base (>= 3.0.6)
diff --git a/xenial/debian/designate-addition.txt b/xenial/debian/designate-addition.txt
new file mode 100644 (file)
index 0000000..504d7c6
--- /dev/null
@@ -0,0 +1,11 @@
+# This is an example of DNS integration with designate
+#[designate]
+# URL of your designate endpoint
+#url = http://55.114.111.93:9001/v2
+#admin_auth_url = http://127.0.0.1:35357/v2.0
+#admin_username = neutron
+#admin_password = XXXXXXXX
+#admin_tenant_name = service
+#allow_reverse_dns_lookup = True
+#ipv4_ptr_zone_prefix_size = 24
+#ipv6_ptr_zone_prefix_size = 116
index a79ed95e9ef08daf899b084b167d8e4c0c950bd5..7e6a198834b937a0a6752d59d4f99470382b18ed 100644 (file)
 # Description:       Agent to use within neutron linuxbridge client
 ### END INIT INFO
 
-# Author: Ghe Rivero <ghe.rivero@stackops.com>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
+# Author: Thomas Goirand <zigo@debian.org>
 DESC="Openstack Neutron LinuxBridge Plugin Agent"
 PROJECT_NAME=neutron
 NAME=${PROJECT_NAME}-linuxbridge-agent
@@ -25,5 +22,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/linuxbridge_agent.ini"
+DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/ml2_conf.ini --config-file=/etc/neutron/plugins/ml2/linuxbridge_agent.ini"
 
index 4b12e63c5d007a0f7e934f63073aaac7c508539c..3cb7509739d18bb4db2154d29cfb3e83263268a1 100644 (file)
@@ -1,13 +1,17 @@
-Description: Fix requirements.txt
-Author: Jerzy Mikolajczak <jmikolajczak@mirantis.com>
-Forwarded: not-needed
-Last-Update: 2016-09-09
+From bd13e603d84f56d12f86e5846ff1dcafd09458b6 Mon Sep 17 00:00:00 2001
+From: Ivan Udovichenko <iudovichenko@mirantis.com>
+Date: Sat, 29 Oct 2016 15:52:23 +0300
+Subject: [PATCH] Fix requirements.txt
 
-Index: neutron/requirements.txt
-===================================================================
---- neutron.orig/requirements.txt      2016-09-09 10:22:58.926849909 +0200
-+++ neutron/requirements.txt   2016-09-09 10:23:31.646525138 +0200
-@@ -44,8 +44,6 @@
+---
+ requirements.txt | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index 34a1787..5ed7544 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -44,8 +44,6 @@ oslo.service>=1.10.0 # Apache-2.0
  oslo.utils>=3.16.0 # Apache-2.0
  oslo.versionedobjects>=1.13.0 # Apache-2.0
  osprofiler>=1.4.0 # Apache-2.0
@@ -16,3 +20,6 @@ Index: neutron/requirements.txt
  
  python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
  python-designateclient>=1.5.0 # Apache-2.0
+-- 
+2.1.4
+
index 9e8c3d3936bbf3484cc0b3cf3988c3e26aa6459b..1d8932195d8b4884c3c20d9e96c8a13dbf7e3733 100644 (file)
@@ -1,13 +1,13 @@
 # Italian translation of neutron debconf messages.
-# Copyright (C) 2014, neutron package's copyright holder.
+# Copyright (C) 2016, neutron package's copyright holder.
 # This file is distributed under the same license as the neutron package.
-# Beatrice Torracca <beatricet@libero.it>, 2014.
+# Beatrice Torracca <beatricet@libero.it>, 2014, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: neutron\n"
 "Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
 "POT-Creation-Date: 2016-06-06 00:25+0200\n"
-"PO-Revision-Date: 2014-04-21 09:44+0200\n"
+"PO-Revision-Date: 2016-09-21 18:12+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
 "Language: it\n"
@@ -393,39 +393,35 @@ msgstr "Inserire l'indirizzo IP locale di questo ipervisore."
 #. Description
 #: ../neutron-common.templates:15001
 msgid "Nova server URL:"
-msgstr ""
+msgstr "URL del server Nova:"
 
 #. Type: string
 #. Description
 #: ../neutron-common.templates:15001
-#, fuzzy
 #| msgid "Please specify the IP address of that server."
 msgid "Please enter the URL of the Nova server."
-msgstr "Inserire l'indirizzo IP di tale server."
+msgstr "Inserire l'URL del server Nova."
 
 #. Type: string
 #. Description
 #: ../neutron-common.templates:16001
-#, fuzzy
 #| msgid "Auth server tenant name:"
 msgid "Nova server region name:"
-msgstr "Nome del «locatario» («tenant») per il server di autenticazione:"
+msgstr "Nome della regione del server Nova:"
 
 #. Type: string
 #. Description
 #: ../neutron-common.templates:16001
-#, fuzzy
 #| msgid "Please specify the IP address of that server."
 msgid "Please enter the region of the Nova server."
-msgstr "Inserire l'indirizzo IP di tale server."
+msgstr "Inserire la regione del server Nova."
 
 #. Type: string
 #. Description
 #: ../neutron-common.templates:17001
-#, fuzzy
 #| msgid "Auth server username:"
 msgid "Nova admin tenant name:"
-msgstr "Nome utente per il server di autenticazione:"
+msgstr "Nome del locatario («tenant») per l'amministrazione di Nova:"
 
 #. Type: string
 #. Description
@@ -435,42 +431,42 @@ msgid ""
 "Therefore Neutron needs to know the Nova admin tenant name, username and "
 "password."
 msgstr ""
+"Neutron deve poter comunicare con Nova attraverso Keystone, perciò Neutron "
+"deve conoscere il locatario («tenant»), il nome utente e la password per "
+"l'amministrazione di Nova."
 
 #. Type: string
 #. Description
 #: ../neutron-common.templates:17001
 msgid "Please enter the ID of the admin tenant for Nova."
-msgstr ""
+msgstr "Inserire l'ID del locatario («tenant») di amministrazione per Nova."
 
 #. Type: string
 #. Description
 #: ../neutron-common.templates:18001
-#, fuzzy
 #| msgid "Auth server username:"
 msgid "Neutron administrator username:"
-msgstr "Nome utente per il server di autenticazione:"
+msgstr "Nome utente dell'amministratore di Neutron:"
 
 #. Type: string
 #. Description
 #: ../neutron-common.templates:18001
-#, fuzzy
 #| msgid "Please specify the username to use with the authentication server."
 msgid "Please enter the username of the Nova administrator."
-msgstr "Specificare il nome utente da usare con il server di autenticazione."
+msgstr "Inserire il nome utente dell'amministratore di Nova."
 
 #. Type: password
 #. Description
 #: ../neutron-common.templates:19001
 msgid "Nova administrator password:"
-msgstr ""
+msgstr "Password dell'amministratore di Nova:"
 
 #. Type: password
 #. Description
 #: ../neutron-common.templates:19001
-#, fuzzy
 #| msgid "Please specify the password to use with the authentication server."
 msgid "Please enter the password of the Nova administrator."
-msgstr "Specificare la password da usare con il server di autenticazione."
+msgstr "Inserire la password dell'amministratore di Nova."
 
 #. Type: boolean
 #. Description
@@ -493,7 +489,6 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../neutron-server.templates:2001
-#, fuzzy
 #| msgid ""
 #| "Note that you will need to have an up and running Keystone server on "
 #| "which to connect using the Keystone authentication token."
@@ -503,7 +498,9 @@ msgid ""
 "The admin auth token is not used anymore."
 msgstr ""
 "Notare che sarà necessario avere un server Keystone in funzione a cui "
-"connettersi usando il token di autenticazione Keystone."
+"connettersi usando un nome di progetto di amministrazione conosciuto, un "
+"nome utente e password di amministratore. Il token di autenticazione di "
+"amministratore non è più usato."
 
 #. Type: string
 #. Description
@@ -525,10 +522,9 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../neutron-server.templates:4001
-#, fuzzy
 #| msgid "Auth server username:"
 msgid "Keystone admin name:"
-msgstr "Nome utente per il server di autenticazione:"
+msgstr "Nome amministratore Keystone:"
 
 #. Type: string
 #. Description
@@ -542,20 +538,22 @@ msgid ""
 "To register the service endpoint, this package needs to know the Admin "
 "login, name, project name, and password to the Keystone server."
 msgstr ""
+"Per registrare il punto terminale del servizio questo pacchetto deve "
+"conoscere il login, il nome, il nome del progetto e la password "
+"dell'amministratore per il server Keystone."
 
 #. Type: string
 #. Description
 #: ../neutron-server.templates:5001
-#, fuzzy
 #| msgid "Auth server username:"
 msgid "Keystone admin project name:"
-msgstr "Nome utente per il server di autenticazione:"
+msgstr "Nome del progetto di amministrazione Keystone:"
 
 #. Type: password
 #. Description
 #: ../neutron-server.templates:6001
 msgid "Keystone admin password:"
-msgstr ""
+msgstr "Password amministratore Keystone:"
 
 #. Type: string
 #. Description
@@ -649,7 +647,7 @@ msgstr ""
 #. Description
 #: ../neutron-metadata-agent.templates:7001
 msgid "Metadata proxy shared secret:"
-msgstr ""
+msgstr "Password amministratore Keystone:"
 
 #. Type: password
 #. Description
@@ -659,6 +657,9 @@ msgid ""
 "through the Neutron metadata agent, which serves as a proxy to the Nova "
 "metadata REST API server."
 msgstr ""
+"Le istanze di macchine virtuali che usano Neutron per gestire la rete "
+"recuperano i propri metadati attraverso l'agente di metadati di Neutron che "
+"funge da proxy per il server dell'API REST dei metadati di Nova."
 
 #. Type: password
 #. Description
@@ -668,19 +669,7 @@ msgid ""
 "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 ""
-
-#~ msgid "Auth server username:"
-#~ msgstr "Nome utente per il server di autenticazione:"
-
-#~ msgid "Keystone authentication token:"
-#~ msgstr "Token di autenticazione Keystone:"
-
-#~ msgid ""
-#~ "To configure its endpoint in Keystone, neutron-server needs the Keystone "
-#~ "auth token."
-#~ msgstr ""
-#~ "Per configurare il proprio punto terminale in Keystone, neutron-server ha "
-#~ "bisogno del token di autenticazione Keystone."
-
-#~ msgid "ml2/ml2_conf.ini"
-#~ msgstr "ml2/ml2_conf.ini"
+"Inserire la password da usare per proteggere le comunicazioni tra l'agente "
+"proxy per metadati di Neutron e il server di metadati Nova. La stessa "
+"password condivisa deve essere usata quando si configura il pacchetto nova-"
+"common."
index 47419755e0b78403b6e936e33d28eee5d923fc48..1176839bc0e4ee9879f670801ff9e2ca117365a8 100644 (file)
@@ -5,10 +5,10 @@
 # Américo Monteiro <a_monteiro@gmx.com>, 2013 - 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2.8.0.0-1\n"
-"Report-Msgid-Bugs-To: neutron@packages.debian.org\n"
-"POT-Creation-Date: 2016-06-06 00:25+0200\n"
-"PO-Revision-Date: 2016-04-15 00:52+0100\n"
+"Project-Id-Version: neutron 2.9.0.0-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-10-07 14:28+0000\n"
+"PO-Revision-Date: 2016-10-07 21:23+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. Type: string
 #. Description
@@ -74,18 +74,6 @@ msgid "Please specify the password to use with the authentication server."
 msgstr ""
 "Por favor especifique a palavra passe a 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
@@ -95,68 +83,40 @@ 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"
+msgid "plumgrid"
+msgstr "plumgrid"
 
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001
-msgid "Mellanox"
-msgstr "Mellanox"
+#| msgid "Midonet"
+msgid "midonet"
+msgstr "midonet"
 
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001
-msgid "Hyper-V"
-msgstr "Hyper-V"
+#| msgid "Midonet"
+msgid "midonet_v2"
+msgstr "midonet_v2"
 
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001
-msgid "RYU"
-msgstr "RYU"
+msgid "nec"
+msgstr "nec"
 
 #. Type: select
 #. Choices
 #: ../neutron-common.templates:6001
-msgid "MetaPlugin"
-msgstr "MetaPlugin"
+msgid "vmware"
+msgstr "vmware"
 
 #. 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"
+msgid "other"
+msgstr "outro"
 
 #. Type: select
 #. Description
@@ -668,6 +628,42 @@ msgstr ""
 "meta-dados do Nova. A mesma palavra passe partilhada deve ser usada quando "
 "configurar o pacote nova-common."
 
+#~ msgid "OpenVSwitch"
+#~ msgstr "OpenVSwitch"
+
+#~ msgid "LinuxBridge"
+#~ msgstr "LinuxBridge"
+
+#~ msgid "Brocade"
+#~ msgstr "Brocade"
+
+#~ msgid "Nicira"
+#~ msgstr "Nicira"
+
+#~ msgid "NEC"
+#~ msgstr "NEC"
+
+#~ msgid "Mellanox"
+#~ msgstr "Mellanox"
+
+#~ msgid "Hyper-V"
+#~ msgstr "Hyper-V"
+
+#~ msgid "RYU"
+#~ msgstr "RYU"
+
+#~ msgid "MetaPlugin"
+#~ msgstr "MetaPlugin"
+
+#~ msgid "BigSwitch"
+#~ msgstr "BigSwitch"
+
+#~ msgid "Cisco"
+#~ msgstr "Cisco"
+
+#~ msgid "PLUMgrid"
+#~ msgstr "PLUMgrid"
+
 #~ msgid "Auth server username:"
 #~ msgstr "Nome de utilizador do servidor de autenticação:"
 
index 3341eace6a4bf3e7e6f8fa9aa5da32de5f8d21b0..1e4fab1f35feae1f82eb6dc1185fa33fef03b1bd 100755 (executable)
@@ -6,7 +6,7 @@ export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d
 PYTHONS:=$(shell pyversions -vr)
 
 %:
-       dh $@ --buildsystem=python_distutils --with python2,systemd,sphinxdoc
+       dh $@ --buildsystem=python_distutils --with python2,systemd
 
 override_dh_auto_install:
        echo "Do nothing"
@@ -24,6 +24,11 @@ override_dh_install:
                --namespace neutron.base.agent \
                --namespace neutron.dhcp.agent \
                --namespace oslo.log
+       sed -i 's|^[ #\t]*interface_driver[ \t]*=.*|interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver|' $(CURDIR)/debian/neutron-dhcp-agent/etc/neutron/dhcp_agent.ini
+       sed -i 's|^[ #\t]*ovs_integration_bridge[ \t]*=.*|ovs_integration_bridge = br-int|' $(CURDIR)/debian/neutron-dhcp-agent/etc/neutron/dhcp_agent.ini
+       sed -i 's|^[ #\t]*dhcp_driver[ \t]*=.*|dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq|' $(CURDIR)/debian/neutron-dhcp-agent/etc/neutron/dhcp_agent.ini
+       sed -i 's|^[ #\t]*enable_isolated_metadata[ \t]*=.*|enable_isolated_metadata = False|' $(CURDIR)/debian/neutron-dhcp-agent/etc/neutron/dhcp_agent.ini
+       sed -i 's|^[ #\t]*dnsmasq_config_file[ \t]*=.*|dnsmasq_config_file = /etc/neutron/dnsmasq-neutron.conf|' $(CURDIR)/debian/neutron-dhcp-agent/etc/neutron/dhcp_agent.ini
 
        # l3_agent.ini
        mkdir -p $(CURDIR)/debian/neutron-l3-agent/etc/neutron
@@ -32,6 +37,11 @@ override_dh_install:
                --namespace neutron.base.agent \
                --namespace neutron.l3.agent \
                --namespace oslo.log
+       sed -i 's|^[ #\t]*interface_driver[ \t]*=.*|interface_driver = openvswitch|' $(CURDIR)/debian/neutron-l3-agent/etc/neutron/l3_agent.ini
+       sed -i 's|^[ #\t]*handle_internal_only_routers[ \t]*=.*|handle_internal_only_routers = True|' $(CURDIR)/debian/neutron-l3-agent/etc/neutron/l3_agent.ini
+       sed -i 's|^[ #\t]*external_network_bridge[ \t]*=.*|external_network_bridge = br-ex|' $(CURDIR)/debian/neutron-l3-agent/etc/neutron/l3_agent.ini
+       sed -i 's|^[ #\t]*enable_metadata_proxy[ \t]*=.*|enable_metadata_proxy = True|' $(CURDIR)/debian/neutron-l3-agent/etc/neutron/l3_agent.ini
+       sed -i 's|^[ #\t]*agent_mode[ \t]*=.*|agent_mode = legacy|' $(CURDIR)/debian/neutron-l3-agent/etc/neutron/l3_agent.ini
 
        # linuxbridge_agent.ini
        mkdir -p $(CURDIR)/debian/neutron-linuxbridge-agent/etc/neutron/plugins/ml2
@@ -40,16 +50,26 @@ override_dh_install:
                --namespace neutron.ml2.linuxbridge.agent \
                --namespace oslo.log
 
+       # macvtap_agent.ini
+       mkdir -p $(CURDIR)/debian/neutron-macvtap-agent/etc/neutron/plugins/ml2
+       PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-macvtap-agent/etc/neutron/plugins/ml2/macvtap_agent.ini \
+               --wrap-width 140 \
+               --namespace neutron.ml2.macvtap.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
+               --namespace oslo.log \
+               --namespace oslo.cache
+       sed -i 's|^[ #\t]*nova_metadata_protocol[ \t]*=.*|nova_metadata_protocol = http|' $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini
+       sed -i 's|^[ #\t]*nova_metadata_ip[ \t]*=.*|nova_metadata_ip = 127.0.0.1|' $(CURDIR)/debian/neutron-metadata-agent/usr/share/neutron-metadata-agent/metadata_agent.ini
 
        # metering_agent.ini
        mkdir -p $(CURDIR)/debian/neutron-metering-agent/etc/neutron
-       PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator --output-file $(CURDIR)/debian/neutron-metering-agent/etc/neutron/metering_agent.ini \
+       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
@@ -60,6 +80,15 @@ override_dh_install:
                --wrap-width 140 \
                --namespace neutron.ml2 \
                --namespace oslo.log
+       sed -i 's|^[ #\t]*type_drivers[ \t]*=.*|type_drivers = flat,gre|' $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/ml2_conf.ini
+       sed -i 's|^[ #\t]*tenant_network_types[ \t]*=.*|tenant_network_types = gre|' $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/ml2_conf.ini
+       sed -i 's|^[ #\t]*mechanism_drivers[ \t]*=.*|mechanism_drivers = openvswitch,l2population|' $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/ml2_conf.ini
+       sed -i 's|^[ #\t]*flat_networks[ \t]*=.*|flat_networks = external|' $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/ml2_conf.ini
+       sed -i 's|^[ #\t]*tunnel_id_ranges[ \t]*=.*|tunnel_id_ranges = 1:1000|' $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/ml2_conf.ini
+       sed -i 's|^[ #\t]*enable_security_group[ \t]*=.*|enable_security_group = True|' $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/ml2_conf.ini
+       sed -i 's|^[ #\t]*enable_ipset[ \t]*=.*|enable_ipset = True |' $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/ml2_conf.ini
+       pkgos-fix-config-default $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2/ml2_conf.ini ml2 extension_drivers port_security,qos
+       
 
        # 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 \
@@ -87,6 +116,33 @@ override_dh_install:
                --namespace oslo.service.wsgi \
                --namespace keystonemiddleware.auth_token
 
+       sed -i 's|^[ #\t]*core_plugin[ \t]*=.*|core_plugin = ml2|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
+       sed -i 's|^[ #\t]*service_plugins[ \t]*=.*|service_plugins = router,metering,qos|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
+       sed -i 's|^[ #\t]*auth_strategy[ \t]*=.*|auth_strategy = keystone|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
+       sed -i 's|^[ #\t]*allow_overlapping_ips[ \t]*=.*|allow_overlapping_ips = True|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
+       sed -i 's|^[ #\t]*notify_nova_on_port_status_changes[ \t]*=.*|notify_nova_on_port_status_changes = True |' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
+       sed -i 's|^[ #\t]*rpc_backend[ \t]*=.*|rpc_backend = rabbit|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
+       sed -i 's|^[ #\t]*root_helper[ \t]*=.*|root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
+       sed -i 's|^[ #\t]*connection[ \t]*=.*|connection = sqlite:///var/lib/neutron/neutrondb|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
+       sed -i 's|^[ #\t]*region_name[ \t]*=.*|region_name = regionOne|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
+       sed -i 's|^[ #\t]*rabbit_host[ \t]*=.*|rabbit_host = localhost|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
+       sed -i 's|^[ #\t]*rabbit_userid[ \t]*=.*|rabbit_userid = guest|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
+       sed -i 's|^[ #\t]*rabbit_password[ \t]*=.*|rabbit_password = guest|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
+       sed -i 's/^[ \t#]*auth_protocol[ \t]*=[ \t].*/auth_protocol = http/' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
+       pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf oslo_concurrency lock_path /var/lock/neutron
+
+       # Fix v3 auth for the [nova] section
+       pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova auth_type v3password
+       pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova user_domain_id default
+       pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova project_name admin
+       pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova auth_url http://127.0.0.1:5000/v3
+       pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova tenant_name admin
+       pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova username admin
+       pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova user_domain_name default
+       pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova project_domain_name default
+
+       # Add a [designate] configuration example
+       cat debian/designate-addition.txt >> $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf
 
        # openvswitch_agent.ini
        mkdir -p $(CURDIR)/debian/neutron-common/usr/share/neutron-common
@@ -94,6 +150,14 @@ override_dh_install:
                --wrap-width 140 \
                --namespace neutron.ml2.ovs.agent \
                --namespace oslo.log
+       sed -i 's|^[ #\t]*integration_bridge[ \t]*=.*|integration_bridge = br-int|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini
+       sed -i 's|^[ #\t]*bridge_mappings[ \t]*=.*|bridge_mappings = external:br-ex|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini
+       sed -i 's|^[ #\t]*polling_interval[ \t]*=.*|polling_interval = 15|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini
+       sed -i 's|^[ #\t]*tunnel_types[ \t]*=.*|tunnel_types = gre|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini
+       sed -i 's|^[ #\t]*l2_population[ \t]*=.*|l2_population = True|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini
+       sed -i 's|^[ #\t]*arp_responder[ \t]*=.*|arp_responder = False|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini
+       sed -i 's|^[ #\t]*enable_distributed_routing[ \t]*=.*|enable_distributed_routing = False|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini
+       sed -i 's|^[ #\t]*firewall_driver[ \t]*=.*|firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/openvswitch_agent.ini
 
        # sriov_agent.ini
        mkdir -p $(CURDIR)/debian/neutron-common/etc/neutron/plugins/ml2
@@ -103,9 +167,8 @@ override_dh_install:
                --namespace oslo.log
 
        dh_install --fail-missing -X/usr/etc
-
+       
 override_dh_auto_clean:
-       dh_auto_clean
        find . -type f -name "*.pyc" | xargs rm -fr
        rm -rf build neutron.egg-info
        rm -f debian/neutron-common.config \
@@ -123,8 +186,8 @@ override_dh_clean:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-       echo "No unit tests: currently broken."
-#      python2-ostestr --pretty --color --slowest
+#      echo "No unit tests: currently broken."
+       python2-ostestr --pretty --color --slowest
 #      @echo "===> Running tests"
 #      set -e ; set -x ; for i in 2.7 ; do \
 #              PYMAJOR=`echo $$i | cut -d'.' -f1` ; \
@@ -137,7 +200,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 #              rm -f $$TEMP_REZ ; \
 #              testr-python$$PYMAJOR slowest ; \
 #      done
-       #PYTHONPATH=build/* ./run_tests.sh -N -P
+#      #PYTHONPATH=build/* ./run_tests.sh -N -P
 endif
 
 override_dh_auto_build:
@@ -150,10 +213,3 @@ override_dh_auto_build:
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-dhcp-agent.postinst
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-metadata-agent.postinst
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func neutron-metadata-agent.config
-
-override_dh_sphinxdoc:
-ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-       python setup.py build_sphinx
-       cp -rf doc/build/html $(CURDIR)/debian/neutron-doc/usr/share/doc/neutron-doc
-       dh_sphinxdoc -O--buildsystem=python_distutils
-endif
index cb61fa5267b6ad8b3bbc2a612754b79dae466292..912224515e06f63403e6e177a39145c46c89344b 100644 (file)
@@ -1 +1,2 @@
 extend-diff-ignore = "^[^/]*[.]egg-info/"
+extend-diff-ignore = "^[.]gitreview$"
diff --git a/xenial/debian/ubuntu_control_vars b/xenial/debian/ubuntu_control_vars
new file mode 100644 (file)
index 0000000..e69de29