From: Thomas Goirand Date: Wed, 25 Sep 2013 07:03:25 +0000 (+0800) Subject: Now using a single heat-common configuration system, since there's also a single... X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=bd49fed87d3df2ce2fca230b07cb4a557a4873eb;p=openstack-build%2Fheat-build.git Now using a single heat-common configuration system, since there's also a single config file. Rewritten-From: 8ade1e48db6c237c6c05d8c87a3b8996ece2fe3e --- diff --git a/xenial/debian/heat-api-cfn.config.in b/xenial/debian/heat-api-cfn.config.in deleted file mode 100644 index 17ab3dee..00000000 --- a/xenial/debian/heat-api-cfn.config.in +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -. /usr/share/debconf/confmodule - -API_CONF=/etc/heat/heat-api-cfn.conf - -#PKGOS-INCLUDE# - -pkgos_var_user_group heat -pkgos_read_admin_creds ${API_CONF} keystone_authtoken heat - -exit 0 diff --git a/xenial/debian/heat-api-cfn.postinst.in b/xenial/debian/heat-api-cfn.postinst.in deleted file mode 100644 index 6fe5f5c1..00000000 --- a/xenial/debian/heat-api-cfn.postinst.in +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -ETC=/etc/heat - -#PKGOS-INCLUDE# - -if [ "$1" = "configure" ] ; then - . /usr/share/debconf/confmodule - pkgos_var_user_group heat - pkgos_write_new_conf heat heat-api-cfn.conf - pkgos_write_admin_creds /etc/heat/heat-api-cfn.conf keystone_authtoken heat - chown -R heat:adm /var/log/heat - chmod 0750 /var/log/heat -fi - -#DEBHELPER# - -exit 0 diff --git a/xenial/debian/heat-api-cfn.postrm b/xenial/debian/heat-api-cfn.postrm index af1cb591..69f9449c 100644 --- a/xenial/debian/heat-api-cfn.postrm +++ b/xenial/debian/heat-api-cfn.postrm @@ -3,8 +3,6 @@ set -e if [ "${1}" = "purge" ] ; then - rm -f /etc/heat/heat-api-cfn.conf - [ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat rm -rf /var/log/heat/api-cfn* [ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat fi diff --git a/xenial/debian/heat-api-cfn.templates b/xenial/debian/heat-api-cfn.templates deleted file mode 100644 index 3b5a3db8..00000000 --- a/xenial/debian/heat-api-cfn.templates +++ /dev/null @@ -1,33 +0,0 @@ -# These templates have been reviewed by the debian-l10n-english -# team -# -# If modifications/additions/rewording are needed, please ask -# debian-l10n-english@lists.debian.org for advice. -# -# Even minor modifications require translation updates and such -# changes should be coordinated with translators and reviewers. - -Template: heat/auth-host -Type: string -Default: 127.0.0.1 -_Description: Auth server hostname: - Please specify the hostname of your authentication server. Typically this is also - the hostname of your OpenStack Identity Service (Keystone). - -Template: heat/admin-tenant-name -Type: string -Default: admin -_Description: Authentication server tenant name: - Please specify the authentication server tenant name. - -Template: heat/admin-user -Type: string -Default: admin -_Description: Authentication server username: - Please specify the username to use with the authentication server. - -Template: heat/admin-password -Type: password -_Description: Authentication server password: - Please specify the password to use with the authentication server. - diff --git a/xenial/debian/heat-api-cloudwatch.config.in b/xenial/debian/heat-api-cloudwatch.config.in deleted file mode 100644 index 9d4e065a..00000000 --- a/xenial/debian/heat-api-cloudwatch.config.in +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -. /usr/share/debconf/confmodule - -API_CONF=/etc/heat/heat-api-cloudwatch.conf - -#PKGOS-INCLUDE# - -pkgos_var_user_group heat -pkgos_read_admin_creds ${API_CONF} keystone_authtoken heat - -exit 0 diff --git a/xenial/debian/heat-api-cloudwatch.postinst.in b/xenial/debian/heat-api-cloudwatch.postinst.in deleted file mode 100644 index 03f0d652..00000000 --- a/xenial/debian/heat-api-cloudwatch.postinst.in +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -ETC=/etc/heat - -#PKGOS-INCLUDE# - -if [ "$1" = "configure" ] ; then - . /usr/share/debconf/confmodule - pkgos_var_user_group heat - pkgos_write_new_conf heat heat-api-cloudwatch.conf - pkgos_write_admin_creds /etc/heat/heat-api-cloudwatch.conf keystone_authtoken heat - chown -R heat:adm /var/log/heat - chmod 0750 /var/log/heat -fi - -#DEBHELPER# - -exit 0 diff --git a/xenial/debian/heat-api-cloudwatch.postrm b/xenial/debian/heat-api-cloudwatch.postrm deleted file mode 100644 index e2bd0e09..00000000 --- a/xenial/debian/heat-api-cloudwatch.postrm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -if [ "${1}" = "purge" ] ; then - rm -f /etc/heat/heat-api-cloudwatch.conf - [ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat - rm -rf /var/log/heat/api-cloudwatch* - [ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat -fi - -#DEBHELPER# - -exit 0 diff --git a/xenial/debian/heat-api-cloudwatch.templates b/xenial/debian/heat-api-cloudwatch.templates deleted file mode 100644 index 6c994ac6..00000000 --- a/xenial/debian/heat-api-cloudwatch.templates +++ /dev/null @@ -1,63 +0,0 @@ -# These templates have been reviewed by the debian-l10n-english -# team -# -# If modifications/additions/rewording are needed, please ask -# debian-l10n-english@lists.debian.org for advice. -# -# Even minor modifications require translation updates and such -# changes should be coordinated with translators and reviewers. - -Template: heat/auth-host -Type: string -Default: 127.0.0.1 -_Description: Authentication server hostname: - Please specify the hostname of the authentication server. Typically - this is also the hostname of the OpenStack Identity Service (Keystone). - -Template: heat/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: heat/admin-user -Type: string -Default: admin -_Description: Authentication server username: - Please specify the username to use with the authentication server. - -Template: heat/admin-password -Type: password -_Description: Authentication server password: - Please specify the password to use with the authentication server. - -Template: heat/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: heat/admin-user -Type: string -Default: admin -_Description: Authentication server username: - Please specify the username to use with the authentication server. - -Template: heat/admin-password -Type: password -_Description: Authentication server password: - Please specify the password to use with the authentication server. diff --git a/xenial/debian/heat-api.config.in b/xenial/debian/heat-api.config.in deleted file mode 100644 index 4bb82b77..00000000 --- a/xenial/debian/heat-api.config.in +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -. /usr/share/debconf/confmodule - -API_CONF=/etc/heat/heat-api.conf - -#PKGOS-INCLUDE# - -pkgos_var_user_group heat -pkgos_read_admin_creds ${API_CONF} keystone_authtoken heat -pkgos_register_endpoint_config heat - -exit 0 diff --git a/xenial/debian/heat-api.postinst.in b/xenial/debian/heat-api.postinst.in deleted file mode 100644 index 7b9e8a98..00000000 --- a/xenial/debian/heat-api.postinst.in +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -set -e - -#PKGOS-INCLUDE# - -if [ "$1" = "configure" ] ; then - . /usr/share/debconf/confmodule - - pkgos_var_user_group heat - - pkgos_write_new_conf heat heat-api.conf - pkgos_write_admin_creds /etc/heat/heat-api.conf keystone_authtoken heat - - pkgos_register_endpoint_postinst heat heat orchestration "Heat Orchestration API" 8004 /v1/'%(tenant_id)s' - - chown -R heat:adm /var/log/heat - chmod 0750 /var/log/heat -fi - -#DEBHELPER# - -exit 0 diff --git a/xenial/debian/heat-engine.config.in b/xenial/debian/heat-common.config.in similarity index 60% rename from xenial/debian/heat-engine.config.in rename to xenial/debian/heat-common.config.in index 28ef32c8..97dda403 100644 --- a/xenial/debian/heat-engine.config.in +++ b/xenial/debian/heat-common.config.in @@ -4,11 +4,13 @@ set -e . /usr/share/debconf/confmodule -CONF=/etc/heat/heat-engine.conf +CONF=/etc/heat/heat.conf #PKGOS-INCLUDE# pkgos_var_user_group heat pkgos_dbc_read_conf -pkg heat-engine ${CONF} DEFAULT sql_connection heat $@ +pkgos_read_admin_creds ${CONF} keystone_authtoken heat +pkgos_register_endpoint_config heat exit 0 diff --git a/xenial/debian/heat-common.postinst.in b/xenial/debian/heat-common.postinst.in index 59673b3e..c3a73f26 100644 --- a/xenial/debian/heat-common.postinst.in +++ b/xenial/debian/heat-common.postinst.in @@ -3,16 +3,27 @@ set -e ETC=/etc/heat +CONF=/etc/heat/heat.conf #PKGOS-INCLUDE# if [ "$1" = "configure" ] ; then pkgos_var_user_group heat - chown -R heat:adm /var/log/heat + chown heat:adm /var/log/heat chmod 0750 /var/log/heat mkdir -p /etc/heat mkdir -p /var/lib/heat - chown heat:heat -R /var/lib/heat /etc/heat + chown heat:heat /var/lib/heat /etc/heat + pkgos_write_new_conf heat heat.conf + + pkgos_dbc_postinst ${CONF} DEFAULT sql_connection heat $@ + pkgos_write_admin_creds ${CONF} keystone_authtoken heat + pkgos_register_endpoint_postinst heat heat orchestration "Heat Orchestration API" 8004 /v1/'%(tenant_id)s' + # This is the equivalent of db-sync: + su heat -c "python -m heat.db.sync" + + chown -R heat:adm /var/log/heat + chmod 0750 /var/log/heat fi #DEBHELPER# diff --git a/xenial/debian/heat-common.postrm b/xenial/debian/heat-common.postrm index f90e6ae1..04c3ef3c 100644 --- a/xenial/debian/heat-common.postrm +++ b/xenial/debian/heat-common.postrm @@ -3,11 +3,12 @@ set -e if [ "${1}" = "purge" ] ; then - [ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat - rm -rf /var/log/heat/engine* - [ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat [ -d /var/lib/heat/cache ] && rmdir --ignore-fail-on-non-empty /var/lib/heat/cache [ -d /var/lib/heat ] && rmdir --ignore-fail-on-non-empty /var/lib/heat + + rm -f /etc/heat/heat.conf + [ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat + rm -rf /var/log/heat fi #DEBHELPER# diff --git a/xenial/debian/heat-engine.prerm b/xenial/debian/heat-common.prerm similarity index 90% rename from xenial/debian/heat-engine.prerm rename to xenial/debian/heat-common.prerm index 971cb921..aa8dea4d 100644 --- a/xenial/debian/heat-engine.prerm +++ b/xenial/debian/heat-common.prerm @@ -8,7 +8,7 @@ db_get heat/configure_db if [ "$RET" = "true" ]; then if [ -r /usr/share/dbconfig-common/dpkg/prerm ] ; then . /usr/share/dbconfig-common/dpkg/prerm - dbc_go heat-engine $@ + dbc_go heat-common $@ fi fi diff --git a/xenial/debian/heat-api.templates b/xenial/debian/heat-common.templates similarity index 81% rename from xenial/debian/heat-api.templates rename to xenial/debian/heat-common.templates index 40344f69..c2976248 100644 --- a/xenial/debian/heat-api.templates +++ b/xenial/debian/heat-common.templates @@ -77,3 +77,21 @@ _Description: Name of the region to register: OpenStack supports using availability zones, with each region representing a location. Please enter the zone that you wish to use when registering the endpoint. + +Template: heat/configure_db +Type: boolean +Default: true +_Description: Set up a database for heat-engine? + No database has been set up for heat-engine to use. Before + continuing, you should make sure you have the following information: + . + * the type of database that you want to use; + * the database server host name (that server must allow TCP connections from this + machine); + * a username and password to access the database. + . + If some of these requirements are missing, do not choose this option and run with + regular SQLite support. + . + You can change this setting later on by running "dpkg-reconfigure -plow + heat-engine". diff --git a/xenial/debian/heat-engine.postinst.in b/xenial/debian/heat-engine.postinst.in deleted file mode 100644 index bf1f0853..00000000 --- a/xenial/debian/heat-engine.postinst.in +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -set -e - -CONF=/etc/heat/heat-engine.conf - -#PKGOS-INCLUDE# - -if [ "$1" = "configure" ] ; then - . /usr/share/debconf/confmodule - . /usr/share/dbconfig-common/dpkg/postinst - - pkgos_var_user_group heat - pkgos_write_new_conf heat heat-engine.conf - pkgos_dbc_postinst ${CONF} DEFAULT sql_connection heat $@ - - # This is the equivalent of db-sync: - su heat -c "python -m heat.db.sync" -fi - -#DEBHELPER# - -exit 0 diff --git a/xenial/debian/heat-engine.postrm b/xenial/debian/heat-engine.postrm deleted file mode 100644 index a4fe1e41..00000000 --- a/xenial/debian/heat-engine.postrm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -if [ "${1}" = "purge" ] ; then - rm -f /etc/heat/heat-engine.conf - [ -d /etc/heat ] && rmdir --ignore-fail-on-non-empty /etc/heat - rm -rf /var/log/heat/engine* - [ -d /var/log/heat ] && rmdir --ignore-fail-on-non-empty /var/log/heat -fi - -#DEBHELPER# - -exit 0 diff --git a/xenial/debian/heat-engine.templates b/xenial/debian/heat-engine.templates deleted file mode 100644 index cacf35cc..00000000 --- a/xenial/debian/heat-engine.templates +++ /dev/null @@ -1,26 +0,0 @@ -# These templates have been reviewed by the debian-l10n-english -# team -# -# If modifications/additions/rewording are needed, please ask -# debian-l10n-english@lists.debian.org for advice. -# -# Even minor modifications require translation updates and such -# changes should be coordinated with translators and reviewers. - -Template: heat/configure_db -Type: boolean -Default: true -_Description: Set up a database for heat-engine? - No database has been set up for heat-engine to use. Before - continuing, you should make sure you have the following information: - . - * the type of database that you want to use; - * the database server host name (that server must allow TCP connections from this - machine); - * a username and password to access the database. - . - If some of these requirements are missing, do not choose this option and run with - regular SQLite support. - . - You can change this setting later on by running "dpkg-reconfigure -plow - heat-engine". diff --git a/xenial/debian/keystone_authtoken b/xenial/debian/keystone_authtoken new file mode 100644 index 00000000..21c3a29a --- /dev/null +++ b/xenial/debian/keystone_authtoken @@ -0,0 +1,7 @@ +[keystone_authtoken] +auth_host = 127.0.0.1 +auth_port = 35357 +auth_protocol = http +admin_tenant_name = %SERVICE_TENANT_NAME% +admin_user = %SERVICE_USER% +admin_password = %SERVICE_PASSWORD% diff --git a/xenial/debian/po/POTFILES.in b/xenial/debian/po/POTFILES.in index 1e44bd92..dbbae60c 100644 --- a/xenial/debian/po/POTFILES.in +++ b/xenial/debian/po/POTFILES.in @@ -1,4 +1 @@ -[type: gettext/rfc822deb] heat-engine.templates -[type: gettext/rfc822deb] heat-api-cfn.templates -[type: gettext/rfc822deb] heat-api-cloudwatch.templates -[type: gettext/rfc822deb] heat-api.templates +[type: gettext/rfc822deb] heat-common.templates diff --git a/xenial/debian/po/cs.po b/xenial/debian/po/cs.po index 0566d716..b392e3a5 100644 --- a/xenial/debian/po/cs.po +++ b/xenial/debian/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: heat 2013.1.2-4\n" "Report-Msgid-Bugs-To: heat@packages.debian.org\n" -"POT-Creation-Date: 2013-07-10 22:55+0800\n" +"POT-Creation-Date: 2013-09-25 14:57+0800\n" "PO-Revision-Date: 2013-08-28 13:31+0200\n" "Last-Translator: Michal Simunek \n" "Language-Team: Czech \n" @@ -16,85 +16,22 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "Set up a database for heat-engine?" -msgstr "Nastavit databázi pro heat-engine?" - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -"No database has been set up for heat-engine to use. Before continuing, you " -"should make sure you have the following information:" -msgstr "" -"Nebyla nastavena žádná databáze k použití s heat-engine. Chcete-li ji nyní " -"nastavit, ujistěte se prosím, že máte všechny potřebné údaje:" - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -" * the type of database that you want to use;\n" -" * the database server host name (that server must allow TCP connections " -"from this\n" -" machine);\n" -" * a username and password to access the database." -msgstr "" -" * typ databáze, kterou chcete používat;\n" -" * název hostitele databázového serveru (který musí přijímat TCP\n" -" spojení z tohoto počítače);\n" -" * uživatelské jméno a heslo pro přístup k databázi." - - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -"If some of these requirements are missing, do not choose this option and run " -"with regular SQLite support." -msgstr "" -"Pokud některou z těchto povinných voleb neznáte, tuto volbu přeskočte a Heat " -"spouštějte s běžnou podporou sqlite." - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -"You can change this setting later on by running \"dpkg-reconfigure -plow " -"heat-engine\"." -msgstr "" -"Toto nastavení můžete později změnit spuštěním \"dpkg-reconfigure -plow " -"heat-engine\"." - #. Type: string #. Description -#: ../heat-api-cfn.templates:2001 -msgid "Auth server hostname:" +#: ../heat-common.templates:2001 +msgid "Authentication server hostname:" msgstr "Název hostitele autentizačního serveru:" #. Type: string #. Description -#: ../heat-api-cfn.templates:2001 +#: ../heat-common.templates:2001 msgid "" -"Please specify the hostname of your authentication server. Typically this is " -"also the hostname of your OpenStack Identity Service (Keystone)." +"Please specify the hostname of the authentication server. Typically this is " +"also the hostname of the OpenStack Identity Service (Keystone)." msgstr "" "Zadejte prosím Název hostitele autentizačního serveru. Většinou je to také " "název hostitele OpenStack Identity Service (Keystone)." -#. Type: string -#. Description -#. 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") #. Type: string #. Description #. Translators: a "tenant" in OpenStack world is @@ -104,22 +41,10 @@ msgstr "" #. You're advised to either keep "tenant" without translating it #. or keep it parenthezised. Example for French: #. locataire ("tenant") -#: ../heat-api-cfn.templates:3001 ../heat-api-cloudwatch.templates:3001 -#: ../heat-api-cloudwatch.templates:6001 ../heat-api.templates:3001 +#: ../heat-common.templates:3001 msgid "Authentication server tenant name:" msgstr "Název nájemce pro autentizační server:" -#. Type: string -#. Description -#. 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") #. Type: string #. Description #. Translators: a "tenant" in OpenStack world is @@ -129,80 +54,45 @@ msgstr "Název nájemce pro autentizační server:" #. You're advised to either keep "tenant" without translating it #. or keep it parenthezised. Example for French: #. locataire ("tenant") -#: ../heat-api-cfn.templates:3001 ../heat-api-cloudwatch.templates:3001 -#: ../heat-api-cloudwatch.templates:6001 ../heat-api.templates:3001 +#: ../heat-common.templates:3001 msgid "Please specify the authentication server tenant name." msgstr "Zadejte prosím název nájemce pro autentizační server." #. Type: string #. Description -#. Type: string -#. Description -#. Type: string -#. Description -#: ../heat-api-cfn.templates:4001 ../heat-api-cloudwatch.templates:4001 -#: ../heat-api-cloudwatch.templates:7001 ../heat-api.templates:4001 +#: ../heat-common.templates:4001 msgid "Authentication server username:" msgstr "Uživatel autentizačního serveru:" #. Type: string #. Description -#. Type: string -#. Description -#. Type: string -#. Description -#: ../heat-api-cfn.templates:4001 ../heat-api-cloudwatch.templates:4001 -#: ../heat-api-cloudwatch.templates:7001 ../heat-api.templates:4001 +#: ../heat-common.templates:4001 msgid "Please specify the username to use with the authentication server." -msgstr "Zadejte prosím uživatelské jméno, které se má použít na autentizačním serveru." +msgstr "" +"Zadejte prosím uživatelské jméno, které se má použít na autentizačním " +"serveru." #. Type: password #. Description -#. Type: password -#. Description -#. Type: password -#. Description -#: ../heat-api-cfn.templates:5001 ../heat-api-cloudwatch.templates:5001 -#: ../heat-api-cloudwatch.templates:8001 ../heat-api.templates:5001 +#: ../heat-common.templates:5001 msgid "Authentication server password:" msgstr "Heslo autentizačního serveru:" #. Type: password #. Description -#. Type: password -#. Description -#. Type: password -#. Description -#: ../heat-api-cfn.templates:5001 ../heat-api-cloudwatch.templates:5001 -#: ../heat-api-cloudwatch.templates:8001 ../heat-api.templates:5001 +#: ../heat-common.templates:5001 msgid "Please specify the password to use with the authentication server." msgstr "Zadejte prosím heslo, které se má použít na autentizačním serveru" -#. Type: string -#. Description -#: ../heat-api-cloudwatch.templates:2001 ../heat-api.templates:2001 -msgid "Authentication server hostname:" -msgstr "Název hostitele autentizačního serveru:" - -#. Type: string -#. Description -#: ../heat-api-cloudwatch.templates:2001 ../heat-api.templates:2001 -msgid "" -"Please specify the hostname of the authentication server. Typically this is " -"also the hostname of the OpenStack Identity Service (Keystone)." -msgstr "" -"Zadejte prosím Název hostitele autentizačního serveru. Většinou je to také " -"název hostitele OpenStack Identity Service (Keystone)." - #. Type: boolean #. Description -#: ../heat-api.templates:6001 +#: ../heat-common.templates:6001 msgid "Register Heat in the Keystone endpoint catalog?" msgstr "Zaregistrovat Heat v katalogu koncových bodů Keystone?" #. Type: boolean #. Description -#: ../heat-api.templates:6001 +#: ../heat-common.templates:6001 msgid "" "Each OpenStack service (each API) should be registered in order to be " "accessible. This is done using \"keystone service-create\" and \"keystone " @@ -210,11 +100,12 @@ 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 -#: ../heat-api.templates:6001 +#: ../heat-common.templates:6001 msgid "" "Note that you will need to have an up and running Keystone server on which " "to connect using the Keystone authentication token." @@ -224,13 +115,13 @@ msgstr "" #. Type: string #. Description -#: ../heat-api.templates:7001 +#: ../heat-common.templates:7001 msgid "Keystone server IP address:" msgstr "IP adresa serveru keystone:" #. Type: string #. Description -#: ../heat-api.templates:7001 +#: ../heat-common.templates:7001 msgid "" "Please enter the IP address of the Keystone server, so that heat-api can " "contact Keystone to do the Heat service and endpoint creation." @@ -240,13 +131,13 @@ msgstr "" #. Type: password #. Description -#: ../heat-api.templates:8001 +#: ../heat-common.templates:8001 msgid "Keystone authentication token:" msgstr "Autentizační klíč pro Keystone:" #. Type: password #. Description -#: ../heat-api.templates:8001 +#: ../heat-common.templates:8001 msgid "" "To configure its endpoint in Keystone, heat-api needs the Keystone " "authentication token." @@ -256,37 +147,37 @@ msgstr "" #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-common.templates:9001 msgid "Heat endpoint IP address:" msgstr "IP adresa koncového bodu Heat:" #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-common.templates:9001 msgid "Please enter the IP address that will be used to contact Heat." msgstr "Zadejte IP adresu, která se bude používat ke spojení s Heat." #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-common.templates:9001 msgid "" "This IP address should be accessible from the clients that will use this " "service, so if you are installing a public cloud, this should be a public IP " "address." msgstr "" "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 -#: ../heat-api.templates:10001 +#: ../heat-common.templates:10001 msgid "Name of the region to register:" msgstr "Název registrované oblasti:" #. Type: string #. Description -#: ../heat-api.templates:10001 +#: ../heat-common.templates:10001 msgid "" "OpenStack supports using availability zones, with each region representing a " "location. Please enter the zone that you wish to use when registering the " @@ -295,3 +186,64 @@ 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: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "Set up a database for heat-engine?" +msgstr "Nastavit databázi pro heat-engine?" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +"No database has been set up for heat-engine to use. Before continuing, you " +"should make sure you have the following information:" +msgstr "" +"Nebyla nastavena žádná databáze k použití s heat-engine. Chcete-li ji nyní " +"nastavit, ujistěte se prosím, že máte všechny potřebné údaje:" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +" * the type of database that you want to use;\n" +" * the database server host name (that server must allow TCP connections " +"from this\n" +" machine);\n" +" * a username and password to access the database." +msgstr "" +" * typ databáze, kterou chcete používat;\n" +" * název hostitele databázového serveru (který musí přijímat TCP\n" +" spojení z tohoto počítače);\n" +" * uživatelské jméno a heslo pro přístup k databázi." + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +"If some of these requirements are missing, do not choose this option and run " +"with regular SQLite support." +msgstr "" +"Pokud některou z těchto povinných voleb neznáte, tuto volbu přeskočte a Heat " +"spouštějte s běžnou podporou sqlite." + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +"You can change this setting later on by running \"dpkg-reconfigure -plow " +"heat-engine\"." +msgstr "" +"Toto nastavení můžete později změnit spuštěním \"dpkg-reconfigure -plow heat-" +"engine\"." + +#~ msgid "Auth server hostname:" +#~ msgstr "Název hostitele autentizačního serveru:" + +#~ msgid "" +#~ "Please specify the hostname of your authentication server. Typically this " +#~ "is also the hostname of your OpenStack Identity Service (Keystone)." +#~ msgstr "" +#~ "Zadejte prosím Název hostitele autentizačního serveru. Většinou je to " +#~ "také název hostitele OpenStack Identity Service (Keystone)." diff --git a/xenial/debian/po/da.po b/xenial/debian/po/da.po index 276235a8..755cbea0 100644 --- a/xenial/debian/po/da.po +++ b/xenial/debian/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: heat\n" "Report-Msgid-Bugs-To: heat@packages.debian.org\n" -"POT-Creation-Date: 2013-07-10 22:55+0800\n" +"POT-Creation-Date: 2013-09-25 14:57+0800\n" "PO-Revision-Date: 2013-08-17 23:51+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -16,84 +16,22 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "Set up a database for heat-engine?" -msgstr "Opsæt en database for heat-engine?" - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -"No database has been set up for heat-engine to use. Before continuing, you " -"should make sure you have the following information:" -msgstr "" -"Ingen database er blevet opsat for heat-engine. Før du fortsætter, skal du " -"sikre dig, at du har den følgende information:" - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -" * the type of database that you want to use;\n" -" * the database server host name (that server must allow TCP connections " -"from this\n" -" machine);\n" -" * a username and password to access the database." -msgstr "" -" * databasetypen du ønsker at bruge\n" -" * værtsnavnet for databaseserveren (den server som skal tillade TCP-\n" -" forbindelser fra denne maskine)\n" -" * et brugernavn og adgangskode for at tilgå databasen" - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -"If some of these requirements are missing, do not choose this option and run " -"with regular SQLite support." -msgstr "" -"Hvis nogle af disse krav mangler, så skal du ikke vælge denne indstilling, " -"men køre med normal SQLite-understøttelse." - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -"You can change this setting later on by running \"dpkg-reconfigure -plow " -"heat-engine\"." -msgstr "" -"Du kan ændre indstillingen senere ved at køre »dpkg-reconfigure -plow " -"heat-engine«." - #. Type: string #. Description -#: ../heat-api-cfn.templates:2001 -msgid "Auth server hostname:" -msgstr "Værtsnavn for authserver:" +#: ../heat-common.templates:2001 +msgid "Authentication server hostname:" +msgstr "Værtsnavn for godkendelsesserveren:" #. Type: string #. Description -#: ../heat-api-cfn.templates:2001 +#: ../heat-common.templates:2001 msgid "" -"Please specify the hostname of your authentication server. Typically this is " -"also the hostname of your OpenStack Identity Service (Keystone)." +"Please specify the hostname of the authentication server. Typically this is " +"also the hostname of the OpenStack Identity Service (Keystone)." msgstr "" -"Angiv venligst værtsnavnet for din godkendelsesserver. Typisk er dette også " -"værtsnavnet for din OpenStack Identity Service (Keystone)." +"Angiv venligst værtsnavnet for godkendelseserveren. Typisk er dette også " +"værtsnavnet for OpenStack Identity Service (Keystone)." -#. Type: string -#. Description -#. 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") #. Type: string #. Description #. Translators: a "tenant" in OpenStack world is @@ -103,22 +41,10 @@ msgstr "" #. You're advised to either keep "tenant" without translating it #. or keep it parenthezised. Example for French: #. locataire ("tenant") -#: ../heat-api-cfn.templates:3001 ../heat-api-cloudwatch.templates:3001 -#: ../heat-api-cloudwatch.templates:6001 ../heat-api.templates:3001 +#: ../heat-common.templates:3001 msgid "Authentication server tenant name:" msgstr "Lejernavn (tenant) for godkendelsesserver:" -#. Type: string -#. Description -#. 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") #. Type: string #. Description #. Translators: a "tenant" in OpenStack world is @@ -128,92 +54,55 @@ msgstr "Lejernavn (tenant) for godkendelsesserver:" #. You're advised to either keep "tenant" without translating it #. or keep it parenthezised. Example for French: #. locataire ("tenant") -#: ../heat-api-cfn.templates:3001 ../heat-api-cloudwatch.templates:3001 -#: ../heat-api-cloudwatch.templates:6001 ../heat-api.templates:3001 +#: ../heat-common.templates:3001 msgid "Please specify the authentication server tenant name." msgstr "Angiv venligst lejernavn (tenant) for godkendelsesserveren." #. Type: string #. Description -#. Type: string -#. Description -#. Type: string -#. Description -#: ../heat-api-cfn.templates:4001 ../heat-api-cloudwatch.templates:4001 -#: ../heat-api-cloudwatch.templates:7001 ../heat-api.templates:4001 +#: ../heat-common.templates:4001 msgid "Authentication server username:" msgstr "Brugernavn for godkendelsesserveren:" #. Type: string #. Description -#. Type: string -#. Description -#. Type: string -#. Description -#: ../heat-api-cfn.templates:4001 ../heat-api-cloudwatch.templates:4001 -#: ../heat-api-cloudwatch.templates:7001 ../heat-api.templates:4001 +#: ../heat-common.templates:4001 msgid "Please specify the username to use with the authentication server." msgstr "Angiv venligst brugernavnet for brug med godkendelsesserveren." #. Type: password #. Description -#. Type: password -#. Description -#. Type: password -#. Description -#: ../heat-api-cfn.templates:5001 ../heat-api-cloudwatch.templates:5001 -#: ../heat-api-cloudwatch.templates:8001 ../heat-api.templates:5001 +#: ../heat-common.templates:5001 msgid "Authentication server password:" msgstr "Adgangskode for godkendelsesserver:" #. Type: password #. Description -#. Type: password -#. Description -#. Type: password -#. Description -#: ../heat-api-cfn.templates:5001 ../heat-api-cloudwatch.templates:5001 -#: ../heat-api-cloudwatch.templates:8001 ../heat-api.templates:5001 +#: ../heat-common.templates:5001 msgid "Please specify the password to use with the authentication server." msgstr "Angiv venligst adgangskoden for brug med godkendelsesserveren." -#. Type: string -#. Description -#: ../heat-api-cloudwatch.templates:2001 ../heat-api.templates:2001 -msgid "Authentication server hostname:" -msgstr "Værtsnavn for godkendelsesserveren:" - -#. Type: string -#. Description -#: ../heat-api-cloudwatch.templates:2001 ../heat-api.templates:2001 -msgid "" -"Please specify the hostname of the authentication server. Typically this is " -"also the hostname of the OpenStack Identity Service (Keystone)." -msgstr "" -"Angiv venligst værtsnavnet for godkendelseserveren. Typisk er dette også " -"værtsnavnet for OpenStack Identity Service (Keystone)." - #. Type: boolean #. Description -#: ../heat-api.templates:6001 +#: ../heat-common.templates:6001 msgid "Register Heat in the Keystone endpoint catalog?" msgstr "Registrer Heat i Keystones slutpunktskatalog?" #. Type: boolean #. Description -#: ../heat-api.templates:6001 +#: ../heat-common.templates:6001 msgid "" "Each OpenStack service (each API) should be registered in order to be " "accessible. This is done using \"keystone service-create\" and \"keystone " "endpoint-create\". This can be done automatically now." msgstr "" -"Hver OpenStack-tjeneste (hver API) skal registreres for at være " -"tilgængelig. Dette gøres med »keystone service-create« og »keystone " -"endpoint-create«. Dette kan nu gø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«. " +"Dette kan nu gøres automatisk." #. Type: boolean #. Description -#: ../heat-api.templates:6001 +#: ../heat-common.templates:6001 msgid "" "Note that you will need to have an up and running Keystone server on which " "to connect using the Keystone authentication token." @@ -223,13 +112,13 @@ msgstr "" #. Type: string #. Description -#: ../heat-api.templates:7001 +#: ../heat-common.templates:7001 msgid "Keystone server IP address:" msgstr "IP-adresse for Keystoneserver:" #. Type: string #. Description -#: ../heat-api.templates:7001 +#: ../heat-common.templates:7001 msgid "" "Please enter the IP address of the Keystone server, so that heat-api can " "contact Keystone to do the Heat service and endpoint creation." @@ -239,35 +128,35 @@ msgstr "" #. Type: password #. Description -#: ../heat-api.templates:8001 +#: ../heat-common.templates:8001 msgid "Keystone authentication token:" msgstr "Godkendelsessymbol for Keystone:" #. Type: password #. Description -#: ../heat-api.templates:8001 +#: ../heat-common.templates:8001 msgid "" "To configure its endpoint in Keystone, heat-api needs the Keystone " "authentication token." msgstr "" -"For at konfigurere dets slutpunkt i Keystone, kræver heat-api " -"Keystones godkendelsessymbol." +"For at konfigurere dets slutpunkt i Keystone, kræver heat-api Keystones " +"godkendelsessymbol." #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-common.templates:9001 msgid "Heat endpoint IP address:" msgstr "IP-adresse for Heats slutpunkt:" #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-common.templates:9001 msgid "Please enter the IP address that will be used to contact Heat." msgstr "Indtast venligst IP-adressen som vil blive brugt til at kontakte Heat." #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-common.templates:9001 msgid "" "This IP address should be accessible from the clients that will use this " "service, so if you are installing a public cloud, this should be a public IP " @@ -279,13 +168,13 @@ msgstr "" #. Type: string #. Description -#: ../heat-api.templates:10001 +#: ../heat-common.templates:10001 msgid "Name of the region to register:" msgstr "Navn på regionen der skal registreres:" #. Type: string #. Description -#: ../heat-api.templates:10001 +#: ../heat-common.templates:10001 msgid "" "OpenStack supports using availability zones, with each region representing a " "location. Please enter the zone that you wish to use when registering the " @@ -295,3 +184,63 @@ msgstr "" "repræsenterer et sted. Indtast venligst zonen du ønsker at bruge, når " "slutpunktet registreres." +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "Set up a database for heat-engine?" +msgstr "Opsæt en database for heat-engine?" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +"No database has been set up for heat-engine to use. Before continuing, you " +"should make sure you have the following information:" +msgstr "" +"Ingen database er blevet opsat for heat-engine. Før du fortsætter, skal du " +"sikre dig, at du har den følgende information:" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +" * the type of database that you want to use;\n" +" * the database server host name (that server must allow TCP connections " +"from this\n" +" machine);\n" +" * a username and password to access the database." +msgstr "" +" * databasetypen du ønsker at bruge\n" +" * værtsnavnet for databaseserveren (den server som skal tillade TCP-\n" +" forbindelser fra denne maskine)\n" +" * et brugernavn og adgangskode for at tilgå databasen" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +"If some of these requirements are missing, do not choose this option and run " +"with regular SQLite support." +msgstr "" +"Hvis nogle af disse krav mangler, så skal du ikke vælge denne indstilling, " +"men køre med normal SQLite-understøttelse." + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +"You can change this setting later on by running \"dpkg-reconfigure -plow " +"heat-engine\"." +msgstr "" +"Du kan ændre indstillingen senere ved at køre »dpkg-reconfigure -plow heat-" +"engine«." + +#~ msgid "Auth server hostname:" +#~ msgstr "Værtsnavn for authserver:" + +#~ msgid "" +#~ "Please specify the hostname of your authentication server. Typically this " +#~ "is also the hostname of your OpenStack Identity Service (Keystone)." +#~ msgstr "" +#~ "Angiv venligst værtsnavnet for din godkendelsesserver. Typisk er dette " +#~ "også værtsnavnet for din OpenStack Identity Service (Keystone)." diff --git a/xenial/debian/po/ja.po b/xenial/debian/po/ja.po index 7e9ce8b2..95d7b36f 100644 --- a/xenial/debian/po/ja.po +++ b/xenial/debian/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: heat\n" "Report-Msgid-Bugs-To: heat@packages.debian.org\n" -"POT-Creation-Date: 2013-07-10 22:55+0800\n" +"POT-Creation-Date: 2013-09-25 14:57+0800\n" "PO-Revision-Date: 2013-07-10 23:55+0900\n" "Last-Translator: victory \n" "Language-Team: Japanese \n" @@ -16,69 +16,18 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "Set up a database for heat-engine?" -msgstr "heat-engine 用のデータベースを準備しますか?" - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -"No database has been set up for heat-engine to use. Before continuing, you " -"should make sure you have the following information:" -msgstr "" -"heat-engine で利用するデータベースが用意されていません。続行する前に以下の情報" -"が揃っているか確認してください:" - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -" * the type of database that you want to use;\n" -" * the database server host name (that server must allow TCP connections " -"from this\n" -" machine);\n" -" * a username and password to access the database." -msgstr "" -" * 使いたいデータベースの種類\n" -" * データベースサーバのホスト名 (このサーバはこの\n" -" マシンからの TCP 接続を許可しなければなりません)\n" -" * データベースにアクセスするためのユーザ名とパスワード。" - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -"If some of these requirements are missing, do not choose this option and run " -"with regular SQLite support." -msgstr "" -"必要なものが欠けている場合はこのオプションを選択せず、普通の SQLite サポートで" -"進めてください。" - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -"You can change this setting later on by running \"dpkg-reconfigure -plow " -"heat-engine\"." -msgstr "" -"この設定は後で「dpkg-reconfigure -plow heat-engine」を実行することにより変更で" -"きます。" - #. Type: string #. Description -#: ../heat-api-cfn.templates:2001 -msgid "Auth server hostname:" +#: ../heat-common.templates:2001 +msgid "Authentication server hostname:" msgstr "認証サーバのホスト名:" #. Type: string #. Description -#: ../heat-api-cfn.templates:2001 +#: ../heat-common.templates:2001 msgid "" -"Please specify the hostname of your authentication server. Typically this is " -"also the hostname of your OpenStack Identity Service (Keystone)." +"Please specify the hostname of the authentication server. Typically this is " +"also the hostname of the OpenStack Identity Service (Keystone)." msgstr "" "認証サーバのホスト名を指定してください。これは標準的に OpenStack Identity " "Service (Keystone) のホスト名にもなっています。" @@ -92,8 +41,7 @@ msgstr "" #. You're advised to either keep "tenant" without translating it #. or keep it parenthezised. Example for French: #. locataire ("tenant") -#: ../heat-api-cfn.templates:3001 ../heat-api-cloudwatch.templates:3001 -#: ../heat-api-cloudwatch.templates:6001 ../heat-api.templates:3001 +#: ../heat-common.templates:3001 msgid "Authentication server tenant name:" msgstr "認証サーバの管理用アカウント (tenant) 名" @@ -106,76 +54,55 @@ msgstr "認証サーバの管理用アカウント (tenant) 名" #. You're advised to either keep "tenant" without translating it #. or keep it parenthezised. Example for French: #. locataire ("tenant") -#: ../heat-api-cfn.templates:3001 ../heat-api-cloudwatch.templates:3001 -#: ../heat-api-cloudwatch.templates:6001 ../heat-api.templates:3001 +#: ../heat-common.templates:3001 msgid "Please specify the authentication server tenant name." msgstr "認証サーバの管理用アカウント (tenant) 名を指定してください。" #. Type: string #. Description -#: ../heat-api-cfn.templates:4001 ../heat-api-cloudwatch.templates:4001 -#: ../heat-api-cloudwatch.templates:7001 ../heat-api.templates:4001 +#: ../heat-common.templates:4001 msgid "Authentication server username:" msgstr "認証サーバのユーザ名:" #. Type: string #. Description -#: ../heat-api-cfn.templates:4001 ../heat-api-cloudwatch.templates:4001 -#: ../heat-api-cloudwatch.templates:7001 ../heat-api.templates:4001 +#: ../heat-common.templates:4001 msgid "Please specify the username to use with the authentication server." msgstr "認証サーバで利用するユーザ名を指定してください。" #. Type: password #. Description -#: ../heat-api-cfn.templates:5001 ../heat-api-cloudwatch.templates:5001 -#: ../heat-api-cloudwatch.templates:8001 ../heat-api.templates:5001 +#: ../heat-common.templates:5001 msgid "Authentication server password:" msgstr "認証サーバのパスワード:" #. Type: password #. Description -#: ../heat-api-cfn.templates:5001 ../heat-api-cloudwatch.templates:5001 -#: ../heat-api-cloudwatch.templates:8001 ../heat-api.templates:5001 +#: ../heat-common.templates:5001 msgid "Please specify the password to use with the authentication server." msgstr "認証サーバで利用するパスワードを指定してください。" -#. Type: string -#. Description -#: ../heat-api-cloudwatch.templates:2001 ../heat-api.templates:2001 -msgid "Authentication server hostname:" -msgstr "認証サーバのホスト名:" - -#. Type: string -#. Description -#: ../heat-api-cloudwatch.templates:2001 ../heat-api.templates:2001 -msgid "" -"Please specify the hostname of the authentication server. Typically this is " -"also the hostname of the OpenStack Identity Service (Keystone)." -msgstr "" -"認証サーバのホスト名を指定してください。これは標準的に OpenStack Identity " -"Service (Keystone) のホスト名にもなっています。" - #. Type: boolean #. Description -#: ../heat-api.templates:6001 +#: ../heat-common.templates:6001 msgid "Register Heat in the Keystone endpoint catalog?" msgstr "heat を Keystone の端末リストに登録しますか?" #. Type: boolean #. Description -#: ../heat-api.templates:6001 +#: ../heat-common.templates:6001 msgid "" "Each OpenStack service (each API) should be registered in order to be " "accessible. This is done using \"keystone service-create\" and \"keystone " "endpoint-create\". This can be done automatically now." msgstr "" -"OpenStack のサービスごと (API ごと) に、アクセスできるようにするため登録すべき" -"です。「keystone service-create」と「keystone endpoint-create」を使って登録す" -"ることができます。ここで自動的に行うことができます。" +"OpenStack のサービスごと (API ごと) に、アクセスできるようにするため登録すべ" +"きです。「keystone service-create」と「keystone endpoint-create」を使って登録" +"することができます。ここで自動的に行うことができます。" #. Type: boolean #. Description -#: ../heat-api.templates:6001 +#: ../heat-common.templates:6001 msgid "" "Note that you will need to have an up and running Keystone server on which " "to connect using the Keystone authentication token." @@ -185,13 +112,13 @@ msgstr "" #. Type: string #. Description -#: ../heat-api.templates:7001 +#: ../heat-common.templates:7001 msgid "Keystone server IP address:" msgstr "Keystone サーバの IP アドレス:" #. Type: string #. Description -#: ../heat-api.templates:7001 +#: ../heat-common.templates:7001 msgid "" "Please enter the IP address of the Keystone server, so that heat-api can " "contact Keystone to do the Heat service and endpoint creation." @@ -201,56 +128,118 @@ msgstr "" #. Type: password #. Description -#: ../heat-api.templates:8001 +#: ../heat-common.templates:8001 msgid "Keystone authentication token:" msgstr "Keystone 認証文字列:" #. Type: password #. Description -#: ../heat-api.templates:8001 +#: ../heat-common.templates:8001 msgid "" "To configure its endpoint in Keystone, heat-api needs the Keystone " "authentication token." msgstr "" -"Keystone で端末を設定するには、heat-api は Keystone 認証文字列を必要とします。" +"Keystone で端末を設定するには、heat-api は Keystone 認証文字列を必要としま" +"す。" #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-common.templates:9001 msgid "Heat endpoint IP address:" msgstr "heat 端末の IP アドレス:" #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-common.templates:9001 msgid "Please enter the IP address that will be used to contact Heat." msgstr "heat への通信に利用する IP アドレスを入力してください。" #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-common.templates:9001 msgid "" "This IP address should be accessible from the clients that will use this " "service, so if you are installing a public cloud, this should be a public IP " "address." msgstr "" -"この IP アドレスはこのサービスを利用するクライアントからアクセスできないといけ" -"ないので、パブリッククラウドをインストールしている場合、これは公開 IP アドレス" -"を使うようにしてください。" +"この IP アドレスはこのサービスを利用するクライアントからアクセスできないとい" +"けないので、パブリッククラウドをインストールしている場合、これは公開 IP アド" +"レスを使うようにしてください。" #. Type: string #. Description -#: ../heat-api.templates:10001 +#: ../heat-common.templates:10001 msgid "Name of the region to register:" msgstr "登録する領域の名前:" #. Type: string #. Description -#: ../heat-api.templates:10001 +#: ../heat-common.templates:10001 msgid "" "OpenStack supports using availability zones, with each region representing a " "location. Please enter the zone that you wish to use when registering the " "endpoint." msgstr "" -"OpenStack は位置を示す各領域による利用可能区分の利用をサポートしています。端末" -"の登録時に利用したい区分を入力してください。" +"OpenStack は位置を示す各領域による利用可能区分の利用をサポートしています。端" +"末の登録時に利用したい区分を入力してください。" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "Set up a database for heat-engine?" +msgstr "heat-engine 用のデータベースを準備しますか?" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +"No database has been set up for heat-engine to use. Before continuing, you " +"should make sure you have the following information:" +msgstr "" +"heat-engine で利用するデータベースが用意されていません。続行する前に以下の情" +"報が揃っているか確認してください:" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +" * the type of database that you want to use;\n" +" * the database server host name (that server must allow TCP connections " +"from this\n" +" machine);\n" +" * a username and password to access the database." +msgstr "" +" * 使いたいデータベースの種類\n" +" * データベースサーバのホスト名 (このサーバはこの\n" +" マシンからの TCP 接続を許可しなければなりません)\n" +" * データベースにアクセスするためのユーザ名とパスワード。" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +"If some of these requirements are missing, do not choose this option and run " +"with regular SQLite support." +msgstr "" +"必要なものが欠けている場合はこのオプションを選択せず、普通の SQLite サポート" +"で進めてください。" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +"You can change this setting later on by running \"dpkg-reconfigure -plow " +"heat-engine\"." +msgstr "" +"この設定は後で「dpkg-reconfigure -plow heat-engine」を実行することにより変更" +"できます。" + +#~ msgid "Auth server hostname:" +#~ msgstr "認証サーバのホスト名:" + +#~ msgid "" +#~ "Please specify the hostname of your authentication server. Typically this " +#~ "is also the hostname of your OpenStack Identity Service (Keystone)." +#~ msgstr "" +#~ "認証サーバのホスト名を指定してください。これは標準的に OpenStack Identity " +#~ "Service (Keystone) のホスト名にもなっています。" diff --git a/xenial/debian/po/templates.pot b/xenial/debian/po/templates.pot index fbd524ac..52ffb15e 100644 --- a/xenial/debian/po/templates.pot +++ b/xenial/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: heat\n" "Report-Msgid-Bugs-To: heat@packages.debian.org\n" -"POT-Creation-Date: 2013-07-10 22:55+0800\n" +"POT-Creation-Date: 2013-09-25 14:57+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,63 +17,20 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "Set up a database for heat-engine?" -msgstr "" - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -"No database has been set up for heat-engine to use. Before continuing, you " -"should make sure you have the following information:" -msgstr "" - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -" * the type of database that you want to use;\n" -" * the database server host name (that server must allow TCP connections " -"from this\n" -" machine);\n" -" * a username and password to access the database." -msgstr "" - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -"If some of these requirements are missing, do not choose this option and run " -"with regular SQLite support." -msgstr "" - -#. Type: boolean -#. Description -#: ../heat-engine.templates:2001 -msgid "" -"You can change this setting later on by running \"dpkg-reconfigure -plow " -"heat-engine\"." -msgstr "" - #. Type: string #. Description -#: ../heat-api-cfn.templates:2001 -msgid "Auth server hostname:" +#: ../heat-common.templates:2001 +msgid "Authentication server hostname:" msgstr "" #. Type: string #. Description -#: ../heat-api-cfn.templates:2001 +#: ../heat-common.templates:2001 msgid "" -"Please specify the hostname of your authentication server. Typically this is " -"also the hostname of your OpenStack Identity Service (Keystone)." +"Please specify the hostname of the authentication server. Typically this is " +"also the hostname of the OpenStack Identity Service (Keystone)." msgstr "" -#. Type: string -#. Description #. Type: string #. Description #. Translators: a "tenant" in OpenStack world is @@ -83,22 +40,10 @@ msgstr "" #. You're advised to either keep "tenant" without translating it #. or keep it parenthezised. Example for French: #. locataire ("tenant") -#. 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") -#: ../heat-api-cfn.templates:3001 ../heat-api-cloudwatch.templates:3001 -#: ../heat-api-cloudwatch.templates:6001 ../heat-api.templates:3001 +#: ../heat-common.templates:3001 msgid "Authentication server tenant name:" msgstr "" -#. Type: string -#. Description #. Type: string #. Description #. Translators: a "tenant" in OpenStack world is @@ -108,87 +53,43 @@ msgstr "" #. You're advised to either keep "tenant" without translating it #. or keep it parenthezised. Example for French: #. locataire ("tenant") -#. 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") -#: ../heat-api-cfn.templates:3001 ../heat-api-cloudwatch.templates:3001 -#: ../heat-api-cloudwatch.templates:6001 ../heat-api.templates:3001 +#: ../heat-common.templates:3001 msgid "Please specify the authentication server tenant name." msgstr "" #. Type: string #. Description -#. Type: string -#. Description -#. Type: string -#. Description -#: ../heat-api-cfn.templates:4001 ../heat-api-cloudwatch.templates:4001 -#: ../heat-api-cloudwatch.templates:7001 ../heat-api.templates:4001 +#: ../heat-common.templates:4001 msgid "Authentication server username:" msgstr "" #. Type: string #. Description -#. Type: string -#. Description -#. Type: string -#. Description -#: ../heat-api-cfn.templates:4001 ../heat-api-cloudwatch.templates:4001 -#: ../heat-api-cloudwatch.templates:7001 ../heat-api.templates:4001 +#: ../heat-common.templates:4001 msgid "Please specify the username to use with the authentication server." msgstr "" #. Type: password #. Description -#. Type: password -#. Description -#. Type: password -#. Description -#: ../heat-api-cfn.templates:5001 ../heat-api-cloudwatch.templates:5001 -#: ../heat-api-cloudwatch.templates:8001 ../heat-api.templates:5001 +#: ../heat-common.templates:5001 msgid "Authentication server password:" msgstr "" #. Type: password #. Description -#. Type: password -#. Description -#. Type: password -#. Description -#: ../heat-api-cfn.templates:5001 ../heat-api-cloudwatch.templates:5001 -#: ../heat-api-cloudwatch.templates:8001 ../heat-api.templates:5001 +#: ../heat-common.templates:5001 msgid "Please specify the password to use with the authentication server." msgstr "" -#. Type: string -#. Description -#: ../heat-api-cloudwatch.templates:2001 ../heat-api.templates:2001 -msgid "Authentication server hostname:" -msgstr "" - -#. Type: string -#. Description -#: ../heat-api-cloudwatch.templates:2001 ../heat-api.templates:2001 -msgid "" -"Please specify the hostname of the authentication server. Typically this is " -"also the hostname of the OpenStack Identity Service (Keystone)." -msgstr "" - #. Type: boolean #. Description -#: ../heat-api.templates:6001 +#: ../heat-common.templates:6001 msgid "Register Heat in the Keystone endpoint catalog?" msgstr "" #. Type: boolean #. Description -#: ../heat-api.templates:6001 +#: ../heat-common.templates:6001 msgid "" "Each OpenStack service (each API) should be registered in order to be " "accessible. This is done using \"keystone service-create\" and \"keystone " @@ -197,7 +98,7 @@ msgstr "" #. Type: boolean #. Description -#: ../heat-api.templates:6001 +#: ../heat-common.templates:6001 msgid "" "Note that you will need to have an up and running Keystone server on which " "to connect using the Keystone authentication token." @@ -205,13 +106,13 @@ msgstr "" #. Type: string #. Description -#: ../heat-api.templates:7001 +#: ../heat-common.templates:7001 msgid "Keystone server IP address:" msgstr "" #. Type: string #. Description -#: ../heat-api.templates:7001 +#: ../heat-common.templates:7001 msgid "" "Please enter the IP address of the Keystone server, so that heat-api can " "contact Keystone to do the Heat service and endpoint creation." @@ -219,13 +120,13 @@ msgstr "" #. Type: password #. Description -#: ../heat-api.templates:8001 +#: ../heat-common.templates:8001 msgid "Keystone authentication token:" msgstr "" #. Type: password #. Description -#: ../heat-api.templates:8001 +#: ../heat-common.templates:8001 msgid "" "To configure its endpoint in Keystone, heat-api needs the Keystone " "authentication token." @@ -233,19 +134,19 @@ msgstr "" #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-common.templates:9001 msgid "Heat endpoint IP address:" msgstr "" #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-common.templates:9001 msgid "Please enter the IP address that will be used to contact Heat." msgstr "" #. Type: string #. Description -#: ../heat-api.templates:9001 +#: ../heat-common.templates:9001 msgid "" "This IP address should be accessible from the clients that will use this " "service, so if you are installing a public cloud, this should be a public IP " @@ -254,15 +155,56 @@ msgstr "" #. Type: string #. Description -#: ../heat-api.templates:10001 +#: ../heat-common.templates:10001 msgid "Name of the region to register:" msgstr "" #. Type: string #. Description -#: ../heat-api.templates:10001 +#: ../heat-common.templates:10001 msgid "" "OpenStack supports using availability zones, with each region representing a " "location. Please enter the zone that you wish to use when registering the " "endpoint." msgstr "" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "Set up a database for heat-engine?" +msgstr "" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +"No database has been set up for heat-engine to use. Before continuing, you " +"should make sure you have the following information:" +msgstr "" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +" * the type of database that you want to use;\n" +" * the database server host name (that server must allow TCP connections " +"from this\n" +" machine);\n" +" * a username and password to access the database." +msgstr "" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +"If some of these requirements are missing, do not choose this option and run " +"with regular SQLite support." +msgstr "" + +#. Type: boolean +#. Description +#: ../heat-common.templates:11001 +msgid "" +"You can change this setting later on by running \"dpkg-reconfigure -plow " +"heat-engine\"." +msgstr "" diff --git a/xenial/debian/rules b/xenial/debian/rules index 72931f94..45f57d34 100755 --- a/xenial/debian/rules +++ b/xenial/debian/rules @@ -18,28 +18,18 @@ override_dh_clean: find . -iname '*.pyc' -delete rm -f run_tests.err.log rm -f \ - debian/heat-api-cfn.config \ - debian/heat-api-cfn.postinst \ - debian/heat-api-cloudwatch.config \ - debian/heat-api-cloudwatch.postinst \ - debian/heat-api.config \ - debian/heat-api.postinst \ debian/heat-common.postinst \ - debian/heat-engine.config \ - debian/heat-engine.postinst + debian/heat-common.config + +override_dh_install: + dh_install + install -D -m 0640 etc/heat/heat.conf.sample $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf + cat $(CURDIR)/debian/keystone_authtoken >>$(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf override_dh_auto_build: dh_auto_build /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-common.postinst - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-api-cfn.config - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-api-cfn.postinst - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-api-cloudwatch.config - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-api-cloudwatch.postinst - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-api.config - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-api.postinst - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-common.postinst - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-engine.config - /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-engine.postinst + /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func heat-common.config override_dh_installman: python setup.py build