Added debconf configuration of the keystone_authtoken.

Change-Id: If126f180cba06a00f827519c5820708d5c0072dd

Rewritten-From: b798bebd2a5551f1d6617bab10a53784ab8982b2

diff --git a/xenial/debian/ceilometer-common.config.in b/xenial/debian/ceilometer-common.config.in
index 66aa142d524aa37d93ba285cd54b9d8587222550..be87644b0660afc83ab5a09a6f7166421e1699db 100644 (file)
--- a/xenial/debian/ceilometer-common.config.in
+++ b/xenial/debian/ceilometer-common.config.in
@@ -7,5 +7,6 @@ set -e
 #PKGOS-INCLUDE#
 
 pkgos_rabbit_read_conf /etc/ceilometer/ceilometer.conf DEFAULT ceilometer
+pkgos_read_admin_creds /etc/ceilometer/ceilometer.conf keystone_authtoken ceilometer
 
 exit 0

diff --git a/xenial/debian/ceilometer-common.postinst.in b/xenial/debian/ceilometer-common.postinst.in
index 2ba7377faa439fbf71ecf75a7b5b4ebf3849da0c..c9b77a739e803f31ae363eb9676b2ef5f2245566 100644 (file)
--- a/xenial/debian/ceilometer-common.postinst.in
+++ b/xenial/debian/ceilometer-common.postinst.in
@@ -46,6 +46,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        pkgos_write_new_conf ceilometer sources.json
        pkgos_write_new_conf ceilometer pipeline.yaml
        pkgos_rabbit_write_conf /etc/ceilometer/ceilometer.conf DEFAULT ceilometer
+       pkgos_write_admin_creds /etc/ceilometer/ceilometer.conf keystone_authtoken glance
        ceilometer-dbsync || true
 fi
 

diff --git a/xenial/debian/ceilometer-common.templates b/xenial/debian/ceilometer-common.templates
index 426df56a92aa1f1d1ba8f2e643f775eb2a868130..66bd1b3e318c275c89ef63e7523d0dbf050e749c 100644 (file)
--- a/xenial/debian/ceilometer-common.templates
+++ b/xenial/debian/ceilometer-common.templates
@@ -32,3 +32,35 @@ _Description: Password for connection to the RabbitMQ server:
  needs to connect to a central RabbitMQ server.
  .
  Please specify the password used to connect to the RabbitMQ server.
+
+Template: ceilometer/auth-host
+Type: string
+Default: 127.0.0.1
+_Description: Authentication server hostname:
+ Please specify the hostname of the authentication server for Ceilometer.
+ Typically this is also the hostname of the OpenStack Identity Service
+ (Keystone).
+
+Template: ceilometer/admin-tenant-name
+Type: string
+Default: admin
+# 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")
+_Description: Authentication server tenant name:
+ Please specify the authentication server tenant name.
+
+Template: ceilometer/admin-user
+Type: string
+Default: admin
+_Description: Authentication server username:
+ Please specify the username to use with the authentication server.
+
+Template: ceilometer/admin-password
+Type: password
+_Description: Authentication server password:
+ Please specify the password to use with the authentication server.

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 90552fdcfa006d4495ba547cc7936b98e91727ae..15d16462b29fc9133528c636fd8d5e6cc5192fa2 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,9 @@
+ceilometer (2013.2-2) UNRELEASED; urgency=low
+
+  * Added configuration of the keystone_authtoken through Debconf.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 28 Oct 2013 22:34:50 +0800
+
 ceilometer (2013.2-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/xenial/debian/po/cs.po b/xenial/debian/po/cs.po
index 88ca95d710545856265ee383823bdd0db2f39072..f6b02734000d453d110e7a9db0f9133760c298c7 100644 (file)
--- a/xenial/debian/po/cs.po
+++ b/xenial/debian/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ceilometer 2013.1.2-4\n"
 "Report-Msgid-Bugs-To: ceilometer@packages.debian.org\n"
-"POT-Creation-Date: 2013-09-25 16:34+0800\n"
+"POT-Creation-Date: 2013-10-28 22:32+0800\n"
 "PO-Revision-Date: 2013-08-29 10:31+0200\n"
 "Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -169,3 +169,74 @@ msgstr ""
 #: ../ceilometer-common.templates:4001
 msgid "Please specify the password used to connect to the RabbitMQ server."
 msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid "Authentication server hostname:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid ""
+"Please specify the hostname of the authentication server for Ceilometer. "
+"Typically this is also the hostname of the OpenStack Identity Service "
+"(Keystone)."
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+msgid "Authentication server tenant name:"
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the authentication server tenant name."
+msgstr "Zadejte IP adresu, která se bude používat ke spojení s Ceilometer."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+msgid "Authentication server username:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the username to use with the authentication server."
+msgstr "Zadejte IP adresu, která se bude používat ke spojení s Ceilometer."
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+msgid "Authentication server password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the password to use with the authentication server."
+msgstr "Zadejte IP adresu, která se bude používat ke spojení s Ceilometer."

diff --git a/xenial/debian/po/da.po b/xenial/debian/po/da.po
index 746003a58abe1b4c8463c3fb761e7e8dc1dfeca3..db02c27e75fea6499fc8278b035435dd914040cd 100644 (file)
--- a/xenial/debian/po/da.po
+++ b/xenial/debian/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ceilometer\n"
 "Report-Msgid-Bugs-To: ceilometer@packages.debian.org\n"
-"POT-Creation-Date: 2013-09-25 16:34+0800\n"
+"POT-Creation-Date: 2013-10-28 22:32+0800\n"
 "PO-Revision-Date: 2013-09-01 12:42+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -170,3 +170,77 @@ msgstr ""
 #: ../ceilometer-common.templates:4001
 msgid "Please specify the password used to connect to the RabbitMQ server."
 msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid "Authentication server hostname:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid ""
+"Please specify the hostname of the authentication server for Ceilometer. "
+"Typically this is also the hostname of the OpenStack Identity Service "
+"(Keystone)."
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+msgid "Authentication server tenant name:"
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the authentication server tenant name."
+msgstr ""
+"Indtast venligst IP-adressen som vil blive brugt til at kontakte Ceilometer."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+msgid "Authentication server username:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the username to use with the authentication server."
+msgstr ""
+"Indtast venligst IP-adressen som vil blive brugt til at kontakte Ceilometer."
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+msgid "Authentication server password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the password to use with the authentication server."
+msgstr ""
+"Indtast venligst IP-adressen som vil blive brugt til at kontakte Ceilometer."

diff --git a/xenial/debian/po/fr.po b/xenial/debian/po/fr.po
index c43259fb9b68558fa828354d31566460a23407b8..b582f3e6fd9f33197ac2d17469fe0666a68cb4af 100644 (file)
--- a/xenial/debian/po/fr.po
+++ b/xenial/debian/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ceilometer\n"
 "Report-Msgid-Bugs-To: ceilometer@packages.debian.org\n"
-"POT-Creation-Date: 2013-09-25 16:34+0800\n"
+"POT-Creation-Date: 2013-10-28 22:32+0800\n"
 "PO-Revision-Date: 2013-08-28 11:55+0100\n"
 "Last-Translator: Julien Patriarca <leatherface@debian.org>\n"
 "Language-Team: FRENCH <debian-l10n-french@lists.debian.org>\n"
@@ -173,3 +173,77 @@ msgstr ""
 #: ../ceilometer-common.templates:4001
 msgid "Please specify the password used to connect to the RabbitMQ server."
 msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid "Authentication server hostname:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid ""
+"Please specify the hostname of the authentication server for Ceilometer. "
+"Typically this is also the hostname of the OpenStack Identity Service "
+"(Keystone)."
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+msgid "Authentication server tenant name:"
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the authentication server tenant name."
+msgstr ""
+"Veuillez indiquer l'adresse IP qui sera utilisée pour contacter Ceilometer."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+msgid "Authentication server username:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the username to use with the authentication server."
+msgstr ""
+"Veuillez indiquer l'adresse IP qui sera utilisée pour contacter Ceilometer."
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+msgid "Authentication server password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the password to use with the authentication server."
+msgstr ""
+"Veuillez indiquer l'adresse IP qui sera utilisée pour contacter Ceilometer."

diff --git a/xenial/debian/po/it.po b/xenial/debian/po/it.po
index 7d4f0a76b20cb64b107bb989096c3e7e10afbab2..b1c2470f80378ac8b2833d19821fc57f377c6c80 100644 (file)
--- a/xenial/debian/po/it.po
+++ b/xenial/debian/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ceilometer\n"
 "Report-Msgid-Bugs-To: ceilometer@packages.debian.org\n"
-"POT-Creation-Date: 2013-09-25 16:34+0800\n"
+"POT-Creation-Date: 2013-10-28 22:32+0800\n"
 "PO-Revision-Date: 2013-08-14 15:44+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -170,3 +170,74 @@ msgstr ""
 #: ../ceilometer-common.templates:4001
 msgid "Please specify the password used to connect to the RabbitMQ server."
 msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid "Authentication server hostname:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid ""
+"Please specify the hostname of the authentication server for Ceilometer. "
+"Typically this is also the hostname of the OpenStack Identity Service "
+"(Keystone)."
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+msgid "Authentication server tenant name:"
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the authentication server tenant name."
+msgstr "Inserire l'indirizzo IP che verrà usato per contattare Ceilometer."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+msgid "Authentication server username:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the username to use with the authentication server."
+msgstr "Inserire l'indirizzo IP che verrà usato per contattare Ceilometer."
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+msgid "Authentication server password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the password to use with the authentication server."
+msgstr "Inserire l'indirizzo IP che verrà usato per contattare Ceilometer."

diff --git a/xenial/debian/po/ja.po b/xenial/debian/po/ja.po
index f9de8c4d80b16f3f76605733490e7c8a92e2c672..957b0fc1ffde4871e947e0e62280c76861a71fe7 100644 (file)
--- a/xenial/debian/po/ja.po
+++ b/xenial/debian/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ceilometer\n"
 "Report-Msgid-Bugs-To: ceilometer@packages.debian.org\n"
-"POT-Creation-Date: 2013-09-25 16:34+0800\n"
+"POT-Creation-Date: 2013-10-28 22:32+0800\n"
 "PO-Revision-Date: 2013-07-11 02:06+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -168,3 +168,74 @@ msgstr ""
 #: ../ceilometer-common.templates:4001
 msgid "Please specify the password used to connect to the RabbitMQ server."
 msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid "Authentication server hostname:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid ""
+"Please specify the hostname of the authentication server for Ceilometer. "
+"Typically this is also the hostname of the OpenStack Identity Service "
+"(Keystone)."
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+msgid "Authentication server tenant name:"
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the authentication server tenant name."
+msgstr "Ceilometer への通信に利用する IP アドレスを入力してください。"
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+msgid "Authentication server username:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the username to use with the authentication server."
+msgstr "Ceilometer への通信に利用する IP アドレスを入力してください。"
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+msgid "Authentication server password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the password to use with the authentication server."
+msgstr "Ceilometer への通信に利用する IP アドレスを入力してください。"

diff --git a/xenial/debian/po/pt.po b/xenial/debian/po/pt.po
index bd3e8c6f5c1b509e7909ca986267d0f613b639ec..327cc414b70c597ef78f56990f4fefe3653ccc9f 100644 (file)
--- a/xenial/debian/po/pt.po
+++ b/xenial/debian/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ceilometer\n"
 "Report-Msgid-Bugs-To: ceilometer@packages.debian.org\n"
-"POT-Creation-Date: 2013-09-25 16:34+0800\n"
+"POT-Creation-Date: 2013-10-28 22:32+0800\n"
 "PO-Revision-Date: 2013-08-21 09:50+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -173,3 +173,80 @@ msgstr ""
 #: ../ceilometer-common.templates:4001
 msgid "Please specify the password used to connect to the RabbitMQ server."
 msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid "Authentication server hostname:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid ""
+"Please specify the hostname of the authentication server for Ceilometer. "
+"Typically this is also the hostname of the OpenStack Identity Service "
+"(Keystone)."
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+msgid "Authentication server tenant name:"
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the authentication server tenant name."
+msgstr ""
+"Por favor introduza o endereço IP que será utilizado para contactar o "
+"Ceilometer."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+msgid "Authentication server username:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the username to use with the authentication server."
+msgstr ""
+"Por favor introduza o endereço IP que será utilizado para contactar o "
+"Ceilometer."
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+msgid "Authentication server password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the password to use with the authentication server."
+msgstr ""
+"Por favor introduza o endereço IP que será utilizado para contactar o "
+"Ceilometer."

diff --git a/xenial/debian/po/ru.po b/xenial/debian/po/ru.po
index 90f13b5b55703e6a51adbb83845bbbc27f722765..024fc7d394881b408c07b353a4488932f8fcb59f 100644 (file)
--- a/xenial/debian/po/ru.po
+++ b/xenial/debian/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ceilometer 2013.1.2-4\n"
 "Report-Msgid-Bugs-To: ceilometer@packages.debian.org\n"
-"POT-Creation-Date: 2013-09-25 16:34+0800\n"
+"POT-Creation-Date: 2013-10-28 22:32+0800\n"
 "PO-Revision-Date: 2013-08-30 08:50+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -173,3 +173,77 @@ msgstr ""
 #: ../ceilometer-common.templates:4001
 msgid "Please specify the password used to connect to the RabbitMQ server."
 msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid "Authentication server hostname:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid ""
+"Please specify the hostname of the authentication server for Ceilometer. "
+"Typically this is also the hostname of the OpenStack Identity Service "
+"(Keystone)."
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+msgid "Authentication server tenant name:"
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the authentication server tenant name."
+msgstr ""
+"Введите IP-адрес, который будет использован для подключения к Ceilometer."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+msgid "Authentication server username:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the username to use with the authentication server."
+msgstr ""
+"Введите IP-адрес, который будет использован для подключения к Ceilometer."
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+msgid "Authentication server password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the password to use with the authentication server."
+msgstr ""
+"Введите IP-адрес, который будет использован для подключения к Ceilometer."

diff --git a/xenial/debian/po/templates.pot b/xenial/debian/po/templates.pot
index 8e3828e8930b5418c45112388e8f0ca28bfcfffb..a3057832ffa30e0cb0b610842af58aefac394163 100644 (file)
--- a/xenial/debian/po/templates.pot
+++ b/xenial/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ceilometer\n"
 "Report-Msgid-Bugs-To: ceilometer@packages.debian.org\n"
-"POT-Creation-Date: 2013-09-25 16:34+0800\n"
+"POT-Creation-Date: 2013-10-28 22:32+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -152,3 +152,68 @@ msgstr ""
 #: ../ceilometer-common.templates:4001
 msgid "Please specify the password used to connect to the RabbitMQ server."
 msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid "Authentication server hostname:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:5001
+msgid ""
+"Please specify the hostname of the authentication server for Ceilometer. "
+"Typically this is also the hostname of the OpenStack Identity Service "
+"(Keystone)."
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+msgid "Authentication server tenant name:"
+msgstr ""
+
+#. Type: string
+#. 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")
+#: ../ceilometer-common.templates:6001
+msgid "Please specify the authentication server tenant name."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+msgid "Authentication server username:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:7001
+msgid "Please specify the username to use with the authentication server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+msgid "Authentication server password:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:8001
+msgid "Please specify the password to use with the authentication server."
+msgstr ""