From: Thomas Goirand Date: Mon, 28 Oct 2013 14:39:04 +0000 (+0800) Subject: Added debconf configuration of the keystone_authtoken. X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ced9f276a139dbc07bf6a4d52acfac29ba2e1c52;p=openstack-build%2Fceilometer-build.git Added debconf configuration of the keystone_authtoken. Change-Id: If126f180cba06a00f827519c5820708d5c0072dd Rewritten-From: b798bebd2a5551f1d6617bab10a53784ab8982b2 --- diff --git a/trusty/debian/ceilometer-common.config.in b/trusty/debian/ceilometer-common.config.in index 66aa142..be87644 100644 --- a/trusty/debian/ceilometer-common.config.in +++ b/trusty/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/trusty/debian/ceilometer-common.postinst.in b/trusty/debian/ceilometer-common.postinst.in index 2ba7377..c9b77a7 100644 --- a/trusty/debian/ceilometer-common.postinst.in +++ b/trusty/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/trusty/debian/ceilometer-common.templates b/trusty/debian/ceilometer-common.templates index 426df56..66bd1b3 100644 --- a/trusty/debian/ceilometer-common.templates +++ b/trusty/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/trusty/debian/changelog b/trusty/debian/changelog index 90552fd..15d1646 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,9 @@ +ceilometer (2013.2-2) UNRELEASED; urgency=low + + * Added configuration of the keystone_authtoken through Debconf. + + -- Thomas Goirand Mon, 28 Oct 2013 22:34:50 +0800 + ceilometer (2013.2-1) unstable; urgency=low * New upstream release. diff --git a/trusty/debian/po/cs.po b/trusty/debian/po/cs.po index 88ca95d..f6b0273 100644 --- a/trusty/debian/po/cs.po +++ b/trusty/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 \n" "Language-Team: Czech \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/trusty/debian/po/da.po b/trusty/debian/po/da.po index 746003a..db02c27 100644 --- a/trusty/debian/po/da.po +++ b/trusty/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 \n" "Language-Team: Danish \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/trusty/debian/po/fr.po b/trusty/debian/po/fr.po index c43259f..b582f3e 100644 --- a/trusty/debian/po/fr.po +++ b/trusty/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 \n" "Language-Team: FRENCH \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/trusty/debian/po/it.po b/trusty/debian/po/it.po index 7d4f0a7..b1c2470 100644 --- a/trusty/debian/po/it.po +++ b/trusty/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 \n" "Language-Team: Italian \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/trusty/debian/po/ja.po b/trusty/debian/po/ja.po index f9de8c4..957b0fc 100644 --- a/trusty/debian/po/ja.po +++ b/trusty/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 \n" "Language-Team: Japanese \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/trusty/debian/po/pt.po b/trusty/debian/po/pt.po index bd3e8c6..327cc41 100644 --- a/trusty/debian/po/pt.po +++ b/trusty/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 \n" "Language-Team: Portuguese \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/trusty/debian/po/ru.po b/trusty/debian/po/ru.po index 90f13b5..024fc7d 100644 --- a/trusty/debian/po/ru.po +++ b/trusty/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 \n" "Language-Team: Russian \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/trusty/debian/po/templates.pot b/trusty/debian/po/templates.pot index 8e3828e..a305783 100644 --- a/trusty/debian/po/templates.pot +++ b/trusty/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 \n" "Language-Team: LANGUAGE \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 ""