Added automatic Debconf configuration of RabbitMQ.

Change-Id: I22a6bf59bbbd592f556b27f77b0c38973b51fb8f

Rewritten-From: 6b72ee9df180ac58f7f7024a501e0ea56e24adf8

diff --git a/trusty/debian/ceilometer-common.postinst.in b/trusty/debian/ceilometer-common.postinst.in
index e4f3dafd60e30e88ac599ee4c1ea278c872176d2..9255dcbe2bbd3e8b23d3e8cdd471b5e37346dff6 100644 (file)
--- a/trusty/debian/ceilometer-common.postinst.in
+++ b/trusty/debian/ceilometer-common.postinst.in
@@ -44,6 +44,7 @@ if [ "$1" = "configure" ]; then
        pkgos_write_new_conf ceilometer policy.json
        pkgos_write_new_conf ceilometer sources.json
        pkgos_write_new_conf ceilometer pipeline.yaml
+       pkgos_rabbit_write_conf /etc/ceilometer/ceilometer.conf DEFAULT ceilometer
        ceilometer-dbsync || true
 fi
 

diff --git a/trusty/debian/po/POTFILES.in b/trusty/debian/po/POTFILES.in
index 78a2ec6501f9f2411ff4f8d8d4d5d457a11b8124..b4028120d1998e9a96f2ae7cee4e91a287313019 100644 (file)
--- a/trusty/debian/po/POTFILES.in
+++ b/trusty/debian/po/POTFILES.in
@@ -1 +1,2 @@
 [type: gettext/rfc822deb] ceilometer-api.templates
+[type: gettext/rfc822deb] ceilometer-common.templates

diff --git a/trusty/debian/po/cs.po b/trusty/debian/po/cs.po
index 9c4d89a3faf4808f3b4e7db56a832a4e42069dbb..88ca95d710545856265ee383823bdd0db2f39072 100644 (file)
--- 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-07-11 01:06+0800\n"
+"POT-Creation-Date: 2013-09-25 16:34+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"
@@ -32,7 +32,8 @@ msgid ""
 msgstr ""
 "Aby byla každá služba Openstack (každé API) přístupná, musí být "
 "zaregistrována. To se provádí pomocí příkazů \"keystone service-create\" a "
-"\"keystone endpoint-create\". Zvolte si, zda-li se tyto příkazy mají nyní spustit."
+"\"keystone endpoint-create\". Zvolte si, zda-li se tyto příkazy mají nyní "
+"spustit."
 
 #. Type: boolean
 #. Description
@@ -57,8 +58,8 @@ msgid ""
 "Please enter the IP address of the Keystone server, so that ceilometer-api "
 "can contact Keystone to do the Ceilometer service and endpoint creation."
 msgstr ""
-"Zadejte IP adresu serveru Keystone, aby se mohlo ceilometer-api spojit s Keystone "
-"a provozovat službu Ceilometer a vytvářet koncové body."
+"Zadejte IP adresu serveru Keystone, aby se mohlo ceilometer-api spojit s "
+"Keystone a provozovat službu Ceilometer a vytvářet koncové body."
 
 #. Type: password
 #. Description
@@ -97,8 +98,8 @@ msgid ""
 "address."
 msgstr ""
 "Tato IP adresa musí být přístupná z klientů, kteří budou tuto službu "
-"používat, takže pokud instalujete veřejný cloud, musí to být veřejná "
-"IP adresa."
+"používat, takže pokud instalujete veřejný cloud, musí to být veřejná IP "
+"adresa."
 
 #. Type: string
 #. Description
@@ -117,3 +118,54 @@ msgstr ""
 "Openstack lze využívat pomocí oblastí dostupnosti, přičemž každá oblast "
 "představuje místo. Zadejte prosím oblast, kterou chcete použít při "
 "registraci koncového bodu."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:2001 ../ceilometer-common.templates:3001
+#: ../ceilometer-common.templates:4001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the IP address of that server."
+msgstr "Zadejte IP adresu, která se bude používat ke spojení s Ceilometer."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr ""

diff --git a/trusty/debian/po/da.po b/trusty/debian/po/da.po
index c75dbea8ea7c965071526c1e5956b8ca77b06751..746003a58abe1b4c8463c3fb761e7e8dc1dfeca3 100644 (file)
--- 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-07-11 01:06+0800\n"
+"POT-Creation-Date: 2013-09-25 16:34+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"
@@ -30,9 +30,9 @@ msgid ""
 "accessible. This is done using \"keystone service-create\" and \"keystone "
 "endpoint-create\". This can be done automatically now."
 msgstr ""
-"Hver OpenStack-tjeneste (hver API) skal registreres for at være "
-"tilgængelig. Dette gøres med »keystone service-create« og »keystone "
-"endpoint-create«, hvilket nu kan udføres automatisk."
+"Hver OpenStack-tjeneste (hver API) skal registreres for at være tilgængelig. "
+"Dette gøres med »keystone service-create« og »keystone endpoint-create«, "
+"hvilket nu kan udføres automatisk."
 
 #. Type: boolean
 #. Description
@@ -57,8 +57,8 @@ msgid ""
 "Please enter the IP address of the Keystone server, so that ceilometer-api "
 "can contact Keystone to do the Ceilometer service and endpoint creation."
 msgstr ""
-"Indtast venligst IP-adressen for Keystoneserveren, så at ceilometer-api "
-"kan kontakte Keystone for at udføre Ceilometertjenesten og slutpunktsoprettelse."
+"Indtast venligst IP-adressen for Keystoneserveren, så at ceilometer-api kan "
+"kontakte Keystone for at udføre Ceilometertjenesten og slutpunktsoprettelse."
 
 #. Type: password
 #. Description
@@ -86,7 +86,8 @@ msgstr "IP-adresse for Ceilometers slutpunkt:"
 #. Description
 #: ../ceilometer-api.templates:5001
 msgid "Please enter the IP address that will be used to contact Ceilometer."
-msgstr "Indtast venligst IP-adressen som vil blive brugt til at kontakte Ceilometer."
+msgstr ""
+"Indtast venligst IP-adressen som vil blive brugt til at kontakte Ceilometer."
 
 #. Type: string
 #. Description
@@ -118,3 +119,54 @@ msgstr ""
 "repræsenterer et sted. Indtast venligst zonen, som du ønsker at bruge, når "
 "du registrerer slutpunktet."
 
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:2001 ../ceilometer-common.templates:3001
+#: ../ceilometer-common.templates:4001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the IP address of that server."
+msgstr ""
+"Indtast venligst IP-adressen som vil blive brugt til at kontakte Ceilometer."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr ""

diff --git a/trusty/debian/po/fr.po b/trusty/debian/po/fr.po
index 9929363d014b1b461273257a1c65d2d51b26dcdd..c43259fb9b68558fa828354d31566460a23407b8 100644 (file)
--- a/trusty/debian/po/fr.po
+++ b/trusty/debian/po/fr.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ceilometer\n"
 "Report-Msgid-Bugs-To: ceilometer@packages.debian.org\n"
-"POT-Creation-Date: 2013-07-11 01:06+0800\n"
+"POT-Creation-Date: 2013-09-25 16:34+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,9 +59,9 @@ msgid ""
 "Please enter the IP address of the Keystone server, so that ceilometer-api "
 "can contact Keystone to do the Ceilometer service and endpoint creation."
 msgstr ""
-"Veuillez indiquer l'adresse IP du serveur Keystone, pour que l'api "
-"de Ceilometer puisse contacter Keystone pour établir le service Ceilometer "
-"et créer un point d'accès."
+"Veuillez indiquer l'adresse IP du serveur Keystone, pour que l'api de "
+"Ceilometer puisse contacter Keystone pour établir le service Ceilometer et "
+"créer un point d'accès."
 
 #. Type: password
 #. Description
@@ -75,8 +76,8 @@ msgid ""
 "To configure its endpoint in Keystone, ceilometer-api needs the Keystone "
 "authentication token."
 msgstr ""
-"Pour configurer son point d'accès dans Keystone, l’api de Ceilometer a besoin du "
-"jeton d'authentification Keystone."
+"Pour configurer son point d'accès dans Keystone, l’api de Ceilometer a "
+"besoin du jeton d'authentification Keystone."
 
 #. Type: string
 #. Description
@@ -120,3 +121,55 @@ msgstr ""
 "OpenStack supporte l'utilisation de zones disponibles, avec chaque région "
 "représentant un lieu. Veuillez entrer une zone que vous souhaitez utiliser "
 "lors de l'enregistrement d'un point d'accès."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:2001 ../ceilometer-common.templates:3001
+#: ../ceilometer-common.templates:4001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the IP address of that server."
+msgstr ""
+"Veuillez indiquer l'adresse IP qui sera utilisée pour contacter Ceilometer."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr ""

diff --git a/trusty/debian/po/it.po b/trusty/debian/po/it.po
index 788cc4375f94fb1fc6969b5523b55a218e56c077..7d4f0a76b20cb64b107bb989096c3e7e10afbab2 100644 (file)
--- 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-07-11 01:06+0800\n"
+"POT-Creation-Date: 2013-09-25 16:34+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"
@@ -119,3 +119,54 @@ msgstr ""
 "OpenStack gestisce le zone di disponibilità, con ogni regione che "
 "rappresenta una posizione. Inserire la zona che si desidera usare durante la "
 "registrazione del punto terminale."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:2001 ../ceilometer-common.templates:3001
+#: ../ceilometer-common.templates:4001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the IP address of that server."
+msgstr "Inserire l'indirizzo IP che verrà usato per contattare Ceilometer."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr ""

diff --git a/trusty/debian/po/ja.po b/trusty/debian/po/ja.po
index e13ced0f8b6f743c0412ae168e81b596a596ed52..f9de8c4d80b16f3f76605733490e7c8a92e2c672 100644 (file)
--- 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-07-11 01:06+0800\n"
+"POT-Creation-Date: 2013-09-25 16:34+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"
@@ -31,9 +31,9 @@ msgid ""
 "accessible. This is done using \"keystone service-create\" and \"keystone "
 "endpoint-create\". This can be done automatically now."
 msgstr ""
-"OpenStack のサービスごと (API ごと) に、アクセスできるようにするため登録すべき"
-"ã\81§ã\81\99ã\80\82ã\80\8ckeystone service-createã\80\8dã\81¨ã\80\8ckeystone endpoint-createã\80\8dã\82\92使ã\81£ã\81¦ç\99»é\8c²ã\81\99"
-"ることができます。ここで自動的に行うことができます。"
+"OpenStack のサービスごと (API ごと) に、アクセスできるようにするため登録すべ"
+"ã\81\8dã\81§ã\81\99ã\80\82ã\80\8ckeystone service-createã\80\8dã\81¨ã\80\8ckeystone endpoint-createã\80\8dã\82\92使ã\81£ã\81¦ç\99»é\8c²"
+"ã\81\99ã\82\8bã\81\93ã\81¨ã\81\8cã\81§ã\81\8dã\81¾ã\81\99ã\80\82ã\81\93ã\81\93ã\81§è\87ªå\8b\95ç\9a\84ã\81«è¡\8cã\81\86ã\81\93ã\81¨ã\81\8cã\81§ã\81\8dã\81¾ã\81\99ã\80\82"
 
 #. Type: boolean
 #. Description
@@ -58,8 +58,8 @@ msgid ""
 "Please enter the IP address of the Keystone server, so that ceilometer-api "
 "can contact Keystone to do the Ceilometer service and endpoint creation."
 msgstr ""
-"Keystone サーバの IP アドレスを入力してください。それにより ceilometer-api は "
-"Keystone と通信し、Ceilometer サービスや端末の作成ができるようになります。"
+"Keystone サーバの IP アドレスを入力してください。それにより ceilometer-api "
+"は Keystone と通信し、Ceilometer サービスや端末の作成ができるようになります。"
 
 #. Type: password
 #. Description
@@ -74,8 +74,8 @@ msgid ""
 "To configure its endpoint in Keystone, ceilometer-api needs the Keystone "
 "authentication token."
 msgstr ""
-"Keystone で端末を設定するには、ceilometer-api は Keystone 認証文字列を必要とし"
-"ます。"
+"Keystone で端末を設定するには、ceilometer-api は Keystone 認証文字列を必要と"
+"ã\81\97ã\81¾ã\81\99ã\80\82"
 
 #. Type: string
 #. Description
@@ -97,9 +97,9 @@ msgid ""
 "service, so if you are installing a public cloud, this should be a public IP "
 "address."
 msgstr ""
-"この IP アドレスはこのサービスを利用するクライアントからアクセスできないといけ"
-"ã\81ªã\81\84ã\81®ã\81§ã\80\81ã\83\91ã\83\96ã\83ªã\83\83ã\82¯ã\82¯ã\83©ã\82¦ã\83\89ã\82\92ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\97ã\81¦ã\81\84ã\82\8bå ´å\90\88ã\80\81ã\81\93ã\82\8cã\81¯å\85¬é\96\8b IP ã\82¢ã\83\89ã\83¬ã\82¹"
-"を使うようにしてください。"
+"この IP アドレスはこのサービスを利用するクライアントからアクセスできないとい"
+"ã\81\91ã\81ªã\81\84ã\81®ã\81§ã\80\81ã\83\91ã\83\96ã\83ªã\83\83ã\82¯ã\82¯ã\83©ã\82¦ã\83\89ã\82\92ã\82¤ã\83³ã\82¹ã\83\88ã\83¼ã\83«ã\81\97ã\81¦ã\81\84ã\82\8bå ´å\90\88ã\80\81ã\81\93ã\82\8cã\81¯å\85¬é\96\8b IP ã\82¢ã\83\89"
+"ã\83¬ã\82¹ã\82\92使ã\81\86ã\82\88ã\81\86ã\81«ã\81\97ã\81¦ã\81\8fã\81 ã\81\95ã\81\84ã\80\82"
 
 #. Type: string
 #. Description
@@ -115,5 +115,56 @@ msgid ""
 "location. Please enter the zone that you wish to use when registering the "
 "endpoint."
 msgstr ""
-"OpenStack は位置を示す各領域による利用可能区分の利用をサポートしています。端末"
-"の登録時に利用したい区分を入力してください。"
+"OpenStack は位置を示す各領域による利用可能区分の利用をサポートしています。端"
+"末の登録時に利用したい区分を入力してください。"
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:2001 ../ceilometer-common.templates:3001
+#: ../ceilometer-common.templates:4001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the IP address of that server."
+msgstr "Ceilometer への通信に利用する IP アドレスを入力してください。"
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr ""

diff --git a/trusty/debian/po/pt.po b/trusty/debian/po/pt.po
index 8231cbc33c6fdfda5513bac2bec917b9ea9429c6..bd3e8c6f5c1b509e7909ca986267d0f613b639ec 100644 (file)
--- 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-07-11 01:06+0800\n"
+"POT-Creation-Date: 2013-09-25 16:34+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"
@@ -87,7 +87,9 @@ msgstr "Endereço IP do endpoint do Ceilometer:"
 #. Description
 #: ../ceilometer-api.templates:5001
 msgid "Please enter the IP address that will be used to contact Ceilometer."
-msgstr "Por favor introduza o endereço IP que será utilizado para contactar o Ceilometer."
+msgstr ""
+"Por favor introduza o endereço IP que será utilizado para contactar o "
+"Ceilometer."
 
 #. Type: string
 #. Description
@@ -97,9 +99,9 @@ msgid ""
 "service, so if you are installing a public cloud, this should be a public IP "
 "address."
 msgstr ""
-"Este endereço IP deverá ser acessível a partir dos clientes que irão utilizar "
-"este serviço, por isso se estiver a instalar uma cloud pública, este deve ser "
-"um endereço IP público."
+"Este endereço IP deverá ser acessível a partir dos clientes que irão "
+"utilizar este serviço, por isso se estiver a instalar uma cloud pública, "
+"este deve ser um endereço IP público."
 
 #. Type: string
 #. Description
@@ -115,7 +117,59 @@ msgid ""
 "location. Please enter the zone that you wish to use when registering the "
 "endpoint."
 msgstr ""
-"O OpenStack suporta a utilização de zonas de disponibilidade, com cada região "
-"a representar um local. Por favor introduza a zona que deseja utilizar ao "
-"registar o endpoint."
+"O OpenStack suporta a utilização de zonas de disponibilidade, com cada "
+"região a representar um local. Por favor introduza a zona que deseja "
+"utilizar ao registar o endpoint."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
 
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:2001 ../ceilometer-common.templates:3001
+#: ../ceilometer-common.templates:4001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the IP address of that server."
+msgstr ""
+"Por favor introduza o endereço IP que será utilizado para contactar o "
+"Ceilometer."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr ""

diff --git a/trusty/debian/po/ru.po b/trusty/debian/po/ru.po
index c4b7fcb66a931e07b31c06bb174e7d5995a75a2d..90f13b5b55703e6a51adbb83845bbbc27f722765 100644 (file)
--- 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-07-11 01:06+0800\n"
+"POT-Creation-Date: 2013-09-25 16:34+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"
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.4\n"
 
 #. Type: boolean
@@ -32,9 +32,9 @@ msgid ""
 "accessible. This is done using \"keystone service-create\" and \"keystone "
 "endpoint-create\". This can be done automatically now."
 msgstr ""
-"Для доступа к службам OpenStack (каждому API) их нужно регистрировать. "
-"ЭÑ\82о вÑ\8bполнÑ\8fеÑ\82Ñ\81Ñ\8f Ñ\81 помоÑ\89Ñ\8cÑ\8e командÑ\8b «keystone service-create» и «keystone "
-"endpoint-create». Это может быть сделано автоматически прямо сейчас."
+"Для доступа к службам OpenStack (каждому API) их нужно регистрировать. Это "
+"вÑ\8bполнÑ\8fеÑ\82Ñ\81Ñ\8f Ñ\81 помоÑ\89Ñ\8cÑ\8e командÑ\8b «keystone service-create» и «keystone endpoint-"
+"create». Это может быть сделано автоматически прямо сейчас."
 
 #. Type: boolean
 #. Description
@@ -43,8 +43,8 @@ msgid ""
 "Note that you will need to have an up and running Keystone server on which "
 "to connect using the Keystone authentication token."
 msgstr ""
-"Заметим, что у вас должен быть работающий сервер Keystone, к которому "
-"бÑ\83деÑ\82 пÑ\80оизведено подклÑ\8eÑ\87ение Ñ\81 помоÑ\89Ñ\8cÑ\8e Ñ\82окена аÑ\83Ñ\82енÑ\82иÑ\84икаÑ\86ии Keystone."
+"Заметим, что у вас должен быть работающий сервер Keystone, к которому будет "
+"произведено подключение с помощью токена аутентификации Keystone."
 
 #. Type: string
 #. Description
@@ -60,8 +60,8 @@ msgid ""
 "can contact Keystone to do the Ceilometer service and endpoint creation."
 msgstr ""
 "Введите IP-адрес сервера Keystone для того, чтобы ceilometer-api могла "
-"подключиться "
-"к Keystone для запуска службы Ceilometer и создания конечной точки."
+"подключиться к Keystone для запуска службы Ceilometer и создания конечной "
+"точки."
 
 #. Type: password
 #. Description
@@ -76,8 +76,8 @@ msgid ""
 "To configure its endpoint in Keystone, ceilometer-api needs the Keystone "
 "authentication token."
 msgstr ""
-"Для настройки собственной конечной точки в Keystone ceilometer-api "
-"требуется токен аутентификации Keystone."
+"Для настройки собственной конечной точки в Keystone ceilometer-api требуется "
+"токен аутентификации Keystone."
 
 #. Type: string
 #. Description
@@ -118,8 +118,58 @@ msgid ""
 "location. Please enter the zone that you wish to use when registering the "
 "endpoint."
 msgstr ""
-"OpenStack поддерживает разделение на зоны доступности, где каждая "
-"область представляет определённое расположение. Введите зону, которую вы "
-"хотите "
+"OpenStack поддерживает разделение на зоны доступности, где каждая область "
+"представляет определённое расположение. Введите зону, которую вы хотите "
 "использовать при регистрации конечной точки."
 
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:2001 ../ceilometer-common.templates:3001
+#: ../ceilometer-common.templates:4001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+#, fuzzy
+#| msgid "Please enter the IP address that will be used to contact Ceilometer."
+msgid "Please specify the IP address of that server."
+msgstr ""
+"Введите IP-адрес, который будет использован для подключения к Ceilometer."
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr ""

diff --git a/trusty/debian/po/templates.pot b/trusty/debian/po/templates.pot
index d0b169759ee5d694e42a4b1463c39ff27c78f9b2..8e3828e8930b5418c45112388e8f0ca28bfcfffb 100644 (file)
--- 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-07-11 01:06+0800\n"
+"POT-Creation-Date: 2013-09-25 16:34+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"
@@ -103,3 +103,52 @@ msgid ""
 "location. Please enter the zone that you wish to use when registering the "
 "endpoint."
 msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+msgid "IP address of your RabbitMQ host:"
+msgstr ""
+
+#. Type: string
+#. Description
+#. Type: string
+#. Description
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:2001 ../ceilometer-common.templates:3001
+#: ../ceilometer-common.templates:4001
+msgid ""
+"In order to interoperate with other components of OpenStack, this package "
+"needs to connect to a central RabbitMQ server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:2001
+msgid "Please specify the IP address of that server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Username for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../ceilometer-common.templates:3001
+msgid "Please specify the username used to connect to the RabbitMQ server."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Password for connection to the RabbitMQ server:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../ceilometer-common.templates:4001
+msgid "Please specify the password used to connect to the RabbitMQ server."
+msgstr ""

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 0ab18541ea815a1f8e73c9a40edef5cba0d27268..cdea67b7b8d99521bbfa120d253b2c4c74c6cf24 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -12,7 +12,7 @@ export OSLO_PACKAGE_VERSION=$(VERSION)
 override_dh_clean:
        dh_clean
        rm -rf ceilometer.egg-info
-       rm -f debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
+       rm -f debian/ceilometer-common.config debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
 
 override_dh_install:
        dh_install
@@ -23,6 +23,7 @@ override_dh_install:
 
 override_dh_auto_build:
        dh_auto_build
+       /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-common.config
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-common.postinst
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-api.config
        /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ceilometer-api.postinst