summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--heat/locale/cs/LC_MESSAGES/heat-log-critical.po14
-rw-r--r--heat/locale/de/LC_MESSAGES/heat-log-critical.po14
-rw-r--r--heat/locale/de/LC_MESSAGES/heat.po135
-rw-r--r--heat/locale/es/LC_MESSAGES/heat-log-critical.po14
-rw-r--r--heat/locale/fr/LC_MESSAGES/heat-log-critical.po14
-rw-r--r--heat/locale/fr/LC_MESSAGES/heat-log-error.po14
-rw-r--r--heat/locale/heat-log-error.pot112
-rw-r--r--heat/locale/heat-log-info.pot254
-rw-r--r--heat/locale/heat-log-warning.pot154
-rw-r--r--heat/locale/heat.pot3134
-rw-r--r--heat/locale/it/LC_MESSAGES/heat-log-critical.po14
-rw-r--r--heat/locale/ja/LC_MESSAGES/heat-log-critical.po14
-rw-r--r--heat/locale/ko_KR/LC_MESSAGES/heat-log-critical.po14
-rw-r--r--heat/locale/pt/LC_MESSAGES/heat-log-critical.po14
-rw-r--r--heat/locale/pt_BR/LC_MESSAGES/heat-log-critical.po14
-rw-r--r--heat/locale/tr_TR/LC_MESSAGES/heat-log-critical.po14
-rw-r--r--heat/locale/zh_CN/LC_MESSAGES/heat-log-critical.po14
-rw-r--r--heat/locale/zh_TW/LC_MESSAGES/heat-log-critical.po14
18 files changed, 2125 insertions, 1846 deletions
diff --git a/heat/locale/cs/LC_MESSAGES/heat-log-critical.po b/heat/locale/cs/LC_MESSAGES/heat-log-critical.po
index e5d8b6a7b..a9abd5c4f 100644
--- a/heat/locale/cs/LC_MESSAGES/heat-log-critical.po
+++ b/heat/locale/cs/LC_MESSAGES/heat-log-critical.po
@@ -6,19 +6,19 @@
# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:03+0000\n"
-"PO-Revision-Date: 2015-09-04 08:15+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Czech\n"
-"Language: cs\n"
+"POT-Creation-Date: 2016-01-17 12:11+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-04 08:15+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: Czech\n"
#, python-format
msgid "%s"
diff --git a/heat/locale/de/LC_MESSAGES/heat-log-critical.po b/heat/locale/de/LC_MESSAGES/heat-log-critical.po
index 796b5a649..c62714aea 100644
--- a/heat/locale/de/LC_MESSAGES/heat-log-critical.po
+++ b/heat/locale/de/LC_MESSAGES/heat-log-critical.po
@@ -6,19 +6,19 @@
# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:03+0000\n"
-"PO-Revision-Date: 2015-09-04 08:15+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: German\n"
-"Language: de\n"
+"POT-Creation-Date: 2016-01-17 12:11+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-04 08:15+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: German\n"
#, python-format
msgid "%s"
diff --git a/heat/locale/de/LC_MESSAGES/heat.po b/heat/locale/de/LC_MESSAGES/heat.po
index f36daea0c..8b63e44e0 100644
--- a/heat/locale/de/LC_MESSAGES/heat.po
+++ b/heat/locale/de/LC_MESSAGES/heat.po
@@ -1,4 +1,4 @@
-# German translations for heat.
+# Translations template for heat.
# Copyright (C) 2015 ORGANIZATION
# This file is distributed under the same license as the heat project.
#
@@ -10,18 +10,19 @@
# Tom Cocozzello <tjcocozz@us.ibm.com>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:02+0000\n"
+"POT-Creation-Date: 2016-01-17 12:10+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2015-09-25 02:58+0000\n"
"Last-Translator: Andreas Jaeger <jaegerandi@gmail.com>\n"
"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Generated-By: Babel 2.0\n"
+"X-Generator: Zanata 3.7.3\n"
"Language-Team: German\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
#, python-format
msgid "\"%%s\" is not a valid keyword inside a %s definition"
@@ -783,10 +784,6 @@ msgstr "Attribut %(attr)s für Fassade %(type)s fehlt in Provider"
msgid "Audit status of this firewall policy."
msgstr "Prüfstatus dieser Firewallrichtlinie."
-#, python-format
-msgid "Auth service at URL %(url)s not found."
-msgstr "Authentifizierungsservice unter URL %(url)s nicht gefunden."
-
msgid "Authentication Endpoint URI."
msgstr "Authentifizierungendpunkt-URI."
@@ -985,12 +982,6 @@ msgstr ""
"Konfigurationsscript oder Manifest, das angibt, welche Konfiguration "
"durchgeführt wird. "
-#, python-format
-msgid "Connect error/bad request to Auth service at URL %(url)s."
-msgstr ""
-"Verbindungsfehler/fehlerhafte Anforderung an Authentifizierungsservice unter "
-"URL %(url)s."
-
msgid "Connection info for this network gateway."
msgstr "Verbindungsinformationen für dieses Netzgateway."
@@ -1361,13 +1352,6 @@ msgstr ""
"Richtlinieneinstellung in Neutron beschränkt die Verwendung dieser "
"Eigenschaft ausschließlich auf Benutzer mit Verwaltungsaufgaben."
-msgid ""
-"Enables engine with convergence architecture. All stacks with this option "
-"will be created using convergence engine ."
-msgstr ""
-"Ermöglicht Konvergenzarchitektur für Engine. Alle Stacks mit dieser Option "
-"werden mithilfe einer Konvergenzengine erstellt."
-
msgid "Encapsulation mode for the ipsec policy."
msgstr "Kapselungsmodus für die IPSec-Richtlinie. "
@@ -1437,14 +1421,6 @@ msgstr ""
"installierte Hardware oder die jeweiligen installierten Erweiterungen. "
msgid ""
-"Extra parameters to include in the \"network\" object in the creation "
-"request. Parameters are often specific to installed hardware or extensions."
-msgstr ""
-"Zusätzliche Parameter zum Einschließen in das Objekt \"network\" der "
-"Erstellungsanforderung. Oft gelten Parameter nur für die jeweilige "
-"installierte Hardware oder die jeweiligen installierten Erweiterungen. "
-
-msgid ""
"Extra parameters to include in the \"port\" object in the creation request."
msgstr ""
"Zusätzliche Parameter zum Einschließen in das Objekt \"port\" der "
@@ -1859,14 +1835,6 @@ msgstr ""
"%(example)s"
#, python-format
-msgid ""
-"Incorrect auth strategy, expected \"%(expected)s\" but received "
-"\"%(received)s\""
-msgstr ""
-"Falsche Authentifizierungsstrategie. Erwartet wurde \"%(expected)s\", "
-"empfangen wurde jedoch \"%(received)s\""
-
-#, python-format
msgid "Index to \"%s\" must be a string"
msgstr "Index für \"%s\" muss eine Zeichenfolge sein"
@@ -2089,10 +2057,6 @@ msgid "Ip_version for this firewall rule."
msgstr "Ip_version für diese Firewallregel."
#, python-format
-msgid "Items to join must be strings %s"
-msgstr "Zu verknüpfende Elemente müssen Zeichenfolgen %s sein"
-
-#, python-format
msgid ""
"JSON body size (%(len)s bytes) exceeds maximum allowed size (%(limit)s "
"bytes)."
@@ -2372,10 +2336,6 @@ msgstr ""
msgid "Maximum raw byte size of any template."
msgstr "Maximale unformatierte Bytegröße einer beliebigen Vorlage."
-#, python-format
-msgid "Maximum redirects (%(redirects)s) was exceeded."
-msgstr "Das Maximum an Umleitungen (%(redirects)s) wurde überschritten."
-
msgid "Maximum resources per stack exceeded."
msgstr "Maximale Anzahl an Ressourcen pro Stack überschritten. "
@@ -2437,15 +2397,6 @@ msgstr "Fehlender Parametertyp für Parameter: %s"
msgid "Missing required credential: %(required)s"
msgstr "Erforderlicher Berechtigungsnachweis fehlt: %(required)s"
-#, python-format
-msgid ""
-"Multiple 'image' service matches for region %(region)s. This generally means "
-"that a region is required and you have not supplied one."
-msgstr ""
-"Mehrere 'image'-Serviceübereinstimmungen für Region %(region)s. Dies weist "
-"im Allgemeinen darauf hin, dass eine Region erforderlich ist und dass Sie "
-"keine angegeben haben."
-
msgid "Multiple actions specified"
msgstr "Mehrere Aktionen angegeben"
@@ -2697,15 +2648,6 @@ msgstr "Netzschnittstellen-ID, die dieser EIP zuzuordnen ist. "
msgid "Network interfaces to associate with instance."
msgstr "Netzschnittstellen zum Zuordnen zur Instanz. "
-#, python-format
-msgid ""
-"Network this port belongs to. If you plan to use current port to assign "
-"Floating IP, you should specify %(fixed_ips)s with %(subnet)s"
-msgstr ""
-"Netz, zu dem dieser Port gehört. Wenn Sie planen, den aktuellen Port für die "
-"Zuweisung einer dynamischen IP-Adresse zu verwenden, sollten Sie "
-"%(fixed_ips)s mit %(subnet)s angeben"
-
msgid "Network to allocate floating IP from."
msgstr "Netz, aus dem die dynamische IP-Adresse zuzuordnen ist."
@@ -3094,17 +3036,10 @@ msgstr ""
msgid "Rebuilding server failed, status '%s'"
msgstr "Wiederherstellung des Servers fehlgeschlagen, Status '%s'"
-msgid "Received invalid HTTP redirect."
-msgstr "Ungültige HTTP-Umleitung erhalten."
-
#, python-format
msgid "Recursion depth exceeds %d."
msgstr "Verschachtelungstiefe überschreitet %d."
-#, python-format
-msgid "Redirecting to %(uri)s for authorization."
-msgstr "Umleitung auf %(uri)s für Autorisierung."
-
msgid ""
"Ref structure that contains the ID of the VPC on which you want to create "
"the subnet."
@@ -3317,10 +3252,6 @@ msgstr "Servername."
msgid "Server to assign floating IP to."
msgstr "Server, dem die dynamische IP-Adresse zugeordnet werden soll. "
-#, python-format
-msgid "Service %(service_id)s not found"
-msgstr "Dienst %(service_id)s nicht gefunden"
-
msgid "Service misconfigured"
msgstr "Dienst falsch konfiguriert"
@@ -3601,10 +3532,6 @@ msgstr "Der DNS-Name des LoadBalancer."
msgid "The DNS name of the specified bucket."
msgstr "Der DNS-Name des angegebenen Buckets. "
-#, python-format
-msgid "The Flavor ID (%(flavor_id)s) could not be found."
-msgstr "Die Versions-ID (%(flavor_id)s) konnte nicht gefunden werden."
-
msgid "The HTTP method used for requests by the monitor of type HTTP."
msgstr ""
"Die für Anforderungen durch den Monitor des Typs HTTP verwendete HTTP-"
@@ -3714,14 +3641,6 @@ msgid "The IP version, which is 4 or 6."
msgstr "Die IP-Version, welche 4 oder 6 ist."
#, python-format
-msgid "The Key (%(key_name)s) could not be found."
-msgstr "Der Schlüssel (%(key_name)s) konnte nicht gefunden werden."
-
-#, python-format
-msgid "The Nova network (%(network)s) could not be found."
-msgstr "Das Nova-Netz (%(network)s) konnte nicht gefunden werden."
-
-#, python-format
msgid "The Parameter (%(key)s) has no attributes."
msgstr "Der Parameter (%(key)s) hat keine Attribute."
@@ -3742,10 +3661,6 @@ msgid "The Resource %s requires replacement."
msgstr "Die Ressource %s muss ersetzt werden."
#, python-format
-msgid "The Resource (%(resource_id)s) could not be found."
-msgstr "Die Ressource (%(resource_id)s) konnte nicht gefunden werden."
-
-#, python-format
msgid ""
"The Resource (%(resource_name)s) could not be found in Stack %(stack_name)s."
msgstr ""
@@ -3757,10 +3672,6 @@ msgid "The Resource (%(resource_name)s) is not available."
msgstr "Die Ressource (%(resource_name)s) ist nicht verfügbar."
#, python-format
-msgid "The Resource Type (%(type_name)s) could not be found."
-msgstr "Der Ressourcentyp (%(type_name)s) konnte nicht gefunden werden."
-
-#, python-format
msgid "The Snapshot (%(snapshot)s) for Stack (%(stack)s) could not be found."
msgstr ""
"Die Schattenkopie (%(snapshot)s) für Stack (%(stack)s) konnte nicht gefunden "
@@ -3770,16 +3681,9 @@ msgstr ""
msgid "The Stack (%(stack_name)s) already exists."
msgstr "Der Stack (%(stack_name)s) ist bereits vorhanden."
-#, python-format
-msgid "The Stack (%(stack_name)s) could not be found."
-msgstr "Der Stack (%(stack_name)s) konnte nicht gefunden werden."
-
msgid "The Template must be a JSON or YAML document."
msgstr "Die Vorlage muss ein JSON- oder YAML-Dokument sein."
-msgid "The URI was too long."
-msgstr "Die URI war zu lang."
-
msgid ""
"The URL of a template that specifies the stack to be created as a resource."
msgstr ""
@@ -3998,15 +3902,6 @@ msgstr "Die zu verwendende Version. "
msgid "The function %s is not supported in this version of HOT."
msgstr "Die Funktion %s wird in dieser Version von HOT nicht unterstützt."
-msgid ""
-"The gateway IP address. Set to any of [ null | ~ | \"\" ] to create the "
-"subnet without a gateway. If omitted, the first IP address within the subnet "
-"is assigned to the gateway."
-msgstr ""
-"Die Gateway-IP-Adresse. Auf einen der folgenden Werte gesetzt [ null | ~ | "
-"\"\" ], um das Teilnetz ohne Gateway zu erstellen. Bei Auslassung wird die "
-"erste IP-Adresse im Teilnetz dem Gateway zugewiesen."
-
msgid "The host from the container URL."
msgstr "Der Host aus der Container-URL."
@@ -4725,9 +4620,6 @@ msgstr ""
"werden.\n"
"Abgerufen: %(e)r"
-msgid "Unable to locate config file"
-msgstr "Konfigurationsdatei kann nicht gefunden werden"
-
#, python-format
msgid "Unexpected action %(action)s"
msgstr "Unerwartete Aktion %(action)s"
@@ -4936,15 +4828,6 @@ msgstr "Der Wert muss gültige JSON sein: %s"
msgid "Value must match pattern: %s"
msgstr "Wert muss Muster entsprechen: %s"
-msgid ""
-"Value which can be set or changed on stack update to trigger the resource "
-"for replacement with a new random string . The salt value itself is ignored "
-"by the random generator."
-msgstr ""
-"Wert, der bei der Stackaktualisierung festgelegt oder geändert werden kann, "
-"um auszulösen, dass die Ressource eine neue, zufällige Zeichenfolge "
-"einsetzt. Der Saltwert selbst wird vom Zufallsgenerator ignoriert. "
-
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr "Version %(objver)s von %(objname)s wird nicht unterstützt"
diff --git a/heat/locale/es/LC_MESSAGES/heat-log-critical.po b/heat/locale/es/LC_MESSAGES/heat-log-critical.po
index c59800192..98ff5f5a6 100644
--- a/heat/locale/es/LC_MESSAGES/heat-log-critical.po
+++ b/heat/locale/es/LC_MESSAGES/heat-log-critical.po
@@ -6,19 +6,19 @@
# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:03+0000\n"
-"PO-Revision-Date: 2015-09-04 08:15+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Spanish\n"
-"Language: es\n"
+"POT-Creation-Date: 2016-01-17 12:11+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-04 08:15+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: Spanish\n"
#, python-format
msgid "%s"
diff --git a/heat/locale/fr/LC_MESSAGES/heat-log-critical.po b/heat/locale/fr/LC_MESSAGES/heat-log-critical.po
index f1cd93376..bea0d5eca 100644
--- a/heat/locale/fr/LC_MESSAGES/heat-log-critical.po
+++ b/heat/locale/fr/LC_MESSAGES/heat-log-critical.po
@@ -6,19 +6,19 @@
# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:03+0000\n"
-"PO-Revision-Date: 2015-09-04 08:15+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: French\n"
-"Language: fr\n"
+"POT-Creation-Date: 2016-01-17 12:11+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-04 08:15+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: French\n"
#, python-format
msgid "%s"
diff --git a/heat/locale/fr/LC_MESSAGES/heat-log-error.po b/heat/locale/fr/LC_MESSAGES/heat-log-error.po
index e2a009fa7..3a6265492 100644
--- a/heat/locale/fr/LC_MESSAGES/heat-log-error.po
+++ b/heat/locale/fr/LC_MESSAGES/heat-log-error.po
@@ -7,19 +7,19 @@
# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:02+0000\n"
-"PO-Revision-Date: 2015-08-01 09:44+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: French\n"
-"Language: fr\n"
+"POT-Creation-Date: 2016-01-17 12:10+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-08-01 09:44+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: French\n"
#, python-format
msgid "%(name)s: %(value)s"
diff --git a/heat/locale/heat-log-error.pot b/heat/locale/heat-log-error.pot
index b80100cbc..e8b5bc88d 100644
--- a/heat/locale/heat-log-error.pot
+++ b/heat/locale/heat-log-error.pot
@@ -1,21 +1,21 @@
# Translations template for heat.
-# Copyright (C) 2015 ORGANIZATION
+# Copyright (C) 2016 ORGANIZATION
# This file is distributed under the same license as the heat project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:02+0000\n"
+"POT-Creation-Date: 2016-01-18 06:34+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
+"Generated-By: Babel 2.2.0\n"
#: heat/api/aws/ec2token.py:188
msgid "Ec2Token authorization failed, no auth_uri specified in config file"
@@ -30,15 +30,15 @@ msgstr ""
msgid "Request does not contain required MetricData"
msgstr ""
-#: heat/common/context.py:195
+#: heat/common/context.py:218
msgid "Keystone v3 API connection failed, no password trust or auth_token!"
msgstr ""
-#: heat/common/exception.py:68
+#: heat/common/exception.py:57
msgid "Exception in string format operation"
msgstr ""
-#: heat/common/exception.py:70
+#: heat/common/exception.py:59
#, python-format
msgid "%(name)s: %(value)s"
msgstr ""
@@ -90,30 +90,30 @@ msgstr ""
msgid "Failed to import module %s"
msgstr ""
-#: heat/common/wsgi.py:288
+#: heat/common/wsgi.py:287
msgid "SIGTERM received"
msgstr ""
-#: heat/common/wsgi.py:296
+#: heat/common/wsgi.py:295
msgid "SIGHUP received"
msgstr ""
-#: heat/common/wsgi.py:433
+#: heat/common/wsgi.py:432
#, python-format
msgid "Not respawning child %d, cannot recover from termination"
msgstr ""
-#: heat/common/wsgi.py:843
+#: heat/common/wsgi.py:842
#, python-format
msgid "Exception handling resource: %s"
msgstr ""
-#: heat/common/wsgi.py:865
+#: heat/common/wsgi.py:864
#, python-format
msgid "Returning %(code)s to user: %(explanation)s"
msgstr ""
-#: heat/common/wsgi.py:939
+#: heat/common/wsgi.py:938
#, python-format
msgid "Unexpected error occurred serving API: %s"
msgstr ""
@@ -122,21 +122,21 @@ msgstr ""
msgid "Timeout conversion failed"
msgstr ""
-#: heat/engine/api.py:424
+#: heat/engine/api.py:444
msgid "Unexpected number of keys in watch_data.data!"
msgstr ""
-#: heat/engine/environment.py:658
+#: heat/engine/environment.py:725
#, python-format
msgid "Failed to read %s"
msgstr ""
-#: heat/engine/environment.py:670
+#: heat/engine/environment.py:737
#, python-format
msgid "Failed to parse %(file_path)s"
msgstr ""
-#: heat/engine/environment.py:674
+#: heat/engine/environment.py:741
#, python-format
msgid "Failed to read %(file_path)s"
msgstr ""
@@ -151,68 +151,93 @@ msgstr ""
msgid "Invalid type for %(mapping_name)s from %(module)s"
msgstr ""
-#: heat/engine/resource.py:637
+#: heat/engine/resource.py:643
msgid "Error marking resource as failed"
msgstr ""
-#: heat/engine/resource.py:1313 heat/engine/resource.py:1359
-#: heat/engine/resource.py:1387
+#: heat/engine/resource.py:1346 heat/engine/resource.py:1393
+#: heat/engine/resource.py:1421
#, python-format
msgid "DB error %s"
msgstr ""
-#: heat/engine/resource.py:1392
+#: heat/engine/resource.py:1426
#, python-format
msgid ""
-"Error acquiring lock for resource id:%(resource_id)s withatomic "
-"key:%(atomic_key)s,engine_id:%(rs_engine_id)s/%(engine_id)s"
+"Error acquiring lock for resource id:%(resource_id)s with "
+"atomic_key:%(atomic_key)s, engine_id:%(rs_engine_id)s/%(engine_id)s"
msgstr ""
-#: heat/engine/resource.py:1638
+#: heat/engine/resource.py:1698
#, python-format
msgid "signal %(name)s : %(msg)s"
msgstr ""
-#: heat/engine/service.py:375
+#: heat/engine/service.py:129
+msgid "Unhandled error in asynchronous task"
+msgstr ""
+
+#: heat/engine/service.py:389
#, python-format
msgid "Failed to stop engine service, %s"
msgstr ""
-#: heat/engine/service.py:1628
+#: heat/engine/service.py:806
+msgid ""
+"PATCH update to FAILED stack only possible if convergence enabled or "
+"previous template stored"
+msgstr ""
+
+#: heat/engine/service.py:1289 heat/engine/service.py:1335
+#, python-format
+msgid "Error loading resource type %s from global environment."
+msgstr ""
+
+#: heat/engine/service.py:1717
msgid "Filtering by namespace/metric not yet supported"
msgstr ""
-#: heat/engine/service.py:1776
+#: heat/engine/service.py:1865
#, python-format
msgid "Service %(service_id)s update failed: %(error)s"
msgstr ""
+#: heat/engine/service.py:1942
+#, python-format
+msgid "Error while resetting stack: %s"
+msgstr ""
+
#: heat/engine/service_stack_watch.py:75
#, python-format
msgid "Unable to retrieve stack %s for periodic task"
msgstr ""
-#: heat/engine/stack.py:661
+#: heat/engine/stack.py:85
+#, python-format
+msgid "Unexpected exception in %(func)s: %(msg)s"
+msgstr ""
+
+#: heat/engine/stack.py:710
#, python-format
msgid "Exception: %s"
msgstr ""
-#: heat/engine/stack.py:1150
+#: heat/engine/stack.py:1268
#, python-format
msgid "Unexpected action %s passed to update!"
msgstr ""
-#: heat/engine/stack.py:1431
+#: heat/engine/stack.py:1550
#, python-format
msgid "Unexpected action %s passed to delete!"
msgstr ""
-#: heat/engine/stack.py:1633
+#: heat/engine/stack.py:1753
#, python-format
msgid "Resource %(name)s delete failed: %(ex)s"
msgstr ""
-#: heat/engine/stack.py:1642
+#: heat/engine/stack.py:1762
#, python-format
msgid "Resource %(name)s create failed: %(ex)s"
msgstr ""
@@ -222,11 +247,11 @@ msgstr ""
msgid "%(topic)s is failed to stop, %(exc)s"
msgstr ""
-#: heat/engine/clients/os/zaqar.py:40
+#: heat/engine/clients/os/zaqar.py:42
msgid "Zaqar connection failed, no auth_token!"
msgstr ""
-#: heat/engine/resources/stack_resource.py:431
+#: heat/engine/resources/stack_resource.py:434
msgid "update_stack"
msgstr ""
@@ -245,19 +270,28 @@ msgid ""
"nova.conf."
msgstr ""
-#: heat/engine/resources/aws/ec2/eip.py:337
-#: heat/engine/resources/aws/ec2/eip.py:360
+#: heat/engine/resources/aws/ec2/eip.py:333
+#: heat/engine/resources/aws/ec2/eip.py:356
msgid "Port not specified."
msgstr ""
-#: heat/engine/resources/openstack/heat/remote_stack.py:153
+#: heat/engine/resources/openstack/heat/remote_stack.py:156
#, python-format
msgid "exception: %s"
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_floatingip.py:82
+#: heat/engine/resources/openstack/nova/floatingip.py:84
msgid ""
"Could not allocate floating IP. Probably there is no default floating IP "
"pool is configured."
msgstr ""
+#: heat/engine/resources/openstack/nova/server.py:1131
+msgid "Error while updating software config transport"
+msgstr ""
+
+#: heat/tests/convergence/framework/scenario.py:25
+#, python-format
+msgid "Scenario directory \"%s\" not found"
+msgstr ""
+
diff --git a/heat/locale/heat-log-info.pot b/heat/locale/heat-log-info.pot
index 6f463cbce..a6f04f9e9 100644
--- a/heat/locale/heat-log-info.pot
+++ b/heat/locale/heat-log-info.pot
@@ -1,66 +1,66 @@
# Translations template for heat.
-# Copyright (C) 2015 ORGANIZATION
+# Copyright (C) 2016 ORGANIZATION
# This file is distributed under the same license as the heat project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev43\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-01 06:03+0000\n"
+"POT-Creation-Date: 2016-01-18 06:34+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
+"Generated-By: Babel 2.2.0\n"
-#: heat/api/aws/ec2token.py:180
+#: heat/api/aws/ec2token.py:167
msgid "Checking AWS credentials.."
msgstr ""
-#: heat/api/aws/ec2token.py:187
+#: heat/api/aws/ec2token.py:174
msgid "No AWS Signature found."
msgstr ""
-#: heat/api/aws/ec2token.py:195
+#: heat/api/aws/ec2token.py:182
msgid "No AWSAccessKeyId/Authorization Credential"
msgstr ""
-#: heat/api/aws/ec2token.py:198
+#: heat/api/aws/ec2token.py:185
msgid "AWS credentials found, checking against keystone."
msgstr ""
-#: heat/api/aws/ec2token.py:226
+#: heat/api/aws/ec2token.py:213
#, python-format
msgid "Authenticating with %s"
msgstr ""
-#: heat/api/aws/ec2token.py:239
+#: heat/api/aws/ec2token.py:226
msgid "AWS authentication failure."
msgstr ""
-#: heat/api/aws/ec2token.py:254
+#: heat/api/aws/ec2token.py:241
msgid "AWS authentication successful."
msgstr ""
-#: heat/api/cfn/v1/stacks.py:433 heat/engine/service.py:972
+#: heat/api/cfn/v1/stacks.py:433 heat/engine/service.py:1002
msgid "validate_template"
msgstr ""
-#: heat/cmd/api.py:55 heat/httpd/heat-api.py:44
+#: heat/cmd/api.py:56 heat/httpd/heat_api.py:46
#, python-format
msgid "Starting Heat REST API on %(host)s:%(port)s"
msgstr ""
-#: heat/cmd/api_cfn.py:59 heat/httpd/heat-api-cfn.py:46
+#: heat/cmd/api_cfn.py:60 heat/httpd/heat_api_cfn.py:47
#, python-format
msgid "Starting Heat API on %(host)s:%(port)s"
msgstr ""
-#: heat/cmd/api_cloudwatch.py:59 heat/httpd/heat-api-cloudwatch.py:46
+#: heat/cmd/api_cloudwatch.py:60 heat/httpd/heat_api_cloudwatch.py:47
#, python-format
msgid "Starting Heat CloudWatch API on %(host)s:%(port)s"
msgstr ""
@@ -75,106 +75,106 @@ msgstr ""
msgid "Fetching data from %s"
msgstr ""
-#: heat/common/wsgi.py:326
+#: heat/common/wsgi.py:319
#, python-format
msgid "Starting %d workers"
msgstr ""
-#: heat/common/wsgi.py:344
+#: heat/common/wsgi.py:337
msgid "Caught keyboard interrupt. Exiting."
msgstr ""
-#: heat/common/wsgi.py:429
+#: heat/common/wsgi.py:421
#, python-format
msgid "Removed dead child %s"
msgstr ""
-#: heat/common/wsgi.py:432
+#: heat/common/wsgi.py:424
#, python-format
msgid "Removed stale child %s"
msgstr ""
-#: heat/common/wsgi.py:444
+#: heat/common/wsgi.py:436
msgid "All workers have terminated. Exiting"
msgstr ""
-#: heat/common/wsgi.py:522
+#: heat/common/wsgi.py:513
#, python-format
msgid "Child %d exiting normally"
msgstr ""
-#: heat/common/wsgi.py:527
+#: heat/common/wsgi.py:518
#, python-format
msgid "Started child %s"
msgstr ""
-#: heat/common/wsgi.py:554
+#: heat/common/wsgi.py:545
msgid "Starting single process server"
msgstr ""
-#: heat/engine/environment.py:665
+#: heat/engine/environment.py:732
#, python-format
msgid "Loading %s"
msgstr ""
-#: heat/engine/resource.py:377
+#: heat/engine/resource.py:381
#, python-format
msgid "Reached hook on %s"
msgstr ""
-#: heat/engine/resource.py:617
+#: heat/engine/resource.py:631
#, python-format
msgid "%(action)s: %(info)s"
msgstr ""
-#: heat/engine/resource.py:731
+#: heat/engine/resource.py:746
#, python-format
msgid "creating %s"
msgstr ""
-#: heat/engine/resource.py:931
+#: heat/engine/resource.py:962
#, python-format
msgid "updating %s"
msgstr ""
-#: heat/engine/resource.py:985
+#: heat/engine/resource.py:1024
#, python-format
msgid "Checking %s"
msgstr ""
-#: heat/engine/resource.py:1026
+#: heat/engine/resource.py:1065
#, python-format
msgid "suspending %s"
msgstr ""
-#: heat/engine/resource.py:1045
+#: heat/engine/resource.py:1084
#, python-format
msgid "resuming %s"
msgstr ""
-#: heat/engine/resource.py:1050
+#: heat/engine/resource.py:1089
#, python-format
msgid "snapshotting %s"
msgstr ""
-#: heat/engine/resource.py:1101
+#: heat/engine/resource.py:1139
#, python-format
msgid "Validating %s"
msgstr ""
-#: heat/engine/resource.py:1152
+#: heat/engine/resource.py:1189
#, python-format
msgid ""
"Could not find replacement of resource %(name)s with id %(id)s while "
"updating needed_by."
msgstr ""
-#: heat/engine/resource.py:1223
+#: heat/engine/resource.py:1267
#, python-format
msgid "deleting %s"
msgstr ""
-#: heat/engine/resource.py:1586
+#: heat/engine/resource.py:1661
#, python-format
msgid "Clearing %(hook)s hook on %(resource)s"
msgstr ""
@@ -184,191 +184,201 @@ msgstr ""
msgid "%s timed out"
msgstr ""
-#: heat/engine/service.py:365
+#: heat/engine/service.py:387
msgid "Engine service is stopped successfully"
msgstr ""
-#: heat/engine/service.py:381
+#: heat/engine/service.py:403
#, python-format
msgid "Waiting stack %s processing to be finished"
msgstr ""
-#: heat/engine/service.py:385
+#: heat/engine/service.py:407
#, python-format
msgid "Stack %s processing was finished"
msgstr ""
-#: heat/engine/service.py:390
+#: heat/engine/service.py:412
#, python-format
msgid "Service %s is deleted"
msgstr ""
-#: heat/engine/service.py:393
+#: heat/engine/service.py:415
msgid "All threads were gone, terminating engine"
msgstr ""
-#: heat/engine/service.py:639
+#: heat/engine/service.py:669
#, python-format
msgid "previewing stack %s"
msgstr ""
-#: heat/engine/service.py:677
+#: heat/engine/service.py:707
#, python-format
msgid "Creating stack %s"
msgstr ""
-#: heat/engine/service.py:700
+#: heat/engine/service.py:730
#, python-format
msgid "Stack create failed, status %s"
msgstr ""
-#: heat/engine/service.py:779
+#: heat/engine/service.py:860
#, python-format
msgid "Updating stack %s"
msgstr ""
-#: heat/engine/service.py:877
+#: heat/engine/service.py:913
#, python-format
msgid "Previewing update of stack %s"
msgstr ""
-#: heat/engine/service.py:929
+#: heat/engine/service.py:957
#, python-format
msgid "Starting cancel of updating stack %s"
msgstr ""
-#: heat/engine/service.py:1075
+#: heat/engine/service.py:1142
#, python-format
msgid "Deleting stack %s"
msgstr ""
-#: heat/engine/service.py:1134
+#: heat/engine/service.py:1220
#, python-format
msgid "abandoning stack %s"
msgstr ""
-#: heat/engine/service.py:1486
+#: heat/engine/service.py:1226
+#, python-format
+msgid "exporting stack %s"
+msgstr ""
+
+#: heat/engine/service.py:1577
#, python-format
msgid "%(stack)s is in state %(action)s_IN_PROGRESS, snapshot is not permitted."
msgstr ""
-#: heat/engine/service.py:1534
+#: heat/engine/service.py:1625
#, python-format
msgid "Checking stack %s"
msgstr ""
-#: heat/engine/service.py:1764
+#: heat/engine/service.py:1856
#, python-format
msgid "Service %s is started"
msgstr ""
-#: heat/engine/service.py:1771
+#: heat/engine/service.py:1863
#, python-format
msgid "Service %s is updated"
msgstr ""
-#: heat/engine/service.py:1792
+#: heat/engine/service.py:1884
#, python-format
msgid "Service %s was aborted"
msgstr ""
-#: heat/engine/service.py:1825
+#: heat/engine/service.py:1927
#, python-format
msgid ""
"Engine %(engine)s went down when stack %(stack_id)s was in action "
"%(action)s"
msgstr ""
-#: heat/engine/service_software_config.py:130
-#: heat/engine/service_software_config.py:152
+#: heat/engine/service_software_config.py:131
+#: heat/engine/service_software_config.py:153
#, python-format
msgid "Signal object not found: %(c)s %(o)s"
msgstr ""
-#: heat/engine/stack.py:727
+#: heat/engine/stack.py:832
#, python-format
msgid "Stack %(action)s %(status)s (%(name)s): %(reason)s"
msgstr ""
-#: heat/engine/stack.py:998
+#: heat/engine/stack.py:1142
#, python-format
msgid "convergence_dependencies: %s"
msgstr ""
-#: heat/engine/stack.py:1015
+#: heat/engine/stack.py:1160
#, python-format
-msgid "Triggering resource %(rsrc_id)s for %(is_update)s update"
+msgid "Triggering resource %s for update"
msgstr ""
-#: heat/engine/stack.py:1352
+#: heat/engine/stack.py:1162
+#, python-format
+msgid "Triggering resource %s for cleanup"
+msgstr ""
+
+#: heat/engine/stack.py:1511
#, python-format
msgid ""
"Tried to delete user_creds that do not exist (stack=%(stack)s "
"user_creds_id=%(uc)s)"
msgstr ""
-#: heat/engine/stack.py:1360
+#: heat/engine/stack.py:1519
#, python-format
msgid "Tried to store a stack that does not exist %s"
msgstr ""
-#: heat/engine/stack.py:1451 heat/engine/stack.py:1463
+#: heat/engine/stack.py:1608 heat/engine/stack.py:1620
#, python-format
msgid "Tried to delete stack that does not exist %s "
msgstr ""
-#: heat/engine/stack.py:1481
+#: heat/engine/stack.py:1639
#, python-format
msgid "%s is already suspended"
msgstr ""
-#: heat/engine/stack.py:1506
+#: heat/engine/stack.py:1665
#, python-format
msgid "%s is already resumed"
msgstr ""
-#: heat/engine/stack.py:1688
+#: heat/engine/stack.py:1848
#, python-format
msgid "[%(name)s(%(id)s)] update traversal %(tid)s complete"
msgstr ""
-#: heat/engine/stack_lock.py:81
+#: heat/engine/stack_lock.py:82
#, python-format
msgid ""
"Stale lock detected on stack %(stack)s. Engine %(engine)s will attempt "
"to steal the lock"
msgstr ""
-#: heat/engine/stack_lock.py:90
+#: heat/engine/stack_lock.py:91
#, python-format
msgid "Engine %(engine)s successfully stole the lock on stack %(stack)s"
msgstr ""
-#: heat/engine/stack_lock.py:97
+#: heat/engine/stack_lock.py:98
#, python-format
msgid ""
"The lock on stack %(stack)s was released while engine %(engine)s was "
"stealing it. Trying again"
msgstr ""
-#: heat/engine/stack_lock.py:104
+#: heat/engine/stack_lock.py:105
#, python-format
msgid ""
"Failed to steal lock on stack %(stack)s. Engine %(engine)s stole the lock"
" first"
msgstr ""
-#: heat/engine/update.py:157
+#: heat/engine/update.py:156
#, python-format
msgid "Resource %(res_name)s for stack %(stack_name)s updated"
msgstr ""
-#: heat/engine/watchrule.py:255
+#: heat/engine/watchrule.py:258
#, python-format
msgid "WATCH: stack:%(stack)s, watch_name:%(watch_name)s, new_state:%(new_state)s"
msgstr ""
-#: heat/engine/watchrule.py:261
+#: heat/engine/watchrule.py:264
#, python-format
msgid "no action for new state %s"
msgstr ""
@@ -388,62 +398,22 @@ msgstr ""
msgid "Triggering rollback of %(stack_name)s %(action)s "
msgstr ""
-#: heat/engine/clients/os/cinder.py:65
+#: heat/engine/clients/os/cinder.py:66
#, python-format
msgid "Creating Cinder client with volume API version %d."
msgstr ""
-#: heat/engine/clients/os/cinder.py:96
-#, python-format
-msgid "Volume (%(volume)s) not found: %(ex)s"
-msgstr ""
-
-#: heat/engine/clients/os/cinder.py:104
-#, python-format
-msgid "VolumeSnapshot (%(snapshot)s) not found: %(ex)s"
-msgstr ""
-
-#: heat/engine/clients/os/cinder.py:113
-#, python-format
-msgid "Volume backup (%(backup)s) not found: %(ex)s"
-msgstr ""
-
-#: heat/engine/clients/os/cinder.py:184
+#: heat/engine/clients/os/cinder.py:179
#, python-format
msgid "Attaching volume %(id)s complete"
msgstr ""
-#: heat/engine/clients/os/glance.py:96
-#, python-format
-msgid "Image %s was not found in glance"
-msgstr ""
-
-#: heat/engine/clients/os/glance.py:101
-#, python-format
-msgid "Multiple images %s were found in glance with name"
-msgstr ""
-
-#: heat/engine/clients/os/nova.py:635
+#: heat/engine/clients/os/nova.py:639
#, python-format
msgid "Volume %(vol)s is detached from server %(srv)s"
msgstr ""
-#: heat/engine/clients/os/sahara.py:118
-#, python-format
-msgid "Image %s was not found in sahara images"
-msgstr ""
-
-#: heat/engine/clients/os/sahara.py:123
-#, python-format
-msgid "Multiple images %s were found in sahara with name"
-msgstr ""
-
-#: heat/engine/clients/os/sahara.py:140
-#, python-format
-msgid "Plugin %s was not found in sahara"
-msgstr ""
-
-#: heat/engine/resources/aws/autoscaling/autoscaling_group.py:268
+#: heat/engine/resources/aws/autoscaling/autoscaling_group.py:267
#, python-format
msgid "%(name)s NOT performing scaling adjustment, cooldown %(cooldown)s"
msgstr ""
@@ -454,43 +424,43 @@ msgstr ""
msgid "ElasticIp create %s"
msgstr ""
-#: heat/engine/resources/aws/ec2/instance.py:396
+#: heat/engine/resources/aws/ec2/instance.py:399
#, python-format
msgid "%(name)s._resolve_attribute(%(attname)s) == %(res)s"
msgstr ""
-#: heat/engine/resources/aws/iam/user.py:233
-#: heat/engine/resources/aws/iam/user.py:253
+#: heat/engine/resources/aws/iam/user.py:235
+#: heat/engine/resources/aws/iam/user.py:255
#, python-format
msgid "could not get secret for %(username)s Error:%(msg)s"
msgstr ""
-#: heat/engine/resources/aws/lb/loadbalancer.py:530
+#: heat/engine/resources/aws/lb/loadbalancer.py:529
#, python-format
msgid "Using custom loadbalancer template %s"
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:304
+#: heat/engine/resources/openstack/cinder/volume.py:331
#, python-format
msgid "Resize failed: Volume %(vol)s is in %(status)s state."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:311
+#: heat/engine/resources/openstack/cinder/volume.py:338
#, python-format
msgid "Volume %(id)s resize complete"
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:335
+#: heat/engine/resources/openstack/cinder/volume.py:362
#, python-format
msgid "Restore failed: Volume %(vol)s is in %(status)s state."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:341
+#: heat/engine/resources/openstack/cinder/volume.py:368
#, python-format
msgid "Volume %(id)s backup restore complete"
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:370
+#: heat/engine/resources/openstack/cinder/volume.py:399
msgid "Volume type update not supported by Cinder API V1."
msgstr ""
@@ -509,17 +479,17 @@ msgstr ""
msgid "%(name)s Alarm, restarting resource: %(victim)s"
msgstr ""
-#: heat/engine/resources/openstack/heat/scaling_policy.py:157
+#: heat/engine/resources/openstack/heat/scaling_policy.py:156
#, python-format
msgid "Alarm %(name)s, new state %(state)s"
msgstr ""
-#: heat/engine/resources/openstack/heat/scaling_policy.py:163
+#: heat/engine/resources/openstack/heat/scaling_policy.py:162
#, python-format
msgid "%(name)s NOT performing scaling action, cooldown %(cooldown)s"
msgstr ""
-#: heat/engine/resources/openstack/heat/scaling_policy.py:178
+#: heat/engine/resources/openstack/heat/scaling_policy.py:177
#, python-format
msgid ""
"%(name)s Alarm, adjusting Group %(group)s with id %(asgn_id)s by "
@@ -527,18 +497,18 @@ msgid ""
msgstr ""
#: heat/engine/resources/openstack/heat/swiftsignal.py:325
-#: heat/engine/resources/openstack/heat/wait_condition.py:101
+#: heat/engine/resources/openstack/heat/wait_condition.py:106
#, python-format
msgid "%(name)s Failed (%(failure)s)"
msgstr ""
#: heat/engine/resources/openstack/heat/swiftsignal.py:332
-#: heat/engine/resources/openstack/heat/wait_condition.py:106
+#: heat/engine/resources/openstack/heat/wait_condition.py:111
#, python-format
msgid "%s Succeeded"
msgstr ""
-#: heat/engine/resources/openstack/heat/wait_condition.py:93
+#: heat/engine/resources/openstack/heat/wait_condition.py:98
#, python-format
msgid "%(name)s Timed out (%(timeout)s)"
msgstr ""
@@ -547,7 +517,7 @@ msgstr ""
msgid "Applying access rules to created Share."
msgstr ""
-#: heat/engine/resources/openstack/nova/server_network_mixin.py:59
+#: heat/engine/resources/openstack/nova/server_network_mixin.py:61
#, python-format
msgid ""
"For the server \"%(server)s\" the \"%(uuid)s\" property is set to network"
@@ -555,33 +525,33 @@ msgid ""
"property instead."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:183
+#: heat/engine/resources/openstack/sahara/cluster.py:232
#, python-format
msgid "Cluster \"%s\" is being started."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:195
-#: heat/engine/resources/openstack/trove/trove_cluster.py:195
+#: heat/engine/resources/openstack/sahara/cluster.py:244
+#: heat/engine/resources/openstack/trove/cluster.py:195
#, python-format
msgid "Cluster '%s' has been created"
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:206
+#: heat/engine/resources/openstack/sahara/cluster.py:255
#, python-format
msgid "Cluster '%s' has been deleted"
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:238
+#: heat/engine/resources/openstack/sahara/templates.py:286
#, python-format
msgid "Node Group Template '%s' has been created"
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:427
+#: heat/engine/resources/openstack/sahara/templates.py:546
#, python-format
msgid "Cluster Template '%s' has been created"
msgstr ""
-#: heat/engine/resources/openstack/trove/os_database.py:398
+#: heat/engine/resources/openstack/trove/os_database.py:392
#, python-format
msgid ""
"Database instance %(database)s created "
diff --git a/heat/locale/heat-log-warning.pot b/heat/locale/heat-log-warning.pot
index 3253fb0ae..b8ae85def 100644
--- a/heat/locale/heat-log-warning.pot
+++ b/heat/locale/heat-log-warning.pot
@@ -1,43 +1,43 @@
# Translations template for heat.
-# Copyright (C) 2015 ORGANIZATION
+# Copyright (C) 2016 ORGANIZATION
# This file is distributed under the same license as the heat project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: heat 5.0.0.0b4.dev19\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-09-05 06:03+0000\n"
+"POT-Creation-Date: 2016-01-18 06:34+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.0\n"
+"Generated-By: Babel 2.2.0\n"
#: heat/api/cloudwatch/watch.py:202
#, python-format
msgid "Invalid filter key %s, ignoring"
msgstr ""
-#: heat/api/openstack/v1/stacks.py:290
+#: heat/api/openstack/v1/stacks.py:312
#, python-format
msgid "Old Engine Version: %s"
msgstr ""
-#: heat/common/config.py:318
+#: heat/common/config.py:336
msgid ""
"stack_user_domain_id or stack_user_domain_name not set in heat.conf "
"falling back to using default"
msgstr ""
-#: heat/common/config.py:332
+#: heat/common/config.py:350
msgid "Please update auth_encryption_key to be 32 characters."
msgstr ""
-#: heat/common/context.py:165
+#: heat/common/context.py:179
#, python-format
msgid ""
"Using the keystone_authtoken user as the heat trustee user directly is "
@@ -45,95 +45,100 @@ msgid ""
" of your heat.conf file."
msgstr ""
-#: heat/common/heat_keystoneclient.py:250
+#: heat/common/heat_keystoneclient.py:249
#, python-format
msgid "Truncating the username %s to the last 64 characters."
msgstr ""
-#: heat/common/heat_keystoneclient.py:425
+#: heat/common/heat_keystoneclient.py:424
#, python-format
msgid "Unable to get details for project %s, not deleting"
msgstr ""
-#: heat/common/heat_keystoneclient.py:430
+#: heat/common/heat_keystoneclient.py:429
msgid "Not deleting non heat-domain project"
msgstr ""
-#: heat/common/profiler.py:35
+#: heat/common/profiler.py:36
msgid ""
"OSProfiler is enabled.\n"
"It means that person who knows any of hmac_keys that are specified in "
-"/etc/heat/api-paste.ini can trace his requests. \n"
+"/etc/heat/heat.conf can trace his requests. \n"
"In real life only operator can read this file so there is no security "
"issue. Note that even if person can trigger profiler, only admin user can"
" retrieve trace information.\n"
"To disable OSprofiler set in heat.conf:\n"
"[profiler]\n"
-"enabled=false"
+"profiler_enabled=false"
msgstr ""
-#: heat/common/wsgi.py:434
+#: heat/common/wsgi.py:426
#, python-format
msgid "Unrecognised child %s"
msgstr ""
-#: heat/common/wsgi.py:917
+#: heat/common/wsgi.py:903
msgid "Unable to serialize exception response"
msgstr ""
-#: heat/engine/attributes.py:177 heat/engine/attributes.py:183
-#: heat/engine/attributes.py:188 heat/engine/attributes.py:193
-#: heat/engine/attributes.py:200
+#: heat/engine/attributes.py:168 heat/engine/attributes.py:175
+#: heat/engine/attributes.py:181 heat/engine/attributes.py:187
+#: heat/engine/attributes.py:195
#, python-format
msgid "Attribute %(name)s is not of type %(att_type)s"
msgstr ""
-#: heat/engine/environment.py:242 heat/engine/environment.py:248
+#: heat/engine/environment.py:271 heat/engine/environment.py:277
#, python-format
msgid "Removing %(item)s from %(path)s"
msgstr ""
-#: heat/engine/environment.py:261
+#: heat/engine/environment.py:290
#, python-format
msgid "Changing %(path)s from %(was)s to %(now)s"
msgstr ""
-#: heat/engine/resource.py:1231
+#: heat/engine/resource.py:935
#, python-format
-msgid "db error %s"
+msgid "Resource cannot be updated with it's live state in case of error: %s"
msgstr ""
#: heat/engine/resource.py:1312
#, python-format
+msgid "db error %s"
+msgstr ""
+
+#: heat/engine/resource.py:1398
+#, python-format
msgid "Resource \"%s\" not pre-stored in DB"
msgstr ""
-#: heat/engine/resource.py:1360
+#: heat/engine/resource.py:1450
#, python-format
msgid "Failed to unlock resource %s"
msgstr ""
-#: heat/engine/resource.py:1397
+#: heat/engine/resource.py:1491
#, python-format
msgid "Resolving 'show' attribute has failed : %s"
msgstr ""
-#: heat/engine/resource.py:1586
+#: heat/engine/resource.py:1724
#, python-format
msgid "Resource %s does not implement metadata update"
msgstr ""
-#: heat/engine/service.py:1303
+#: heat/engine/service.py:1433
#, python-format
msgid "Access denied to resource %s"
msgstr ""
-#: heat/engine/service.py:1568
+#: heat/engine/service.py:1695
#, python-format
msgid "show_watch (all) db error %s"
msgstr ""
-#: heat/engine/service.py:1597
+#: heat/engine/service.py:1723
#, python-format
msgid "show_metric (all) db error %s"
msgstr ""
@@ -143,16 +148,44 @@ msgstr ""
msgid "periodic_task db error watch rule removed? %(ex)s"
msgstr ""
-#: heat/engine/stack.py:320
+#: heat/engine/stack.py:368
msgid "Unable to set parameters StackId identifier"
msgstr ""
-#: heat/engine/stack_lock.py:119
+#: heat/engine/stack.py:795
+#, python-format
+msgid ""
+"Failed to set state of stack %(name)s with traversal ID %(trvsl_id)s, to "
+"%(action)s_%(status)s"
+msgstr ""
+
+#: heat/engine/stack.py:1110 heat/engine/stack.py:1136
+#, python-format
+msgid ""
+"Failed to store stack %(name)s with traversal ID %(trvsl_id)s, aborting "
+"stack %(action)s"
+msgstr ""
+
+#: heat/engine/stack.py:1181
+#, python-format
+msgid ""
+"Failed to store stack %(name)s with traversal ID %(trvsl_id)s, not "
+"trigerring rollback."
+msgstr ""
+
+#: heat/engine/stack.py:1874
+#, python-format
+msgid ""
+"Failed to store stack %(name)s with traversal ID %(trvsl_id)s, aborting "
+"stack purge"
+msgstr ""
+
+#: heat/engine/stack_lock.py:120
#, python-format
msgid "Lock was already released on stack %s!"
msgstr ""
-#: heat/engine/watchrule.py:86
+#: heat/engine/watchrule.py:88
#, python-format
msgid "WatchRule.load (%(watch_name)s) db error %(ex)s"
msgstr ""
@@ -162,64 +195,59 @@ msgstr ""
msgid "Could not process watch state %s for stack"
msgstr ""
-#: heat/engine/watchrule.py:360
+#: heat/engine/watchrule.py:359
#, python-format
msgid "Unable to override state %(state)s for watch %(name)s"
msgstr ""
-#: heat/engine/clients/__init__.py:70
+#: heat/engine/clients/__init__.py:81
#, python-format
msgid "Requested client \"%s\" not found"
msgstr ""
-#: heat/engine/clients/os/nova.py:116
-#, python-format
-msgid "Server (%(server)s) not found: %(ex)s"
-msgstr ""
-
-#: heat/engine/clients/os/nova.py:132
+#: heat/engine/clients/os/nova.py:130
#, python-format
msgid ""
"Received an OverLimit response when fetching server (%(id)s) : "
"%(exception)s"
msgstr ""
-#: heat/engine/clients/os/nova.py:139
+#: heat/engine/clients/os/nova.py:137
#, python-format
msgid ""
"Received the following exception when fetching server (%(id)s) : "
"%(exception)s"
msgstr ""
-#: heat/engine/clients/os/nova.py:155
+#: heat/engine/clients/os/nova.py:153
#, python-format
msgid ""
"Server %(name)s (%(id)s) received an OverLimit response during "
"server.get(): %(exception)s"
msgstr ""
-#: heat/engine/clients/os/nova.py:163
+#: heat/engine/clients/os/nova.py:161
#, python-format
msgid ""
"Server \"%(name)s\" (%(id)s) received the following exception during "
"server.get(): %(exception)s"
msgstr ""
-#: heat/engine/clients/os/nova.py:529
+#: heat/engine/clients/os/nova.py:526
#, python-format
msgid "Instance (%(server)s) not found: %(ex)s"
msgstr ""
-#: heat/engine/resources/signal_responder.py:105
+#: heat/engine/resources/signal_responder.py:142
msgid "Cannot generate signed url, unable to create keypair"
msgstr ""
-#: heat/engine/resources/stack_resource.py:182
+#: heat/engine/resources/stack_resource.py:181
#, python-format
msgid "Preview of '%s' not yet implemented"
msgstr ""
-#: heat/engine/resources/stack_user.py:106
+#: heat/engine/resources/stack_user.py:99
msgid "Reverting to legacy user delete path"
msgstr ""
@@ -228,18 +256,18 @@ msgstr ""
msgid "Overwriting Metadata item for id %s!"
msgstr ""
-#: heat/engine/resources/aws/ec2/eip.py:407
+#: heat/engine/resources/aws/ec2/eip.py:380
msgid "Skipping association, resource not specified"
msgstr ""
-#: heat/engine/resources/aws/ec2/instance.py:679
+#: heat/engine/resources/aws/ec2/instance.py:681
#, python-format
msgid ""
"There is no change of \"%(net_interfaces)s\" for instance %(server)s, do "
"nothing when updating."
msgstr ""
-#: heat/engine/resources/aws/ec2/instance.py:810
+#: heat/engine/resources/aws/ec2/instance.py:808
#, python-format
msgid ""
"\"%(subnet)s\" will be ignored if specified \"%(net_interfaces)s\". So if"
@@ -247,56 +275,56 @@ msgid ""
"\"%(subnet)s\" property."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:409
+#: heat/engine/resources/openstack/neutron/port.py:442
#, python-format
msgid "Failed to fetch resource attributes: %s"
msgstr ""
-#: heat/engine/resources/openstack/swift/swift.py:241
+#: heat/engine/resources/openstack/swift/swift.py:240
#, python-format
msgid "Head container failed: %s"
msgstr ""
-#: heat/engine/resources/openstack/trove/os_database.py:373
+#: heat/engine/resources/openstack/trove/cluster.py:169
#, python-format
msgid ""
"Stack %(name)s (%(id)s) received an OverLimit response during "
-"instance.get(): %(exception)s"
+"clusters.get(): %(exception)s"
msgstr ""
-#: heat/engine/resources/openstack/trove/trove_cluster.py:168
+#: heat/engine/resources/openstack/trove/os_database.py:369
#, python-format
msgid ""
"Stack %(name)s (%(id)s) received an OverLimit response during "
-"clusters.get(): %(exception)s"
+"instance.get(): %(exception)s"
msgstr ""
-#: heat/tests/generic_resource.py:44
+#: heat/tests/generic_resource.py:42
#, python-format
msgid "Creating generic resource (Type \"%s\")"
msgstr ""
-#: heat/tests/generic_resource.py:48
+#: heat/tests/generic_resource.py:46
#, python-format
msgid "Updating generic resource (Type \"%s\")"
msgstr ""
-#: heat/tests/generic_resource.py:52
+#: heat/tests/generic_resource.py:50
#, python-format
msgid "Deleting generic resource (Type \"%s\")"
msgstr ""
-#: heat/tests/generic_resource.py:59
+#: heat/tests/generic_resource.py:57
#, python-format
msgid "Suspending generic resource (Type \"%s\")"
msgstr ""
-#: heat/tests/generic_resource.py:63
+#: heat/tests/generic_resource.py:61
#, python-format
msgid "Resuming generic resource (Type \"%s\")"
msgstr ""
-#: heat/tests/generic_resource.py:166
+#: heat/tests/generic_resource.py:192
#, python-format
msgid "Signaled resource (Type \"%(type)s\") %(details)s"
msgstr ""
diff --git a/heat/locale/heat.pot b/heat/locale/heat.pot
index 4726e27b0..b57edb82c 100644
--- a/heat/locale/heat.pot
+++ b/heat/locale/heat.pot
@@ -1,53 +1,53 @@
# Translations template for heat.
-# Copyright (C) 2015 ORGANIZATION
+# Copyright (C) 2016 ORGANIZATION
# This file is distributed under the same license as the heat project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:02+0000\n"
+"POT-Creation-Date: 2016-01-18 06:33+0000\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
+"Generated-By: Babel 2.2.0\n"
#: heat/api/aws/ec2token.py:34
msgid "Authentication Endpoint URI."
msgstr ""
-#: heat/api/aws/ec2token.py:37 heat/common/config.py:245
+#: heat/api/aws/ec2token.py:37 heat/common/config.py:259
msgid "Allow orchestration of multiple clouds."
msgstr ""
-#: heat/api/aws/ec2token.py:40 heat/common/config.py:248
+#: heat/api/aws/ec2token.py:40 heat/common/config.py:262
msgid ""
"Allowed keystone endpoints for auth_uri when multi_cloud is enabled. At "
"least one endpoint needs to be specified."
msgstr ""
-#: heat/api/aws/ec2token.py:45 heat/common/config.py:262
-#: heat/common/config.py:282
+#: heat/api/aws/ec2token.py:45 heat/common/config.py:276
+#: heat/common/config.py:296
msgid "Optional PEM-formatted certificate chain file."
msgstr ""
-#: heat/api/aws/ec2token.py:48 heat/common/config.py:264
-#: heat/common/config.py:284
+#: heat/api/aws/ec2token.py:48 heat/common/config.py:278
+#: heat/common/config.py:298
msgid "Optional PEM-formatted file that contains the private key."
msgstr ""
-#: heat/api/aws/ec2token.py:52 heat/common/config.py:260
-#: heat/common/config.py:280
+#: heat/api/aws/ec2token.py:52 heat/common/config.py:274
+#: heat/common/config.py:294
msgid "Optional CA cert file to use in SSL connections."
msgstr ""
-#: heat/api/aws/ec2token.py:55 heat/common/config.py:268
-#: heat/common/config.py:287
+#: heat/api/aws/ec2token.py:55 heat/common/config.py:282
+#: heat/common/config.py:301
msgid "If set, then the server's certificate will not be verified."
msgstr ""
@@ -237,7 +237,7 @@ msgstr ""
msgid "No template specified"
msgstr ""
-#: heat/api/openstack/v1/stacks.py:596
+#: heat/api/openstack/v1/stacks.py:603
#, python-format
msgid "Template type is not supported: %s"
msgstr ""
@@ -278,26 +278,30 @@ msgstr ""
msgid "Dead engines are removed."
msgstr ""
-#: heat/cmd/manage.py:118
+#: heat/cmd/manage.py:132
msgid "How long to preserve deleted data."
msgstr ""
-#: heat/cmd/manage.py:122
+#: heat/cmd/manage.py:137
msgid "Granularity to use for age argument, defaults to days."
msgstr ""
-#: heat/cmd/manage.py:129
+#: heat/cmd/manage.py:145
msgid ""
"Valid values are encrypt or decrypt. The heat-engine processes must be "
"stopped to use this."
msgstr ""
-#: heat/cmd/manage.py:135
+#: heat/cmd/manage.py:152
msgid ""
"Provide old encryption key. New encryption key would be used from config "
"file."
msgstr ""
+#: heat/cmd/manage.py:158
+msgid "Stack resource id"
+msgstr ""
+
#: heat/common/auth_url.py:41
msgid "Request missing required header X-Auth-Url"
msgstr ""
@@ -307,13 +311,13 @@ msgstr ""
msgid "Header X-Auth-Url \"%s\" not an allowed endpoint"
msgstr ""
-#: heat/common/cache.py:40
+#: heat/common/cache.py:41
msgid ""
"TTL, in seconds, for any cached item in the dogpile.cache region used for"
" caching of validation constraints."
msgstr ""
-#: heat/common/cache.py:45
+#: heat/common/cache.py:46
msgid ""
"Toggle to enable/disable caching when Orchestration Engine validates "
"property constraints of stack.During property validation with constraints"
@@ -322,156 +326,186 @@ msgid ""
"group) must be enabled to use this feature."
msgstr ""
-#: heat/common/config.py:33
+#: heat/common/cache.py:61
+msgid ""
+"TTL, in seconds, for any cached item in the dogpile.cache region used for"
+" caching of service extensions."
+msgstr ""
+
+#: heat/common/cache.py:66
+msgid ""
+"Toggle to enable/disable caching when Orchestration Engine retrieves "
+"extensions from other OpenStack services. Please note that the global "
+"toggle for oslo.cache(enabled=True in [cache] group) must be enabled to "
+"use this feature."
+msgstr ""
+
+#: heat/common/config.py:31
msgid "The flavor to use."
msgstr ""
-#: heat/common/config.py:35
+#: heat/common/config.py:33
msgid "The API paste config file to use."
msgstr ""
-#: heat/common/config.py:41
+#: heat/common/config.py:39
msgid "Seconds between running periodic tasks."
msgstr ""
-#: heat/common/config.py:44
+#: heat/common/config.py:42
msgid "URL of the Heat metadata server."
msgstr ""
-#: heat/common/config.py:46
+#: heat/common/config.py:44
msgid "URL of the Heat waitcondition server."
msgstr ""
-#: heat/common/config.py:49
+#: heat/common/config.py:47
msgid "URL of the Heat CloudWatch server."
msgstr ""
-#: heat/common/config.py:52
+#: heat/common/config.py:50
msgid "Instance connection to CFN/CW API via https."
msgstr ""
-#: heat/common/config.py:55
+#: heat/common/config.py:53
msgid "Instance connection to CFN/CW API validate certs if SSL is used."
msgstr ""
-#: heat/common/config.py:58
+#: heat/common/config.py:56
msgid "Default region name used to get services endpoints."
msgstr ""
-#: heat/common/config.py:61
+#: heat/common/config.py:59
msgid "Keystone role for heat template-defined users."
msgstr ""
-#: heat/common/config.py:65
+#: heat/common/config.py:63
msgid ""
"Keystone domain ID which contains heat template-defined users. If this "
"option is set, stack_user_domain_name option will be ignored."
msgstr ""
-#: heat/common/config.py:69
+#: heat/common/config.py:67
msgid ""
"Keystone domain name which contains heat template-defined users. If "
"`stack_user_domain_id` option is set, this option is ignored."
msgstr ""
-#: heat/common/config.py:73
+#: heat/common/config.py:71
msgid ""
"Keystone username, a user with roles sufficient to manage users and "
"projects in the stack_user_domain."
msgstr ""
-#: heat/common/config.py:77
+#: heat/common/config.py:75
msgid "Keystone password for stack_domain_admin user."
msgstr ""
-#: heat/common/config.py:80
+#: heat/common/config.py:78
msgid "Maximum raw byte size of any template."
msgstr ""
-#: heat/common/config.py:83
+#: heat/common/config.py:81
msgid "Maximum depth allowed when using nested stacks."
msgstr ""
-#: heat/common/config.py:86
+#: heat/common/config.py:83
msgid "Number of heat-engine processes to fork and run."
msgstr ""
-#: heat/common/config.py:92
+#: heat/common/config.py:89
msgid "List of directories to search for plug-ins."
msgstr ""
-#: heat/common/config.py:95
+#: heat/common/config.py:92
msgid "The directory to search for environment files."
msgstr ""
-#: heat/common/config.py:99
+#: heat/common/config.py:96
msgid "Select deferred auth method, stored password or trusts."
msgstr ""
-#: heat/common/config.py:103
+#: heat/common/config.py:101
+msgid ""
+"Allow reauthentication on token expiry, such that long-running tasks may "
+"complete. Note this defeats the expiry of any provided user tokens."
+msgstr ""
+
+#: heat/common/config.py:106
+msgid "Gap, in seconds, to determine whether the given token is about to expire."
+msgstr ""
+
+#: heat/common/config.py:110
msgid ""
"Subset of trustor roles to be delegated to heat. If left unset, all roles"
" of a user will be delegated to heat when creating a stack."
msgstr ""
-#: heat/common/config.py:108
+#: heat/common/config.py:115
msgid "Maximum resources allowed per top-level stack. -1 stands for unlimited."
msgstr ""
-#: heat/common/config.py:112
+#: heat/common/config.py:119
msgid "Maximum number of stacks any one tenant may have active at one time."
msgstr ""
-#: heat/common/config.py:116
+#: heat/common/config.py:123
msgid ""
"Number of times to retry to bring a resource to a non-error state. Set to"
" 0 to disable retries."
msgstr ""
-#: heat/common/config.py:121
+#: heat/common/config.py:128
msgid ""
"Controls how many events will be pruned whenever a stack's events exceed "
"max_events_per_stack. Set this lower to keep more events at the expense "
"of more frequent purges."
msgstr ""
-#: heat/common/config.py:127
+#: heat/common/config.py:134
msgid ""
"Maximum events that will be available per stack. Older events will be "
"deleted when this is reached. Set to 0 for unlimited events per stack."
msgstr ""
-#: heat/common/config.py:132
+#: heat/common/config.py:139
msgid "Timeout in seconds for stack action (ie. create or update)."
msgstr ""
-#: heat/common/config.py:136
+#: heat/common/config.py:143
msgid "Error wait time in seconds for stack action (ie. create or update)."
msgstr ""
-#: heat/common/config.py:140
+#: heat/common/config.py:147
msgid "RPC timeout for the engine liveness check that is used for stack locking."
msgstr ""
-#: heat/common/config.py:144
+#: heat/common/config.py:151
msgid "Enable the legacy OS::Heat::CWLiteAlarm resource."
msgstr ""
-#: heat/common/config.py:147
+#: heat/common/config.py:154
msgid "Enable the preview Stack Abandon feature."
msgstr ""
-#: heat/common/config.py:150
+#: heat/common/config.py:157
msgid "Enable the preview Stack Adopt feature."
msgstr ""
-#: heat/common/config.py:153
+#: heat/common/config.py:160
msgid ""
"Enables engine with convergence architecture. All stacks with this option"
-" will be created using convergence engine ."
+" will be created using convergence engine."
+msgstr ""
+
+#: heat/common/config.py:165
+msgid ""
+"On update, enables heat to collect existing resource properties from "
+"reality and converge to updated template."
msgstr ""
-#: heat/common/config.py:162
+#: heat/common/config.py:174
msgid ""
"Template default for how the server should receive the metadata required "
"for software configuration. POLL_SERVER_CFN will allow calls to the cfn "
@@ -485,7 +519,7 @@ msgid ""
"metadata for polling."
msgstr ""
-#: heat/common/config.py:182
+#: heat/common/config.py:194
msgid ""
"Template default for how the server should signal to heat with the "
"deployment output values. CFN_SIGNAL will allow an HTTP POST to a CFN "
@@ -497,17 +531,17 @@ msgid ""
" provided keystone credentials."
msgstr ""
-#: heat/common/config.py:196
+#: heat/common/config.py:208
msgid ""
"Stacks containing these tag names will be hidden. Multiple tags should be"
" given in a comma-delimited list (eg. hidden_stack_tags=hide_me,me_too)."
msgstr ""
-#: heat/common/config.py:200
+#: heat/common/config.py:212
msgid "Deprecated."
msgstr ""
-#: heat/common/config.py:203
+#: heat/common/config.py:215
msgid ""
"When this feature is enabled, scheduler hints identifying the heat stack "
"context of a server or volume resource are passed to the configured "
@@ -522,68 +556,73 @@ msgid ""
"heat_resource_uuid will be set to the resource's orchestration id."
msgstr ""
-#: heat/common/config.py:221
+#: heat/common/config.py:233
msgid ""
"Encrypt template parameters that were marked as hidden and also all the "
"resource properties before storing them in database."
msgstr ""
-#: heat/common/config.py:228
+#: heat/common/config.py:240
msgid ""
"Name of the engine node. This can be an opaque identifier. It is not "
"necessarily a hostname, FQDN, or IP address."
msgstr ""
-#: heat/common/config.py:236
+#: heat/common/config.py:248
msgid "If False fully disable profiling feature."
msgstr ""
-#: heat/common/config.py:238
+#: heat/common/config.py:250
msgid "If False do not trace SQL requests."
msgstr ""
-#: heat/common/config.py:256 heat/common/config.py:276
+#: heat/common/config.py:252
+msgid "Secret key to use to sign tracing messages."
+msgstr ""
+
+#: heat/common/config.py:270 heat/common/config.py:290
msgid ""
"Type of endpoint in Identity service catalog to use for communication "
"with the OpenStack service."
msgstr ""
-#: heat/common/config.py:293
+#: heat/common/config.py:307
#, python-format
msgid "Optional heat url in format like http://0.0.0.0:8004/v1/%(tenant_id)s."
msgstr ""
-#: heat/common/config.py:299
+#: heat/common/config.py:313
msgid "Unversioned keystone url in format like http://0.0.0.0:5000."
msgstr ""
-#: heat/common/config.py:305
+#: heat/common/config.py:319
msgid "Allow client's debug log output."
msgstr ""
-#: heat/common/config.py:311
+#: heat/common/config.py:325
msgid ""
"Heat build revision. If you would prefer to manage your build revision "
"separately, you can move this section to a different file and add it as "
"another config option."
msgstr ""
-#: heat/common/config.py:328
+#: heat/common/config.py:342
msgid ""
"heat.conf misconfigured, cannot specify \"stack_user_domain_id\" or "
"\"stack_user_domain_name\" without \"stack_domain_admin\" and "
"\"stack_domain_admin_password\""
msgstr ""
-#: heat/common/config.py:338
+#: heat/common/config.py:352
msgid "heat.conf misconfigured, auth_encryption_key must be 32 characters"
msgstr ""
-#: heat/common/config.py:415
-msgid "Unable to locate config file"
+#: heat/common/config.py:429
+#, python-format
+msgid "Unable to locate config file [%s]"
msgstr ""
-#: heat/common/config.py:427
+#: heat/common/config.py:442
#, python-format
msgid ""
"Unable to load %(app_name)s from configuration file %(conf_file)s.\n"
@@ -609,355 +648,284 @@ msgstr ""
msgid "environment has wrong section \"%s\""
msgstr ""
-#: heat/common/exception.py:57
+#: heat/common/exception.py:42
msgid "An unknown exception occurred."
msgstr ""
-#: heat/common/exception.py:84
+#: heat/common/exception.py:73
#, python-format
msgid "Missing required credential: %(required)s"
msgstr ""
-#: heat/common/exception.py:88
-#, python-format
-msgid ""
-"Incorrect auth strategy, expected \"%(expected)s\" but received "
-"\"%(received)s\""
-msgstr ""
-
-#: heat/common/exception.py:93
-#, python-format
-msgid "Connect error/bad request to Auth service at URL %(url)s."
-msgstr ""
-
-#: heat/common/exception.py:97
-#, python-format
-msgid "Auth service at URL %(url)s not found."
-msgstr ""
-
-#: heat/common/exception.py:101
+#: heat/common/exception.py:77
msgid "Authorization failed."
msgstr ""
-#: heat/common/exception.py:105
+#: heat/common/exception.py:81
msgid "You are not authenticated."
msgstr ""
-#: heat/common/exception.py:109
+#: heat/common/exception.py:85
#, python-format
msgid "You are not authorized to use %(action)s."
msgstr ""
-#: heat/common/exception.py:117
+#: heat/common/exception.py:93
msgid "You are not authorized to complete this action."
msgstr ""
-#: heat/common/exception.py:121
+#: heat/common/exception.py:97
#, python-format
msgid "Data supplied was not valid: %(reason)s"
msgstr ""
-#: heat/common/exception.py:125
-#, python-format
-msgid "Redirecting to %(uri)s for authorization."
-msgstr ""
-
-#: heat/common/exception.py:129
-msgid "The URI was too long."
-msgstr ""
-
-#: heat/common/exception.py:133
-#, python-format
-msgid "Maximum redirects (%(redirects)s) was exceeded."
-msgstr ""
-
-#: heat/common/exception.py:137
-msgid "Received invalid HTTP redirect."
-msgstr ""
-
-#: heat/common/exception.py:141
-#, python-format
-msgid ""
-"Multiple 'image' service matches for region %(region)s. This generally "
-"means that a region is required and you have not supplied one."
-msgstr ""
-
-#: heat/common/exception.py:147
+#: heat/common/exception.py:101
#, python-format
msgid "The Parameter (%(key)s) was not provided."
msgstr ""
-#: heat/common/exception.py:151
+#: heat/common/exception.py:105
#, python-format
msgid "The Parameter (%(key)s) was not defined in template."
msgstr ""
-#: heat/common/exception.py:155
+#: heat/common/exception.py:109
#, python-format
msgid "The template version is invalid: %(explanation)s"
msgstr ""
-#: heat/common/exception.py:159
+#: heat/common/exception.py:113
#, python-format
msgid "The template section is invalid: %(section)s"
msgstr ""
-#: heat/common/exception.py:163
+#: heat/common/exception.py:117
#, python-format
msgid "The Parameter (%(key)s) has no attributes."
msgstr ""
-#: heat/common/exception.py:167
+#: heat/common/exception.py:121
#, python-format
msgid "The Referenced Attribute (%(resource)s %(key)s) is incorrect."
msgstr ""
-#: heat/common/exception.py:172
+#: heat/common/exception.py:126
#, python-format
msgid "The specified reference \"%(resource)s\" (in %(key)s) is incorrect."
msgstr ""
-#: heat/common/exception.py:177
-#, python-format
-msgid "The Key (%(key_name)s) could not be found."
-msgstr ""
-
-#: heat/common/exception.py:181
-#, python-format
-msgid "The Flavor ID (%(flavor_id)s) could not be found."
-msgstr ""
-
-#: heat/common/exception.py:185
+#: heat/common/exception.py:131
#, python-format
msgid "The %(entity)s (%(name)s) could not be found."
msgstr ""
-#: heat/common/exception.py:189
-#, python-format
-msgid "The Nova network (%(network)s) could not be found."
-msgstr ""
-
-#: heat/common/exception.py:193
+#: heat/common/exception.py:135
#, python-format
msgid "Multiple physical resources were found with name (%(name)s)."
msgstr ""
-#: heat/common/exception.py:198
+#: heat/common/exception.py:140
#, python-format
msgid "Searching Tenant %(target)s from Tenant %(actual)s forbidden."
msgstr ""
-#: heat/common/exception.py:203
-#, python-format
-msgid "The Stack (%(stack_name)s) could not be found."
-msgstr ""
-
-#: heat/common/exception.py:207
+#: heat/common/exception.py:145
#, python-format
msgid "The Stack (%(stack_name)s) already exists."
msgstr ""
-#: heat/common/exception.py:211
+#: heat/common/exception.py:149
#, python-format
msgid "%(error)s%(path)s%(message)s"
msgstr ""
-#: heat/common/exception.py:253 heat/common/exception.py:267
-#: heat/common/exception.py:275 heat/common/exception.py:279
+#: heat/common/exception.py:191 heat/common/exception.py:210
#, python-format
msgid "%(message)s"
msgstr ""
-#: heat/common/exception.py:257
+#: heat/common/exception.py:195
#, python-format
msgid ""
"The Resource (%(resource_name)s) could not be found in Stack "
"%(stack_name)s."
msgstr ""
-#: heat/common/exception.py:262
+#: heat/common/exception.py:200
#, python-format
msgid "The Snapshot (%(snapshot)s) for Stack (%(stack)s) could not be found."
msgstr ""
-#: heat/common/exception.py:271
+#: heat/common/exception.py:205
#, python-format
-msgid "The Resource Type (%(type_name)s) could not be found."
+msgid ""
+"There was an error loading the definition of the global resource type "
+"%(type_name)s."
msgstr ""
-#: heat/common/exception.py:283
+#: heat/common/exception.py:214
#, python-format
msgid "The Resource (%(resource_name)s) is not available."
msgstr ""
-#: heat/common/exception.py:287
-#, python-format
-msgid "The Resource (%(resource_id)s) could not be found."
-msgstr ""
-
-#: heat/common/exception.py:291
+#: heat/common/exception.py:219
#, python-format
msgid "The Watch Rule (%(watch_name)s) could not be found."
msgstr ""
-#: heat/common/exception.py:354
+#: heat/common/exception.py:282
#, python-format
msgid "%(feature)s is not supported."
msgstr ""
-#: heat/common/exception.py:358
+#: heat/common/exception.py:286
#, python-format
msgid "%(action)s is not supported for resource."
msgstr ""
-#: heat/common/exception.py:362
+#: heat/common/exception.py:290
#, python-format
msgid "Cannot define the following properties at the same time: %(props)s."
msgstr ""
-#: heat/common/exception.py:372
+#: heat/common/exception.py:300
#, python-format
msgid "%(prop1)s cannot be specified without %(prop2)s."
msgstr ""
-#: heat/common/exception.py:376
+#: heat/common/exception.py:304
#, python-format
msgid ""
"%(prop1)s property should only be specified for %(prop2)s with value "
"%(value)s."
msgstr ""
-#: heat/common/exception.py:381
+#: heat/common/exception.py:309
#, python-format
msgid "At least one of the following properties must be specified: %(props)s"
msgstr ""
-#: heat/common/exception.py:393
+#: heat/common/exception.py:321
#, python-format
msgid "The Resource %s requires replacement."
msgstr ""
-#: heat/common/exception.py:398
+#: heat/common/exception.py:326
#, python-format
msgid ""
"%(result)s - Unknown status %(resource_status)s due to "
"\"%(status_reason)s\""
msgstr ""
-#: heat/common/exception.py:401
+#: heat/common/exception.py:329
msgid "Resource failed"
msgstr ""
-#: heat/common/exception.py:402 heat/common/exception.py:411
-#: heat/engine/clients/os/nova.py:225 heat/engine/clients/os/nova.py:226
+#: heat/common/exception.py:330 heat/common/exception.py:339
+#: heat/engine/clients/os/nova.py:219 heat/engine/clients/os/nova.py:220
+#: heat/engine/resources/openstack/trove/cluster.py:190
#: heat/engine/resources/openstack/trove/os_database.py:388
-#: heat/engine/resources/openstack/trove/trove_cluster.py:190
msgid "Unknown"
msgstr ""
-#: heat/common/exception.py:408
+#: heat/common/exception.py:336
#, python-format
msgid "Went to status %(resource_status)s due to \"%(status_reason)s\""
msgstr ""
-#: heat/common/exception.py:418
+#: heat/common/exception.py:346
#, python-format
msgid "The resource %s is already being updated."
msgstr ""
-#: heat/common/exception.py:434
+#: heat/common/exception.py:362
msgid ""
"Egress rules are only allowed when Neutron is used and the 'VpcId' "
"property is set."
msgstr ""
-#: heat/common/exception.py:446
+#: heat/common/exception.py:374
msgid "Not found"
msgstr ""
-#: heat/common/exception.py:452
+#: heat/common/exception.py:380
#, python-format
msgid "Invalid content type %(content_type)s"
msgstr ""
-#: heat/common/exception.py:456
+#: heat/common/exception.py:384
#, python-format
msgid "Request limit exceeded: %(message)s"
msgstr ""
-#: heat/common/exception.py:460
+#: heat/common/exception.py:388
msgid "Maximum resources per stack exceeded."
msgstr ""
-#: heat/common/exception.py:464
+#: heat/common/exception.py:392
#, python-format
msgid "Stack %(stack_name)s already has an action (%(action)s) in progress."
msgstr ""
-#: heat/common/exception.py:469
+#: heat/common/exception.py:397
#, python-format
msgid "Failed to stop stack (%(stack_name)s) on other engine (%(engine_id)s)"
msgstr ""
-#: heat/common/exception.py:474
+#: heat/common/exception.py:402
#, python-format
msgid ""
"Failed to send message to stack (%(stack_name)s) on other engine "
"(%(engine_id)s)"
msgstr ""
-#: heat/common/exception.py:479
-#, python-format
-msgid "Service %(service_id)s not found"
-msgstr ""
-
-#: heat/common/exception.py:483
+#: heat/common/exception.py:407
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: heat/common/exception.py:487
+#: heat/common/exception.py:411
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: heat/common/exception.py:491
+#: heat/common/exception.py:415
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: heat/common/exception.py:495
+#: heat/common/exception.py:419
#, python-format
msgid "Object action %(action)s failed because: %(reason)s"
msgstr ""
-#: heat/common/exception.py:499
+#: heat/common/exception.py:423
#, python-format
msgid "Cannot modify readonly field %(field)s"
msgstr ""
-#: heat/common/exception.py:503
+#: heat/common/exception.py:427
#, python-format
msgid "Concurrent transaction for deployments of server %(server)s"
msgstr ""
-#: heat/common/exception.py:507
+#: heat/common/exception.py:431
#, python-format
msgid "Field %(field)s of %(objname)s is not an instance of Field"
msgstr ""
-#: heat/common/exception.py:511
+#: heat/common/exception.py:435
#, python-format
msgid ""
"Keystone has more than one service with same name %(service)s. Please use"
" service id instead of name"
msgstr ""
-#: heat/common/exception.py:516
+#: heat/common/exception.py:440
msgid "System SIGHUP signal received."
msgstr ""
-#: heat/common/exception.py:520
+#: heat/common/exception.py:444
#, python-format
msgid ""
"Service %(service_name)s does not have required endpoint in service "
@@ -1020,7 +988,7 @@ msgstr ""
msgid "Unknown attribute \"%s\""
msgstr ""
-#: heat/common/identifier.py:178 heat/engine/resource.py:173
+#: heat/common/identifier.py:178 heat/engine/resource.py:170
msgid "Resource name may not contain \"/\""
msgstr ""
@@ -1100,89 +1068,89 @@ msgstr ""
msgid "Failed to retrieve template: %s"
msgstr ""
-#: heat/common/wsgi.py:62 heat/common/wsgi.py:100 heat/common/wsgi.py:138
+#: heat/common/wsgi.py:61 heat/common/wsgi.py:99 heat/common/wsgi.py:137
msgid ""
"Address to bind the server. Useful when selecting a particular network "
"interface."
msgstr ""
-#: heat/common/wsgi.py:66 heat/common/wsgi.py:104 heat/common/wsgi.py:142
+#: heat/common/wsgi.py:65 heat/common/wsgi.py:103 heat/common/wsgi.py:141
msgid "The port on which the server will listen."
msgstr ""
-#: heat/common/wsgi.py:69 heat/common/wsgi.py:107 heat/common/wsgi.py:145
+#: heat/common/wsgi.py:68 heat/common/wsgi.py:106 heat/common/wsgi.py:144
msgid "Number of backlog requests to configure the socket with."
msgstr ""
-#: heat/common/wsgi.py:73 heat/common/wsgi.py:111 heat/common/wsgi.py:149
+#: heat/common/wsgi.py:72 heat/common/wsgi.py:110 heat/common/wsgi.py:148
msgid "Location of the SSL certificate file to use for SSL mode."
msgstr ""
-#: heat/common/wsgi.py:77 heat/common/wsgi.py:115 heat/common/wsgi.py:153
+#: heat/common/wsgi.py:76 heat/common/wsgi.py:114 heat/common/wsgi.py:152
msgid "Location of the SSL key file to use for enabling SSL mode."
msgstr ""
-#: heat/common/wsgi.py:81 heat/common/wsgi.py:119 heat/common/wsgi.py:157
+#: heat/common/wsgi.py:80 heat/common/wsgi.py:118 heat/common/wsgi.py:156
msgid "Number of workers for Heat service."
msgstr ""
-#: heat/common/wsgi.py:84 heat/common/wsgi.py:122
+#: heat/common/wsgi.py:83 heat/common/wsgi.py:121
msgid ""
"Maximum line size of message headers to be accepted. max_header_line may "
"need to be increased when using large tokens (typically those generated "
"by the Keystone v3 API with big service catalogs)."
msgstr ""
-#: heat/common/wsgi.py:89 heat/common/wsgi.py:127 heat/common/wsgi.py:165
+#: heat/common/wsgi.py:88 heat/common/wsgi.py:126 heat/common/wsgi.py:164
msgid ""
"The value for the socket option TCP_KEEPIDLE. This is the time in "
"seconds that the connection must be idle before TCP starts sending "
"keepalive probes."
msgstr ""
-#: heat/common/wsgi.py:160
+#: heat/common/wsgi.py:159
msgid ""
"Maximum line size of message headers to be accepted. max_header_line may "
"need to be increased when using large tokens (typically those generated "
"by the Keystone v3 API with big service catalogs.)"
msgstr ""
-#: heat/common/wsgi.py:177
+#: heat/common/wsgi.py:176
msgid "If False, closes the client socket connection explicitly."
msgstr ""
-#: heat/common/wsgi.py:180
+#: heat/common/wsgi.py:179
msgid ""
"Timeout for client connections' socket operations. If an incoming "
"connection is idle for this number of seconds it will be closed. A value "
"of '0' means wait forever."
msgstr ""
-#: heat/common/wsgi.py:191
+#: heat/common/wsgi.py:190
msgid ""
"Maximum raw byte size of JSON request body. Should be larger than "
"max_template_size."
msgstr ""
-#: heat/common/wsgi.py:233
+#: heat/common/wsgi.py:232
msgid ""
"When running server in SSL mode, you must specify both a cert_file and "
"key_file option value in your configuration file"
msgstr ""
-#: heat/common/wsgi.py:249
+#: heat/common/wsgi.py:248
#, python-format
msgid "Could not bind to %(bind_addr)safter trying for 30 seconds"
msgstr ""
-#: heat/common/wsgi.py:772
+#: heat/common/wsgi.py:771
#, python-format
msgid ""
"JSON body size (%(len)s bytes) exceeds maximum allowed size (%(limit)s "
"bytes)."
msgstr ""
-#: heat/common/wsgi.py:844
+#: heat/common/wsgi.py:843
msgid ""
"The server could not comply with the request since it is either malformed"
" or otherwise incorrect."
@@ -1225,53 +1193,53 @@ msgstr ""
msgid "Attempt to delete a stack with id: %(id)s %(msg)s"
msgstr ""
-#: heat/db/sqlalchemy/api.py:636
+#: heat/db/sqlalchemy/api.py:638
msgid "Length of OS_PASSWORD after encryption exceeds Heat limit (255 chars)"
msgstr ""
-#: heat/db/sqlalchemy/api.py:670
+#: heat/db/sqlalchemy/api.py:672
#, python-format
msgid "Attempt to delete user creds with id %(id)s that does not exist"
msgstr ""
-#: heat/db/sqlalchemy/api.py:824
+#: heat/db/sqlalchemy/api.py:826
#, python-format
msgid "Attempt to update a watch with id: %(id)s %(msg)s"
msgstr ""
-#: heat/db/sqlalchemy/api.py:835
+#: heat/db/sqlalchemy/api.py:837
#, python-format
msgid "Attempt to delete watch_rule: %(id)s %(msg)s"
msgstr ""
-#: heat/db/sqlalchemy/api.py:880
+#: heat/db/sqlalchemy/api.py:882
#, python-format
msgid "Software config with id %s not found"
msgstr ""
-#: heat/db/sqlalchemy/api.py:919
+#: heat/db/sqlalchemy/api.py:921
#, python-format
msgid "Deployment with id %s not found"
msgstr ""
-#: heat/db/sqlalchemy/api.py:962
+#: heat/db/sqlalchemy/api.py:964
#, python-format
msgid "Snapshot with id %s not found"
msgstr ""
-#: heat/db/sqlalchemy/api.py:1043
+#: heat/db/sqlalchemy/api.py:1045
msgid "age should be an integer"
msgstr ""
-#: heat/db/sqlalchemy/api.py:1045
+#: heat/db/sqlalchemy/api.py:1047
msgid "age should be a positive integer"
msgstr ""
-#: heat/db/sqlalchemy/api.py:1049
+#: heat/db/sqlalchemy/api.py:1051
msgid "granularity should be days, hours, minutes, or seconds"
msgstr ""
-#: heat/db/sqlalchemy/api.py:1158
+#: heat/db/sqlalchemy/api.py:1160
msgid "Cannot migrate to lower schema version."
msgstr ""
@@ -1295,16 +1263,16 @@ msgstr ""
msgid "Invalid tag, \"%s\" contains a comma"
msgstr ""
-#: heat/engine/attributes.py:197
+#: heat/engine/attributes.py:202
#, python-format
msgid "%(resource)s: Invalid attribute %(key)s"
msgstr ""
-#: heat/engine/attributes.py:269
+#: heat/engine/attributes.py:274
msgid "Can't traverse attribute path"
msgstr ""
-#: heat/engine/attributes.py:272
+#: heat/engine/attributes.py:277
msgid "Path components in attributes must be strings"
msgstr ""
@@ -1427,85 +1395,89 @@ msgstr ""
msgid "\"%(value)s\" does not validate %(name)s"
msgstr ""
-#: heat/engine/constraints.py:580
+#: heat/engine/constraints.py:582
#, python-format
msgid "Error validating value '%(value)s'"
msgstr ""
-#: heat/engine/constraints.py:581
+#: heat/engine/constraints.py:583
#, python-format
msgid "Error validating value '%(value)s': %(message)s"
msgstr ""
+#: heat/engine/constraints.py:631
+msgid "Client name and resource getter name must be specified."
+msgstr ""
+
#: heat/engine/dependencies.py:24
#, python-format
msgid "Circular Dependency Found: %(cycle)s"
msgstr ""
-#: heat/engine/environment.py:54
+#: heat/engine/environment.py:58
#, python-format
msgid ""
"Invalid hook type \"%(value)s\" for resource breakpoint, acceptable hook "
"types are: %(types)s"
msgstr ""
-#: heat/engine/environment.py:279
+#: heat/engine/environment.py:306
#, python-format
msgid "%(p)s Registered: %(t)s"
msgstr ""
-#: heat/engine/environment.py:422 heat/tests/test_resource.py:185
+#: heat/engine/environment.py:461 heat/tests/test_resource.py:186
#, python-format
msgid "Resource \"%s\" has no type"
msgstr ""
-#: heat/engine/environment.py:425
+#: heat/engine/environment.py:464
#, python-format
msgid "Non-empty resource type is required for resource \"%s\""
msgstr ""
-#: heat/engine/environment.py:429
+#: heat/engine/environment.py:468
#, python-format
msgid "Resource \"%s\" type is not a string"
msgstr ""
-#: heat/engine/environment.py:463
+#: heat/engine/environment.py:504
#, python-format
msgid "Invalid support status and should be one of %s"
msgstr ""
-#: heat/engine/event.py:60
+#: heat/engine/event.py:59
#, python-format
msgid "No event exists with id \"%s\""
msgstr ""
-#: heat/engine/parameter_groups.py:48 heat/engine/parameter_groups.py:58
-#: heat/engine/parameter_groups.py:65 heat/engine/parameter_groups.py:74
-#: heat/engine/parameter_groups.py:85
+#: heat/engine/parameter_groups.py:46 heat/engine/parameter_groups.py:56
+#: heat/engine/parameter_groups.py:63 heat/engine/parameter_groups.py:72
+#: heat/engine/parameter_groups.py:83
msgid "Parameter Groups error"
msgstr ""
-#: heat/engine/parameter_groups.py:50
+#: heat/engine/parameter_groups.py:48
#, python-format
msgid "The %s should be a list."
msgstr ""
-#: heat/engine/parameter_groups.py:60
+#: heat/engine/parameter_groups.py:58
#, python-format
msgid "The %s must be provided for each parameter group."
msgstr ""
-#: heat/engine/parameter_groups.py:67
+#: heat/engine/parameter_groups.py:65
#, python-format
msgid "The %s of parameter group should be a list."
msgstr ""
-#: heat/engine/parameter_groups.py:76
+#: heat/engine/parameter_groups.py:74
#, python-format
msgid "The %s parameter must be assigned to one parameter group only."
msgstr ""
-#: heat/engine/parameter_groups.py:87
+#: heat/engine/parameter_groups.py:85
#, python-format
msgid "The grouped parameter %s does not reference a valid parameter."
msgstr ""
@@ -1540,21 +1512,21 @@ msgstr ""
msgid "Parameter '%(name)s' is invalid: %(exp)s"
msgstr ""
-#: heat/engine/parameters.py:379
+#: heat/engine/parameters.py:378
#, python-format
msgid "Value must be a comma-delimited list string: %s"
msgstr ""
-#: heat/engine/parameters.py:423
+#: heat/engine/parameters.py:425
#, python-format
msgid "Value must be valid JSON: %s"
msgstr ""
-#: heat/engine/parameters.py:565 heat/engine/hot/parameters.py:133
+#: heat/engine/parameters.py:570 heat/engine/hot/parameters.py:133
msgid "Stack ID"
msgstr ""
-#: heat/engine/parameters.py:569 heat/engine/hot/parameters.py:142
+#: heat/engine/parameters.py:574 heat/engine/hot/parameters.py:142
msgid "Stack Name"
msgstr ""
@@ -1622,124 +1594,124 @@ msgstr ""
msgid "Property %s not assigned"
msgstr ""
-#: heat/engine/properties.py:644
+#: heat/engine/properties.py:647
#, python-format
msgid "There is no rule %(rule)s. List of allowed rules is: %(rules)s."
msgstr ""
-#: heat/engine/properties.py:649
+#: heat/engine/properties.py:652
#, python-format
msgid "Properties must be Properties type. Found %s."
msgstr ""
-#: heat/engine/properties.py:652
+#: heat/engine/properties.py:655
#, python-format
msgid "source_path should be a list with path instead of %s."
msgstr ""
-#: heat/engine/properties.py:655
+#: heat/engine/properties.py:658
msgid "source_path must be non-empty list with path."
msgstr ""
-#: heat/engine/properties.py:658
+#: heat/engine/properties.py:661
msgid "Use value_name only for replacing list elements."
msgstr ""
-#: heat/engine/properties.py:661
+#: heat/engine/properties.py:664
msgid "value must be list type when rule is Add."
msgstr ""
-#: heat/engine/properties.py:690
+#: heat/engine/properties.py:693
msgid "Add rule must be used only for lists."
msgstr ""
-#: heat/engine/properties.py:696 heat/engine/properties.py:708
+#: heat/engine/properties.py:699 heat/engine/properties.py:711
#, python-format
msgid "Cannot use %(key)s and %(name)s at the same time."
msgstr ""
-#: heat/engine/properties.py:742
+#: heat/engine/properties.py:745
msgid "Property uses removed function."
msgstr ""
-#: heat/engine/resource.py:97
+#: heat/engine/resource.py:99
msgid "Detailed information about resource."
msgstr ""
-#: heat/engine/resource.py:377
+#: heat/engine/resource.py:378
#, python-format
msgid "%(a)s paused until Hook %(h)s is cleared"
msgstr ""
-#: heat/engine/resource.py:496
+#: heat/engine/resource.py:502
#, python-format
msgid "Update to properties %(props)s of %(name)s (%(res)s)"
msgstr ""
-#: heat/engine/resource.py:728
+#: heat/engine/resource.py:735
#, python-format
msgid "State %s invalid for create"
msgstr ""
-#: heat/engine/resource.py:816
+#: heat/engine/resource.py:823
msgid "Resource ID was not provided."
msgstr ""
-#: heat/engine/resource.py:940
+#: heat/engine/resource.py:959
msgid "Resource update already requested"
msgstr ""
-#: heat/engine/resource.py:1013
+#: heat/engine/resource.py:1039
#, python-format
msgid "'%(attr)s': expected '%(expected)s', got '%(current)s'"
msgstr ""
-#: heat/engine/resource.py:1035
+#: heat/engine/resource.py:1061
#, python-format
msgid "State %s invalid for suspend"
msgstr ""
-#: heat/engine/resource.py:1055
+#: heat/engine/resource.py:1081
#, python-format
msgid "State %s invalid for resume"
msgstr ""
-#: heat/engine/resource.py:1102
+#: heat/engine/resource.py:1128
msgid "limit cannot be less than 4"
msgstr ""
-#: heat/engine/resource.py:1144 heat/engine/cfn/template.py:159
+#: heat/engine/resource.py:1170 heat/engine/cfn/template.py:159
#: heat/engine/hot/template.py:262
#, python-format
msgid "Invalid deletion policy \"%s\""
msgstr ""
-#: heat/engine/resource.py:1149
+#: heat/engine/resource.py:1175
#, python-format
msgid "\"%s\" deletion policy not supported"
msgstr ""
-#: heat/engine/resource.py:1489 heat/engine/stack.py:716
+#: heat/engine/resource.py:1549 heat/engine/stack.py:779
#, python-format
msgid "Invalid action %s"
msgstr ""
-#: heat/engine/resource.py:1492 heat/engine/stack.py:719
+#: heat/engine/resource.py:1552 heat/engine/stack.py:782
#, python-format
msgid "Invalid status %s"
msgstr ""
-#: heat/engine/resource.py:1579
+#: heat/engine/resource.py:1639
#, python-format
msgid "Signal resource during %s"
msgstr ""
-#: heat/engine/resource.py:1586
+#: heat/engine/resource.py:1646
#, python-format
msgid "Invalid hook type \"%(hook)s\" for %(resource)s"
msgstr ""
-#: heat/engine/resource.py:1591
+#: heat/engine/resource.py:1651
#, python-format
msgid "The \"%(hook)s\" hook is not defined on %(resource)s"
msgstr ""
@@ -1749,87 +1721,101 @@ msgstr ""
msgid "%s Timed out"
msgstr ""
-#: heat/engine/service.py:571
+#: heat/engine/service.py:591
#, python-format
msgid ""
"You have reached the maximum stacks per tenant, %d. Please delete some "
"stacks."
msgstr ""
-#: heat/engine/service.py:784
+#: heat/engine/service.py:809
msgid "PATCH update to non-COMPLETE stack"
msgstr ""
-#: heat/engine/service.py:841
+#: heat/engine/service.py:869
msgid "Updating a stack when it is suspended"
msgstr ""
-#: heat/engine/service.py:845
+#: heat/engine/service.py:873
msgid "Updating a stack when it is deleting"
msgstr ""
-#: heat/engine/service.py:926
+#: heat/engine/service.py:954
#, python-format
msgid "Cancelling update when stack is %s"
msgstr ""
-#: heat/engine/service.py:972
+#: heat/engine/service.py:1004
msgid "No Template provided."
msgstr ""
-#: heat/engine/service.py:1178
+#: heat/engine/service.py:1112
+#, python-format
+msgid "Specified output key %s not found."
+msgstr ""
+
+#: heat/engine/service.py:1263
#, python-format
msgid "Template with version %s not found"
msgstr ""
-#: heat/engine/service.py:1526
+#: heat/engine/service.py:1614
msgid "Deleting in-progress snapshot"
msgstr ""
-#: heat/engine/service_software_config.py:78
+#: heat/engine/service_software_config.py:79
msgid "server_id must be specified"
msgstr ""
-#: heat/engine/service_software_config.py:213
+#: heat/engine/service_software_config.py:228
msgid "deployment_id must be specified"
msgstr ""
-#: heat/engine/service_software_config.py:232
+#: heat/engine/service_software_config.py:247
#, python-format
msgid "Deployment exited with non-zero status code: %s"
msgstr ""
-#: heat/engine/service_software_config.py:259
+#: heat/engine/service_software_config.py:274
msgid "Outputs received"
msgstr ""
-#: heat/engine/stack.py:114
+#: heat/engine/stack.py:89
+msgid "Unexpected returning while IN_PROGRESS."
+msgstr ""
+
+#: heat/engine/stack.py:139
#, python-format
msgid ""
"Invalid stack name %s must contain only alphanumeric or \"_-.\" "
"characters, must start with alpha"
msgstr ""
-#: heat/engine/stack.py:234
+#: heat/engine/stack.py:144
+#, python-format
+msgid "Invalid stack name %s, must be a string"
+msgstr ""
+
+#: heat/engine/stack.py:265
msgid "Attempt to use stored_context with no user_creds"
msgstr ""
-#: heat/engine/stack.py:373
+#: heat/engine/stack.py:405
#, python-format
msgid "No stack exists with id \"%s\""
msgstr ""
-#: heat/engine/stack.py:647
+#: heat/engine/stack.py:696
#, python-format
msgid "Duplicate names %s"
msgstr ""
-#: heat/engine/stack.py:669
+#: heat/engine/stack.py:718
#, python-format
msgid "Outputs must contain Output. Found a [%s] instead"
msgstr ""
-#: heat/engine/stack.py:677
+#: heat/engine/stack.py:726
msgid "Each Output must contain a Value key."
msgstr ""
@@ -1848,112 +1834,112 @@ msgstr ""
msgid "Sync Point %s not found"
msgstr ""
-#: heat/engine/template.py:45
+#: heat/engine/template.py:42
#, python-format
msgid "Ambiguous versions (%s)"
msgstr ""
-#: heat/engine/template.py:50
+#: heat/engine/template.py:47
msgid "Template version was not provided"
msgstr ""
-#: heat/engine/template.py:67
+#: heat/engine/template.py:64
#, python-format
msgid "Could not load %(name)s: %(error)s"
msgstr ""
-#: heat/engine/template.py:84
+#: heat/engine/template.py:81
#, python-format
msgid "\"%(version)s\". \"%(version_type)s\" should be one of: %(available)s"
msgstr ""
-#: heat/engine/template.py:87
+#: heat/engine/template.py:84
#, python-format
msgid "\"%(version)s\". \"%(version_type)s\" should be: %(available)s"
msgstr ""
-#: heat/engine/template.py:182
+#: heat/engine/template.py:179
#, python-format
msgid "\"%s\" is not a valid keyword inside a resource definition"
msgstr ""
-#: heat/engine/template.py:189
+#: heat/engine/template.py:186
#, python-format
msgid "Resource %(name)s %(key)s type must be %(typename)s"
msgstr ""
-#: heat/engine/template.py:253
+#: heat/engine/template.py:250
msgid "Each Resource must contain a Type key."
msgstr ""
-#: heat/engine/template.py:257
+#: heat/engine/template.py:254
#, python-format
msgid "Resources must contain Resource. Found a [%s] instead"
msgstr ""
-#: heat/engine/watchrule.py:332
+#: heat/engine/watchrule.py:335
#, python-format
msgid "Invalid watch state %s"
msgstr ""
-#: heat/engine/watchrule.py:345
+#: heat/engine/watchrule.py:348
#, python-format
msgid "Unknown watch state %s"
msgstr ""
-#: heat/engine/cfn/functions.py:153
+#: heat/engine/cfn/functions.py:152
#, python-format
msgid "Arguments to \"%s\" must be of the form [resource_name, attribute]"
msgstr ""
-#: heat/engine/cfn/functions.py:235
+#: heat/engine/cfn/functions.py:234
#, python-format
msgid "Arguments to \"%s\" must be of the form [index, collection]"
msgstr ""
-#: heat/engine/cfn/functions.py:261
+#: heat/engine/cfn/functions.py:255
#, python-format
msgid "\"%(fn_name)s\": %(err)s"
msgstr ""
-#: heat/engine/cfn/functions.py:265
+#: heat/engine/cfn/functions.py:259
#, python-format
msgid "Index to \"%s\" must be a string"
msgstr ""
-#: heat/engine/cfn/functions.py:272
+#: heat/engine/cfn/functions.py:271
#, python-format
msgid "Index to \"%s\" must be an integer"
msgstr ""
-#: heat/engine/cfn/functions.py:283
+#: heat/engine/cfn/functions.py:282
#, python-format
msgid "Arguments to %s not fully resolved"
msgstr ""
-#: heat/engine/cfn/functions.py:307 heat/engine/cfn/functions.py:313
+#: heat/engine/cfn/functions.py:306 heat/engine/cfn/functions.py:312
#: heat/engine/cfn/functions.py:360 heat/engine/cfn/functions.py:366
#: heat/engine/cfn/functions.py:418 heat/engine/cfn/functions.py:424
-#: heat/engine/hot/functions.py:380 heat/engine/hot/functions.py:387
-#: heat/engine/hot/functions.py:394 heat/engine/hot/functions.py:608
-#: heat/engine/hot/functions.py:618
+#: heat/engine/hot/functions.py:380 heat/engine/hot/functions.py:389
+#: heat/engine/hot/functions.py:453 heat/engine/hot/functions.py:647
+#: heat/engine/hot/functions.py:657
#, python-format
msgid "Incorrect arguments to \"%(fn_name)s\" should be: %(example)s"
msgstr ""
-#: heat/engine/cfn/functions.py:322 heat/engine/hot/functions.py:403
+#: heat/engine/cfn/functions.py:321 heat/engine/hot/functions.py:400
#, python-format
msgid "\"%s\" must operate on a list"
msgstr ""
-#: heat/engine/cfn/functions.py:326 heat/engine/hot/functions.py:407
+#: heat/engine/cfn/functions.py:325 heat/engine/hot/functions.py:407
#, python-format
msgid "\"%s\" delimiter must be a string"
msgstr ""
-#: heat/engine/cfn/functions.py:334
+#: heat/engine/cfn/functions.py:333
#, python-format
-msgid "Items to join must be strings %s"
+msgid "Items to join must be strings not %s"
msgstr ""
#: heat/engine/cfn/functions.py:373
@@ -2040,101 +2026,101 @@ msgstr ""
msgid "Resource %(name)s is missing \"%(type_key)s\""
msgstr ""
-#: heat/engine/clients/__init__.py:101
+#: heat/engine/clients/__init__.py:106
#, python-format
msgid "Invalid cloud_backend setting in heat.conf detected - %s"
msgstr ""
-#: heat/engine/clients/client_plugin.py:184
+#: heat/engine/clients/client_plugin.py:196
msgid "Unknown Keystone version"
msgstr ""
-#: heat/engine/clients/os/cinder.py:64
+#: heat/engine/clients/os/cinder.py:65
msgid "No volume service available."
msgstr ""
-#: heat/engine/clients/os/cinder.py:164
+#: heat/engine/clients/os/cinder.py:159
msgid "Volume detachment failed"
msgstr ""
-#: heat/engine/clients/os/cinder.py:182
+#: heat/engine/clients/os/cinder.py:177
msgid "Volume attachment failed"
msgstr ""
-#: heat/engine/clients/os/glance.py:93
+#: heat/engine/clients/os/glance.py:91
#, python-format
msgid "Error retrieving image list from glance: %s"
msgstr ""
-#: heat/engine/clients/os/nova.py:224
+#: heat/engine/clients/os/nova.py:218
#, python-format
msgid "Message: %(message)s, Code: %(code)s"
msgstr ""
-#: heat/engine/clients/os/nova.py:231
+#: heat/engine/clients/os/nova.py:225
#, python-format
msgid "%s is not active"
msgstr ""
-#: heat/engine/clients/os/nova.py:409
+#: heat/engine/clients/os/nova.py:407
#, python-format
msgid "Server %(name)s delete failed: (%(code)s) %(message)s"
msgstr ""
-#: heat/engine/clients/os/nova.py:445
+#: heat/engine/clients/os/nova.py:443
#, python-format
msgid "Resizing to '%(flavor)s' failed, status '%(status)s'"
msgstr ""
-#: heat/engine/clients/os/nova.py:457
+#: heat/engine/clients/os/nova.py:455
#, python-format
msgid "Could not confirm resize of server %s"
msgstr ""
-#: heat/engine/clients/os/nova.py:471
+#: heat/engine/clients/os/nova.py:469
#, python-format
msgid "Confirm resize for server %s failed"
msgstr ""
-#: heat/engine/clients/os/nova.py:496
+#: heat/engine/clients/os/nova.py:494
#, python-format
msgid "Rebuilding server failed, status '%s'"
msgstr ""
-#: heat/engine/clients/os/nova.py:503
+#: heat/engine/clients/os/nova.py:501
msgid "nova server metadata needs to be a Map."
msgstr ""
-#: heat/engine/clients/os/nova.py:608
+#: heat/engine/clients/os/nova.py:606
#, python-format
msgid "Failed to attach volume %(vol)s to server %(srv)s - %(err)s"
msgstr ""
-#: heat/engine/clients/os/nova.py:625
+#: heat/engine/clients/os/nova.py:623
#, python-format
msgid "Could not detach attachment %(att)s from server %(srv)s."
msgstr ""
-#: heat/engine/clients/os/sahara.py:59
+#: heat/engine/clients/os/sahara.py:56
#, python-format
msgid ""
"Requested plugin '%(plugin)s' doesn't support version '%(version)s'. "
"Allowed versions are %(allowed)s"
msgstr ""
-#: heat/engine/clients/os/sahara.py:114
+#: heat/engine/clients/os/sahara.py:111
#, python-format
msgid "Error retrieving image list from sahara: %s"
msgstr ""
-#: heat/engine/clients/os/trove.py:61
+#: heat/engine/clients/os/trove.py:63
#, python-format
msgid ""
"Datastore version %(dsversion)s for datastore type %(dstype)s is not "
"valid. Allowed versions are %(allowed)s."
msgstr ""
-#: heat/engine/clients/os/trove.py:70
+#: heat/engine/clients/os/trove.py:72
#, python-format
msgid ""
"Multiple active datastore versions exist for datastore type %(dstype)s. "
@@ -2142,11 +2128,18 @@ msgid ""
"%(allowed)s."
msgstr ""
-#: heat/engine/clients/os/trove.py:79
+#: heat/engine/clients/os/trove.py:81
#, python-format
msgid "Not allowed - %(dsver)s without %(dstype)s."
msgstr ""
+#: heat/engine/clients/os/neutron/neutron_constraints.py:106
+#, python-format
+msgid ""
+"Unable to find neutron provider '%(provider)s', available providers are "
+"%(providers)s."
+msgstr ""
+
#: heat/engine/constraint/common_constraints.py:78
#, python-format
msgid "Invalid CRON expression: %s"
@@ -2201,7 +2194,7 @@ msgid ""
"[resource_name, attribute, (path), ...]"
msgstr ""
-#: heat/engine/hot/functions.py:247 heat/engine/hot/functions.py:490
+#: heat/engine/hot/functions.py:247 heat/engine/hot/functions.py:529
#, python-format
msgid "Arguments to \"%s\" must be a map"
msgstr ""
@@ -2220,7 +2213,7 @@ msgstr ""
#: heat/engine/hot/functions.py:307
#, python-format
-msgid "\"%s\" params must be strings, numbers, list or map. "
+msgid "\"%s\" params must be strings, numbers, list or map."
msgstr ""
#: heat/engine/hot/functions.py:334
@@ -2235,7 +2228,7 @@ msgid ""
"%(file_key)s"
msgstr ""
-#: heat/engine/hot/functions.py:411 heat/engine/hot/functions.py:425
+#: heat/engine/hot/functions.py:411
#, python-format
msgid "Items to join must be string, map or list not %s"
msgstr ""
@@ -2245,47 +2238,56 @@ msgstr ""
msgid "Items to join must be string, map or list. %s failed json serialization"
msgstr ""
-#: heat/engine/hot/functions.py:460
+#: heat/engine/hot/functions.py:445
+#, python-format
+msgid "\"%s\" : [ { \"key1\": \"val1\" }, { \"key2\": \"val2\" } ]"
+msgstr ""
+
+#: heat/engine/hot/functions.py:462
+msgid "Incorrect arguments: Items to merge must be maps."
+msgstr ""
+
+#: heat/engine/hot/functions.py:499
#, python-format
msgid "The function %s is not supported in this version of HOT."
msgstr ""
-#: heat/engine/hot/functions.py:501
+#: heat/engine/hot/functions.py:540
#, python-format
msgid "\"repeat\" syntax should be %s"
msgstr ""
-#: heat/engine/hot/functions.py:505
+#: heat/engine/hot/functions.py:544
#, python-format
msgid "The \"for_each\" argument to \"%s\" must contain a map"
msgstr ""
-#: heat/engine/hot/functions.py:509
+#: heat/engine/hot/functions.py:548
#, python-format
msgid "The values of the \"for_each\" argument to \"%s\" must be lists"
msgstr ""
-#: heat/engine/hot/functions.py:551
+#: heat/engine/hot/functions.py:590
#, python-format
msgid "Argument to function \"%s\" must be a list of strings"
msgstr ""
-#: heat/engine/hot/functions.py:555
+#: heat/engine/hot/functions.py:594
#, python-format
msgid "Function \"%s\" usage: [\"<algorithm>\", \"<value>\"]"
msgstr ""
-#: heat/engine/hot/functions.py:564
+#: heat/engine/hot/functions.py:603
#, python-format
msgid "Algorithm must be one of %s"
msgstr ""
-#: heat/engine/hot/functions.py:627
+#: heat/engine/hot/functions.py:666
#, python-format
msgid "Incorrect index to \"%(fn_name)s\" should be: %(example)s"
msgstr ""
-#: heat/engine/hot/functions.py:633
+#: heat/engine/hot/functions.py:672
#, python-format
msgid "Incorrect index to \"%(fn_name)s\" should be between 0 and %(max_index)s"
msgstr ""
@@ -2320,7 +2322,7 @@ msgid ""
"[%(_type)s] instead"
msgstr ""
-#: heat/engine/resources/signal_responder.py:375
+#: heat/engine/resources/signal_responder.py:371
#: heat/engine/resources/openstack/heat/swiftsignal.py:270
#, python-format
msgid "Failed to parse JSON data: %s"
@@ -2335,21 +2337,21 @@ msgstr ""
msgid "Recursion depth exceeds %d."
msgstr ""
-#: heat/engine/resources/stack_resource.py:376
+#: heat/engine/resources/stack_resource.py:379
msgid "Stack unknown status"
msgstr ""
-#: heat/engine/resources/stack_resource.py:462
+#: heat/engine/resources/stack_resource.py:465
#, python-format
msgid "Cannot suspend %s, stack not created"
msgstr ""
-#: heat/engine/resources/stack_resource.py:476
+#: heat/engine/resources/stack_resource.py:479
#, python-format
msgid "Cannot resume %s, stack not created"
msgstr ""
-#: heat/engine/resources/stack_resource.py:490
+#: heat/engine/resources/stack_resource.py:493
#, python-format
msgid "Cannot check %s, stack not created"
msgstr ""
@@ -2362,48 +2364,48 @@ msgstr ""
msgid "Can't get user token without password"
msgstr ""
-#: heat/engine/resources/stack_user.py:144
+#: heat/engine/resources/stack_user.py:135
#, python-format
msgid "Error creating ec2 keypair for user %s"
msgstr ""
-#: heat/engine/resources/template_resource.py:74
+#: heat/engine/resources/template_resource.py:83
msgid "Only Templates with an extension of .yaml or .template are supported"
msgstr ""
-#: heat/engine/resources/template_resource.py:94
+#: heat/engine/resources/template_resource.py:103
#, python-format
msgid "Could not fetch remote template \"%(name)s\": %(exc)s"
msgstr ""
-#: heat/engine/resources/template_resource.py:214
+#: heat/engine/resources/template_resource.py:223
#, python-format
msgid "Unknown error retrieving %s"
msgstr ""
-#: heat/engine/resources/template_resource.py:223
+#: heat/engine/resources/template_resource.py:232
#, python-format
msgid "Required property %(n)s for facade %(type)s missing in provider"
msgstr ""
-#: heat/engine/resources/template_resource.py:231
+#: heat/engine/resources/template_resource.py:240
#, python-format
msgid ""
"Property %(n)s type mismatch between facade %(type)s (%(fs_type)s) and "
"provider (%(ps_type)s)"
msgstr ""
-#: heat/engine/resources/template_resource.py:240
+#: heat/engine/resources/template_resource.py:249
#, python-format
msgid "Provider requires property %(n)s unknown in facade %(type)s"
msgstr ""
-#: heat/engine/resources/template_resource.py:249
+#: heat/engine/resources/template_resource.py:258
#, python-format
msgid "Attribute %(attr)s for facade %(type)s missing in provider"
msgstr ""
-#: heat/engine/resources/template_resource.py:262
+#: heat/engine/resources/template_resource.py:271
#, python-format
msgid "Failed to retrieve template data: %s"
msgstr ""
@@ -2458,12 +2460,12 @@ msgstr ""
#: heat/engine/resources/aws/lb/loadbalancer.py:403
#: heat/engine/resources/aws/lb/loadbalancer.py:408
#: heat/engine/resources/aws/lb/loadbalancer.py:418
-#: heat/engine/resources/openstack/heat/instance_group.py:67
+#: heat/engine/resources/openstack/heat/instance_group.py:73
msgid "Not Implemented."
msgstr ""
#: heat/engine/resources/aws/autoscaling/autoscaling_group.py:86
-#: heat/engine/resources/openstack/heat/instance_group.py:72
+#: heat/engine/resources/openstack/heat/instance_group.py:78
msgid "The reference to a LaunchConfiguration resource."
msgstr ""
@@ -2483,8 +2485,8 @@ msgid "Minimum number of instances in the group."
msgstr ""
#: heat/engine/resources/aws/autoscaling/autoscaling_group.py:113
-#: heat/engine/resources/aws/autoscaling/scaling_policy.py:69
-#: heat/engine/resources/openstack/heat/autoscaling_group.py:74
+#: heat/engine/resources/aws/autoscaling/scaling_policy.py:66
+#: heat/engine/resources/openstack/heat/autoscaling_group.py:81
#: heat/engine/resources/openstack/heat/scaling_policy.py:81
msgid "Cooldown period, in seconds."
msgstr ""
@@ -2494,7 +2496,7 @@ msgid "Desired initial number of instances."
msgstr ""
#: heat/engine/resources/aws/autoscaling/autoscaling_group.py:136
-#: heat/engine/resources/openstack/heat/instance_group.py:84
+#: heat/engine/resources/openstack/heat/instance_group.py:90
msgid "List of LoadBalancer resources."
msgstr ""
@@ -2510,12 +2512,12 @@ msgid "UUID of the internal subnet to which the instance will be attached."
msgstr ""
#: heat/engine/resources/aws/autoscaling/autoscaling_group.py:152
-#: heat/engine/resources/openstack/heat/instance_group.py:88
+#: heat/engine/resources/openstack/heat/instance_group.py:94
msgid "Tags to attach to this group."
msgstr ""
#: heat/engine/resources/aws/autoscaling/autoscaling_group.py:171
-#: heat/engine/resources/openstack/heat/instance_group.py:107
+#: heat/engine/resources/openstack/heat/instance_group.py:113
msgid "A comma-delimited list of server ip addresses. (Heat extension)."
msgstr ""
@@ -2612,8 +2614,8 @@ msgstr ""
#: heat/engine/resources/aws/autoscaling/launch_config.py:137
#: heat/engine/resources/aws/ec2/instance.py:280
-#: heat/engine/resources/openstack/nova/server.py:164
-#: heat/engine/resources/openstack/nova/server.py:213
+#: heat/engine/resources/openstack/nova/server.py:165
+#: heat/engine/resources/openstack/nova/server.py:214
msgid "The ID of the snapshot to create a volume from."
msgstr ""
@@ -2648,14 +2650,14 @@ msgid "Scheduler hints to pass to Nova (Heat extension)."
msgstr ""
#: heat/engine/resources/aws/autoscaling/launch_config.py:247
-#: heat/engine/resources/aws/ec2/instance.py:798
+#: heat/engine/resources/aws/ec2/instance.py:796
msgid ""
"SnapshotId is missing, this is required when specifying "
"BlockDeviceMappings."
msgstr ""
#: heat/engine/resources/aws/autoscaling/launch_config.py:251
-#: heat/engine/resources/aws/ec2/instance.py:802
+#: heat/engine/resources/aws/ec2/instance.py:800
msgid "Ebs is missing, this is required when specifying BlockDeviceMappings."
msgstr ""
@@ -2663,28 +2665,28 @@ msgstr ""
msgid "If without InstanceId, ImageId and InstanceType are required."
msgstr ""
-#: heat/engine/resources/aws/autoscaling/scaling_policy.py:46
+#: heat/engine/resources/aws/autoscaling/scaling_policy.py:43
msgid "AutoScaling group name to apply policy to."
msgstr ""
-#: heat/engine/resources/aws/autoscaling/scaling_policy.py:51
+#: heat/engine/resources/aws/autoscaling/scaling_policy.py:48
#: heat/engine/resources/openstack/heat/scaling_policy.py:63
msgid "Size of adjustment."
msgstr ""
-#: heat/engine/resources/aws/autoscaling/scaling_policy.py:57
+#: heat/engine/resources/aws/autoscaling/scaling_policy.py:54
#: heat/engine/resources/openstack/heat/scaling_policy.py:69
msgid "Type of adjustment (absolute or percentage)."
msgstr ""
-#: heat/engine/resources/aws/autoscaling/scaling_policy.py:74
+#: heat/engine/resources/aws/autoscaling/scaling_policy.py:71
msgid ""
"Minimum number of resources that are added or removed when the "
"AutoScaling group scales up or down. This can be used only when "
"specifying PercentChangeInCapacity for the AdjustmentType property."
msgstr ""
-#: heat/engine/resources/aws/autoscaling/scaling_policy.py:90
+#: heat/engine/resources/aws/autoscaling/scaling_policy.py:87
msgid "A signed url to handle the alarm. (Heat extension)."
msgstr ""
@@ -2766,32 +2768,32 @@ msgid ""
"with Amazon VPC. Returned only for VPC elastic IP addresses."
msgstr ""
-#: heat/engine/resources/aws/ec2/eip.py:202
+#: heat/engine/resources/aws/ec2/eip.py:198
msgid "Instance ID to associate with EIP specified by EIP property."
msgstr ""
-#: heat/engine/resources/aws/ec2/eip.py:210
+#: heat/engine/resources/aws/ec2/eip.py:206
msgid "EIP address to associate with instance."
msgstr ""
-#: heat/engine/resources/aws/ec2/eip.py:218
+#: heat/engine/resources/aws/ec2/eip.py:214
msgid "Allocation ID for VPC EIP address."
msgstr ""
-#: heat/engine/resources/aws/ec2/eip.py:223
+#: heat/engine/resources/aws/ec2/eip.py:219
msgid "Network interface ID to associate with EIP."
msgstr ""
-#: heat/engine/resources/aws/ec2/eip.py:242
+#: heat/engine/resources/aws/ec2/eip.py:238
msgid "Either 'EIP' or 'AllocationId' must be provided."
msgstr ""
-#: heat/engine/resources/aws/ec2/eip.py:246
+#: heat/engine/resources/aws/ec2/eip.py:242
msgid "Must specify 'InstanceId' if you specify 'EIP'."
msgstr ""
-#: heat/engine/resources/aws/ec2/eip.py:338
-#: heat/engine/resources/aws/ec2/eip.py:361
+#: heat/engine/resources/aws/ec2/eip.py:334
+#: heat/engine/resources/aws/ec2/eip.py:357
msgid "Failed to update, can not found port info."
msgstr ""
@@ -2829,7 +2831,7 @@ msgstr ""
#: heat/engine/resources/aws/ec2/instance.py:240
#: heat/engine/resources/aws/ec2/volume.py:114
-#: heat/engine/resources/openstack/cinder/volume.py:607
+#: heat/engine/resources/openstack/cinder/volume.py:660
msgid "The ID of the volume to be attached."
msgstr ""
@@ -2853,30 +2855,30 @@ msgstr ""
msgid "Public IP address of the specified instance."
msgstr ""
-#: heat/engine/resources/aws/ec2/instance.py:627
+#: heat/engine/resources/aws/ec2/instance.py:625
#, python-format
msgid "Instance is not ACTIVE (was: %s)"
msgstr ""
-#: heat/engine/resources/aws/ec2/instance.py:843
-#: heat/engine/resources/openstack/nova/server.py:1328
+#: heat/engine/resources/aws/ec2/instance.py:841
+#: heat/engine/resources/openstack/nova/server.py:1378
#, python-format
msgid "Cannot suspend %s, resource_id not set"
msgstr ""
-#: heat/engine/resources/aws/ec2/instance.py:850
-#: heat/engine/resources/aws/ec2/instance.py:893
+#: heat/engine/resources/aws/ec2/instance.py:848
+#: heat/engine/resources/aws/ec2/instance.py:891
#, python-format
msgid "Failed to find instance %s"
msgstr ""
-#: heat/engine/resources/aws/ec2/instance.py:874
+#: heat/engine/resources/aws/ec2/instance.py:872
#, python-format
msgid "Suspend of instance %s failed"
msgstr ""
-#: heat/engine/resources/aws/ec2/instance.py:886
-#: heat/engine/resources/openstack/nova/server.py:1371
+#: heat/engine/resources/aws/ec2/instance.py:884
+#: heat/engine/resources/openstack/nova/server.py:1421
#, python-format
msgid "Cannot resume %s, resource_id not set"
msgstr ""
@@ -2930,32 +2932,32 @@ msgstr ""
msgid "List of tags to be attached to this resource."
msgstr ""
-#: heat/engine/resources/aws/ec2/route_table.py:118
+#: heat/engine/resources/aws/ec2/route_table.py:114
msgid "Route table ID."
msgstr ""
-#: heat/engine/resources/aws/ec2/route_table.py:123
+#: heat/engine/resources/aws/ec2/route_table.py:119
msgid "Subnet ID."
msgstr ""
-#: heat/engine/resources/aws/ec2/security_group.py:376
+#: heat/engine/resources/aws/ec2/security_group.py:371
#: heat/engine/resources/openstack/neutron/security_group.py:126
msgid "Description of the security group."
msgstr ""
-#: heat/engine/resources/aws/ec2/security_group.py:381
+#: heat/engine/resources/aws/ec2/security_group.py:376
msgid "Physical ID of the VPC. Not implemented."
msgstr ""
-#: heat/engine/resources/aws/ec2/security_group.py:387
+#: heat/engine/resources/aws/ec2/security_group.py:382
msgid "List of security group ingress rules."
msgstr ""
-#: heat/engine/resources/aws/ec2/security_group.py:396
+#: heat/engine/resources/aws/ec2/security_group.py:391
msgid "List of security group egress rules."
msgstr ""
-#: heat/engine/resources/aws/ec2/security_group.py:451
+#: heat/engine/resources/aws/ec2/security_group.py:446
#, python-format
msgid "Security Group \"%(group_name)s\" not found"
msgstr ""
@@ -2983,12 +2985,12 @@ msgid "Availability Zone of the subnet."
msgstr ""
#: heat/engine/resources/aws/ec2/volume.py:37
-#: heat/engine/resources/openstack/cinder/volume.py:59
+#: heat/engine/resources/openstack/cinder/volume.py:65
msgid "The availability zone in which the volume will be created."
msgstr ""
#: heat/engine/resources/aws/ec2/volume.py:43
-#: heat/engine/resources/openstack/cinder/volume.py:157
+#: heat/engine/resources/openstack/cinder/volume.py:169
msgid "The size of the volume in GB."
msgstr ""
@@ -3176,122 +3178,122 @@ msgstr ""
msgid "The bucket you tried to delete is not empty (%s)."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:54
-#: heat/engine/resources/openstack/barbican/secret.py:47
+#: heat/engine/resources/openstack/barbican/order.py:61
+#: heat/engine/resources/openstack/barbican/secret.py:54
msgid "Human readable name for the secret."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:58
-#: heat/engine/resources/openstack/barbican/secret.py:66
+#: heat/engine/resources/openstack/barbican/order.py:65
+#: heat/engine/resources/openstack/barbican/secret.py:73
msgid "The type/format the secret data is provided in."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:62
-#: heat/engine/resources/openstack/barbican/secret.py:85
+#: heat/engine/resources/openstack/barbican/order.py:69
+#: heat/engine/resources/openstack/barbican/secret.py:92
msgid "The expiration date for the secret in ISO-8601 format."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:69
-#: heat/engine/resources/openstack/barbican/secret.py:92
+#: heat/engine/resources/openstack/barbican/order.py:76
+#: heat/engine/resources/openstack/barbican/secret.py:99
msgid "The algorithm type used to generate the secret."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:73
-#: heat/engine/resources/openstack/barbican/secret.py:96
+#: heat/engine/resources/openstack/barbican/order.py:80
+#: heat/engine/resources/openstack/barbican/secret.py:103
msgid "The bit-length of the secret."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:77
-#: heat/engine/resources/openstack/barbican/secret.py:105
+#: heat/engine/resources/openstack/barbican/order.py:84
+#: heat/engine/resources/openstack/barbican/secret.py:112
msgid "The type/mode of the algorithm associated with the secret information."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:82
+#: heat/engine/resources/openstack/barbican/order.py:89
msgid "The type of the order."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:93
+#: heat/engine/resources/openstack/barbican/order.py:100
msgid "The type of the certificate request."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:98
+#: heat/engine/resources/openstack/barbican/order.py:105
msgid "The subject of the certificate request."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:103
+#: heat/engine/resources/openstack/barbican/order.py:110
msgid "The source of certificate request."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:108
+#: heat/engine/resources/openstack/barbican/order.py:115
msgid "The identifier of the CA to use."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:113
+#: heat/engine/resources/openstack/barbican/order.py:120
msgid "The profile of certificate to use."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:118
+#: heat/engine/resources/openstack/barbican/order.py:125
msgid "The content of the CSR."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:123
+#: heat/engine/resources/openstack/barbican/order.py:130
msgid "The passphrase the created key."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:130
+#: heat/engine/resources/openstack/barbican/order.py:137
msgid "The status of the order."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:134
+#: heat/engine/resources/openstack/barbican/order.py:141
msgid "The URI to the order."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:138
+#: heat/engine/resources/openstack/barbican/order.py:145
msgid "The URI to the created secret."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:142
+#: heat/engine/resources/openstack/barbican/order.py:149
msgid "The URI to the created container."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:147
+#: heat/engine/resources/openstack/barbican/order.py:154
msgid "The payload of the created public key, if available."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:152
+#: heat/engine/resources/openstack/barbican/order.py:159
msgid "The payload of the created private key, if available."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:157
+#: heat/engine/resources/openstack/barbican/order.py:164
msgid "The payload of the created certificate, if available."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:162
+#: heat/engine/resources/openstack/barbican/order.py:169
msgid "The payload of the created intermediates, if available."
msgstr ""
-#: heat/engine/resources/openstack/barbican/order.py:184
+#: heat/engine/resources/openstack/barbican/order.py:191
#, python-format
msgid "Order '%(name)s' failed: %(code)s - %(reason)s"
msgstr ""
-#: heat/engine/resources/openstack/barbican/secret.py:51
+#: heat/engine/resources/openstack/barbican/secret.py:58
msgid "The unencrypted plain text of the secret."
msgstr ""
-#: heat/engine/resources/openstack/barbican/secret.py:55
+#: heat/engine/resources/openstack/barbican/secret.py:62
msgid "The type of the secret."
msgstr ""
-#: heat/engine/resources/openstack/barbican/secret.py:76
+#: heat/engine/resources/openstack/barbican/secret.py:83
msgid "The encoding format used to provide the payload data."
msgstr ""
-#: heat/engine/resources/openstack/barbican/secret.py:112
+#: heat/engine/resources/openstack/barbican/secret.py:119
msgid "The status of the secret."
msgstr ""
-#: heat/engine/resources/openstack/barbican/secret.py:116
+#: heat/engine/resources/openstack/barbican/secret.py:123
msgid "The decrypted secret payload."
msgstr ""
@@ -3326,7 +3328,7 @@ msgid ""
msgstr ""
#: heat/engine/resources/openstack/ceilometer/alarm.py:81
-#: heat/engine/resources/openstack/monasca/alarm_definition.py:78
+#: heat/engine/resources/openstack/monasca/alarm_definition.py:83
msgid "Severity of the alarm."
msgstr ""
@@ -3358,49 +3360,49 @@ msgstr ""
msgid "Timezone for the time constraint (eg. 'Taiwan/Taipei', 'Europe/Amsterdam')"
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/alarm.py:206
-#: heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py:34
+#: heat/engine/resources/openstack/ceilometer/alarm.py:215
+#: heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py:34
msgid "Operator used to compare specified statistic with threshold."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/alarm.py:215
-#: heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py:43
+#: heat/engine/resources/openstack/ceilometer/alarm.py:224
+#: heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py:43
#: heat/engine/resources/openstack/heat/cloud_watch.py:59
msgid "Number of periods to evaluate over."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/alarm.py:220
+#: heat/engine/resources/openstack/ceilometer/alarm.py:229
msgid "Meter name watched by the alarm."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/alarm.py:225
+#: heat/engine/resources/openstack/ceilometer/alarm.py:234
#: heat/engine/resources/openstack/heat/cloud_watch.py:75
msgid "Period (seconds) to evaluate over."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/alarm.py:230
+#: heat/engine/resources/openstack/ceilometer/alarm.py:239
msgid "Meter statistic to evaluate."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/alarm.py:239
-#: heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py:62
+#: heat/engine/resources/openstack/ceilometer/alarm.py:248
+#: heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py:62
#: heat/engine/resources/openstack/heat/cloud_watch.py:112
msgid "Threshold to evaluate against."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/alarm.py:245
+#: heat/engine/resources/openstack/ceilometer/alarm.py:254
msgid ""
"Meter should match this resource metadata (key=value) additionally to the"
" meter_name."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/alarm.py:252
+#: heat/engine/resources/openstack/ceilometer/alarm.py:261
msgid ""
"A list of query factors, each comparing a Sample attribute with a value. "
"Implicitly combined with matching_metadata, if any."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/alarm.py:262
+#: heat/engine/resources/openstack/ceilometer/alarm.py:271
msgid ""
"Name of attribute to compare. Names of the form metadata.user_metadata.X "
"or metadata.metering.X are equivalent to what you can address through "
@@ -3409,259 +3411,238 @@ msgid ""
"list`."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/alarm.py:273
+#: heat/engine/resources/openstack/ceilometer/alarm.py:282
msgid "Comparison operator"
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/alarm.py:278
+#: heat/engine/resources/openstack/ceilometer/alarm.py:287
msgid "String value with which to compare"
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/alarm.py:440
+#: heat/engine/resources/openstack/ceilometer/alarm.py:455
msgid "List of alarm identifiers to combine."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/alarm.py:446
+#: heat/engine/resources/openstack/ceilometer/alarm.py:461
msgid "Operator used to combine the alarms."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py:48
+#: heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py:48
msgid "The aggregation method to compare to the threshold"
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py:57
+#: heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py:57
msgid "The time range in seconds."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py:83
-#: heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py:143
+#: heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py:88
+#: heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py:159
#: heat/engine/resources/openstack/heat/cloud_watch.py:65
msgid "Metric name watched by the alarm."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py:89
+#: heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py:94
msgid "Id of a resource"
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py:95
-#: heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py:155
+#: heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py:100
+#: heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py:171
msgid "Resource type"
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py:117
+#: heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py:127
msgid "A list of metric ids."
msgstr ""
-#: heat/engine/resources/openstack/ceilometer/gnocchi_alarm.py:149
+#: heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py:165
msgid "The query to filter the metrics"
msgstr ""
-#: heat/engine/resources/openstack/cinder/cinder_encrypted_vol_type.py:43
+#: heat/engine/resources/openstack/cinder/encrypted_volume_type.py:46
msgid ""
"The class that provides encryption support. For example, "
"nova.volume.encryptors.luks.LuksEncryptor."
msgstr ""
-#: heat/engine/resources/openstack/cinder/cinder_encrypted_vol_type.py:50
+#: heat/engine/resources/openstack/cinder/encrypted_volume_type.py:53
msgid ""
"Notional service where encryption is performed For example, front-end. "
"For Nova."
msgstr ""
-#: heat/engine/resources/openstack/cinder/cinder_encrypted_vol_type.py:60
+#: heat/engine/resources/openstack/cinder/encrypted_volume_type.py:63
msgid "The encryption algorithm or mode. For example, aes-xts-plain64."
msgstr ""
-#: heat/engine/resources/openstack/cinder/cinder_encrypted_vol_type.py:72
+#: heat/engine/resources/openstack/cinder/encrypted_volume_type.py:75
msgid "Size of encryption key, in bits. For example, 128 or 256."
msgstr ""
-#: heat/engine/resources/openstack/cinder/cinder_encrypted_vol_type.py:79
+#: heat/engine/resources/openstack/cinder/encrypted_volume_type.py:82
msgid "Name or id of volume type (OS::Cinder::VolumeType)."
msgstr ""
-#: heat/engine/resources/openstack/cinder/cinder_volume_type.py:44
-msgid "Name of the volume type."
-msgstr ""
-
-#: heat/engine/resources/openstack/cinder/cinder_volume_type.py:50
-msgid "The extra specs key and value pairs of the volume type."
-msgstr ""
-
-#: heat/engine/resources/openstack/cinder/cinder_volume_type.py:55
-msgid "Whether the volume type is accessible to the public."
-msgstr ""
-
-#: heat/engine/resources/openstack/cinder/cinder_volume_type.py:61
-msgid "Description of the volume type."
-msgstr ""
-
-#: heat/engine/resources/openstack/cinder/cinder_volume_type.py:67
-msgid ""
-"Projects to add volume type access to. NOTE: This property is only "
-"supported since Cinder API V2."
-msgstr ""
-
-#: heat/engine/resources/openstack/cinder/cinder_volume_type.py:144
-msgid "Using Cinder API V1, volume type access"
-msgstr ""
-
-#: heat/engine/resources/openstack/cinder/cinder_volume_type.py:146
-#, python-format
-msgid "Can not specify property \"%s\" if the volume type is public."
-msgstr ""
-
-#: heat/engine/resources/openstack/cinder/volume.py:63
+#: heat/engine/resources/openstack/cinder/volume.py:69
msgid ""
"The size of the volume in GB. On update only increase in size is "
"supported."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:72
+#: heat/engine/resources/openstack/cinder/volume.py:78
msgid "If specified, the snapshot to create the volume from."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:79
+#: heat/engine/resources/openstack/cinder/volume.py:85
msgid "If specified, the backup to create the volume from."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:87
+#: heat/engine/resources/openstack/cinder/volume.py:93
msgid "A name used to distinguish the volume."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:92
+#: heat/engine/resources/openstack/cinder/volume.py:98
msgid "A description of the volume."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:97
+#: heat/engine/resources/openstack/cinder/volume.py:103
msgid "If specified, the type of volume to use, mapping to a specific backend."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:106
+#: heat/engine/resources/openstack/cinder/volume.py:112
msgid "Key/value pairs to associate with the volume."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:111
+#: heat/engine/resources/openstack/cinder/volume.py:117
msgid "The ID of the image to create the volume from."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:114
-#: heat/engine/resources/openstack/heat/random_string.py:85
+#: heat/engine/resources/openstack/cinder/volume.py:120
+#: heat/engine/resources/openstack/heat/random_string.py:91
#: heat/engine/resources/openstack/neutron/floatingip.py:49
#: heat/engine/resources/openstack/neutron/loadbalancer.py:226
#: heat/engine/resources/openstack/neutron/network_gateway.py:99
-#: heat/engine/resources/openstack/neutron/port.py:86
-#: heat/engine/resources/openstack/neutron/port.py:132
-#: heat/engine/resources/openstack/neutron/router.py:102
-#: heat/engine/resources/openstack/neutron/router.py:309
-#: heat/engine/resources/openstack/neutron/router.py:322
-#: heat/engine/resources/openstack/neutron/router.py:349
-#: heat/engine/resources/openstack/neutron/router.py:485
-#: heat/engine/resources/openstack/neutron/subnet.py:71
+#: heat/engine/resources/openstack/neutron/port.py:87
+#: heat/engine/resources/openstack/neutron/port.py:137
+#: heat/engine/resources/openstack/neutron/router.py:107
+#: heat/engine/resources/openstack/neutron/router.py:313
+#: heat/engine/resources/openstack/neutron/router.py:326
+#: heat/engine/resources/openstack/neutron/router.py:353
+#: heat/engine/resources/openstack/neutron/router.py:470
+#: heat/engine/resources/openstack/neutron/subnet.py:73
#: heat/engine/resources/openstack/neutron/vpnservice.py:64
-#: heat/engine/resources/openstack/nova/server.py:338
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:92
+#: heat/engine/resources/openstack/nova/server.py:339
+#: heat/engine/resources/openstack/sahara/cluster.py:98
#, python-format
msgid "Use property %s."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:124
+#: heat/engine/resources/openstack/cinder/volume.py:130
msgid "If specified, the name or ID of the image to create the volume from."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:132
+#: heat/engine/resources/openstack/cinder/volume.py:138
msgid "If specified, the volume to use as source."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:139
+#: heat/engine/resources/openstack/cinder/volume.py:145
msgid ""
"Arbitrary key-value pairs specified by the client to help the Cinder "
"scheduler creating a volume."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:145
+#: heat/engine/resources/openstack/cinder/volume.py:151
msgid "Enables or disables read-only access mode of volume."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:153
+#: heat/engine/resources/openstack/cinder/volume.py:157
+msgid ""
+"Whether allow the volume to be attached more than once. This property is "
+"only supported from Cinder API v2."
+msgstr ""
+
+#: heat/engine/resources/openstack/cinder/volume.py:165
msgid "The availability zone in which the volume is located."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:161
+#: heat/engine/resources/openstack/cinder/volume.py:173
msgid "The snapshot the volume was created from, if any."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:165
+#: heat/engine/resources/openstack/cinder/volume.py:177
msgid "Name of the volume."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:169
+#: heat/engine/resources/openstack/cinder/volume.py:181
msgid "Description of the volume."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:173
+#: heat/engine/resources/openstack/cinder/volume.py:185
msgid "The type of the volume mapping to a backend, if any."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:177
+#: heat/engine/resources/openstack/cinder/volume.py:189
msgid "Key/value pairs associated with the volume."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:181
+#: heat/engine/resources/openstack/cinder/volume.py:193
msgid "The volume used as source, if any."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:185
+#: heat/engine/resources/openstack/cinder/volume.py:197
msgid "The current status of the volume."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:189
+#: heat/engine/resources/openstack/cinder/volume.py:201
msgid "The timestamp indicating volume creation."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:193
+#: heat/engine/resources/openstack/cinder/volume.py:205
msgid "Boolean indicating if the volume can be booted or not."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:197
+#: heat/engine/resources/openstack/cinder/volume.py:209
msgid "Key/value pairs associated with the volume in raw dict form."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:201
+#: heat/engine/resources/openstack/cinder/volume.py:213
msgid "Boolean indicating if the volume is encrypted or not."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:205
+#: heat/engine/resources/openstack/cinder/volume.py:217
msgid "The list of attachments of the volume."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:290
+#: heat/engine/resources/openstack/cinder/volume.py:221
+msgid "Boolean indicating whether allow the volume to be attached more than once."
+msgstr ""
+
+#: heat/engine/resources/openstack/cinder/volume.py:310
#, python-format
msgid "Failed to extend volume %(vol)s - %(err)s"
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:309
+#: heat/engine/resources/openstack/cinder/volume.py:336
msgid "Volume resize failed"
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:319
+#: heat/engine/resources/openstack/cinder/volume.py:346
#, python-format
msgid "Failed to restore volume %(vol)s from backup %(backup)s - %(err)s"
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:339
+#: heat/engine/resources/openstack/cinder/volume.py:366
msgid "Volume backup restore failed"
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:373
+#: heat/engine/resources/openstack/cinder/volume.py:402
msgid "Using Cinder API V1, volume_type update"
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:395
+#: heat/engine/resources/openstack/cinder/volume.py:428
msgid "Shrinking volume"
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:527
+#: heat/engine/resources/openstack/cinder/volume.py:573
#, python-format
msgid ""
"If neither \"%(backup_id)s\" nor \"%(size)s\" is provided, one and only "
@@ -3670,7 +3651,7 @@ msgid ""
"%(exclusive_options)s."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:541
+#: heat/engine/resources/openstack/cinder/volume.py:587
#, python-format
msgid ""
"If \"%(size)s\" is provided, only one of \"%(image)s\", "
@@ -3678,113 +3659,150 @@ msgid ""
"specified, but currently specified options: %(exclusive_options)s."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:563
+#: heat/engine/resources/openstack/cinder/volume.py:609
msgid "Scheduler hints are not supported by the current volume API."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:601
+#: heat/engine/resources/openstack/cinder/volume.py:615
+msgid ""
+"Multiple attach is not supported by the current volume API. Use this "
+"property since Cinder API v2."
+msgstr ""
+
+#: heat/engine/resources/openstack/cinder/volume.py:654
msgid "The ID of the server to which the volume attaches."
msgstr ""
-#: heat/engine/resources/openstack/cinder/volume.py:616
+#: heat/engine/resources/openstack/cinder/volume.py:669
msgid ""
"The location where the volume is exposed on the instance. This assignment"
" may not be honored and it is advised that the path /dev/disk/by-"
"id/virtio-<VolumeId> be used instead."
msgstr ""
-#: heat/engine/resources/openstack/designate/domain.py:46
+#: heat/engine/resources/openstack/cinder/volume_type.py:48
+msgid "Name of the volume type."
+msgstr ""
+
+#: heat/engine/resources/openstack/cinder/volume_type.py:54
+msgid "The extra specs key and value pairs of the volume type."
+msgstr ""
+
+#: heat/engine/resources/openstack/cinder/volume_type.py:59
+msgid "Whether the volume type is accessible to the public."
+msgstr ""
+
+#: heat/engine/resources/openstack/cinder/volume_type.py:66
+msgid "Description of the volume type."
+msgstr ""
+
+#: heat/engine/resources/openstack/cinder/volume_type.py:72
+msgid ""
+"Projects to add volume type access to. NOTE: This property is only "
+"supported since Cinder API V2."
+msgstr ""
+
+#: heat/engine/resources/openstack/cinder/volume_type.py:153
+msgid "Using Cinder API V1, volume type access"
+msgstr ""
+
+#: heat/engine/resources/openstack/cinder/volume_type.py:155
+#, python-format
+msgid "Can not specify property \"%s\" if the volume type is public."
+msgstr ""
+
+#: heat/engine/resources/openstack/designate/domain.py:51
msgid "Domain name."
msgstr ""
-#: heat/engine/resources/openstack/designate/domain.py:53
-#: heat/engine/resources/openstack/designate/record.py:54
+#: heat/engine/resources/openstack/designate/domain.py:58
+#: heat/engine/resources/openstack/designate/record.py:61
msgid "Time To Live (Seconds)."
msgstr ""
-#: heat/engine/resources/openstack/designate/domain.py:61
+#: heat/engine/resources/openstack/designate/domain.py:66
msgid "Description of domain."
msgstr ""
-#: heat/engine/resources/openstack/designate/domain.py:67
+#: heat/engine/resources/openstack/designate/domain.py:72
msgid "Domain email."
msgstr ""
-#: heat/engine/resources/openstack/designate/domain.py:75
+#: heat/engine/resources/openstack/designate/domain.py:80
msgid "DNS domain serial."
msgstr ""
-#: heat/engine/resources/openstack/designate/record.py:47
+#: heat/engine/resources/openstack/designate/record.py:54
msgid "Record name."
msgstr ""
-#: heat/engine/resources/openstack/designate/record.py:62
+#: heat/engine/resources/openstack/designate/record.py:69
msgid "Description of record."
msgstr ""
-#: heat/engine/resources/openstack/designate/record.py:68
+#: heat/engine/resources/openstack/designate/record.py:75
msgid "DNS Record type."
msgstr ""
-#: heat/engine/resources/openstack/designate/record.py:77
+#: heat/engine/resources/openstack/designate/record.py:84
msgid ""
"DNS record data, varies based on the type of record. For more details, "
"please refer rfc 1035."
msgstr ""
-#: heat/engine/resources/openstack/designate/record.py:86
+#: heat/engine/resources/openstack/designate/record.py:93
msgid ""
"DNS record priority. It is considered only for MX and SRV types, "
"otherwise, it is ignored."
msgstr ""
-#: heat/engine/resources/openstack/designate/record.py:94
+#: heat/engine/resources/openstack/designate/record.py:101
msgid "DNS Domain id or name."
msgstr ""
-#: heat/engine/resources/openstack/glance/glance_image.py:37
+#: heat/engine/resources/openstack/glance/image.py:41
msgid ""
"Name for the image. The name of an image is not unique to a Image Service"
" node."
msgstr ""
-#: heat/engine/resources/openstack/glance/glance_image.py:42
+#: heat/engine/resources/openstack/glance/image.py:46
msgid "The image ID. Glance will generate a UUID if not specified."
msgstr ""
-#: heat/engine/resources/openstack/glance/glance_image.py:46
+#: heat/engine/resources/openstack/glance/image.py:50
msgid ""
"Scope of image accessibility. Public or private. Default value is False "
"means private."
msgstr ""
-#: heat/engine/resources/openstack/glance/glance_image.py:52
+#: heat/engine/resources/openstack/glance/image.py:56
msgid ""
"Amount of disk space (in GB) required to boot image. Default value is 0 "
"if not specified and means no limit on the disk size."
msgstr ""
-#: heat/engine/resources/openstack/glance/glance_image.py:61
+#: heat/engine/resources/openstack/glance/image.py:65
msgid ""
"Amount of ram (in MB) required to boot image. Default value is 0 if not "
"specified and means no limit on the ram size."
msgstr ""
-#: heat/engine/resources/openstack/glance/glance_image.py:69
+#: heat/engine/resources/openstack/glance/image.py:73
msgid ""
"Whether the image can be deleted. If the value is True, the image is "
"protected and cannot be deleted."
msgstr ""
-#: heat/engine/resources/openstack/glance/glance_image.py:74
+#: heat/engine/resources/openstack/glance/image.py:78
msgid "Disk format of image."
msgstr ""
-#: heat/engine/resources/openstack/glance/glance_image.py:84
+#: heat/engine/resources/openstack/glance/image.py:88
msgid "Container format of image."
msgstr ""
-#: heat/engine/resources/openstack/glance/glance_image.py:93
+#: heat/engine/resources/openstack/glance/image.py:97
msgid ""
"URL where the data for this image already resides. For example, if the "
"image data is stored in swift, you could specify "
@@ -3802,59 +3820,59 @@ msgstr ""
msgid "AccessPolicy resource %s not in stack"
msgstr ""
-#: heat/engine/resources/openstack/heat/autoscaling_group.py:51
+#: heat/engine/resources/openstack/heat/autoscaling_group.py:58
msgid ""
"Resource definition for the resources in the group, in HOT format. The "
"value of this property is the definition of a resource just as if it had "
"been declared in the template itself."
msgstr ""
-#: heat/engine/resources/openstack/heat/autoscaling_group.py:60
+#: heat/engine/resources/openstack/heat/autoscaling_group.py:67
msgid "Maximum number of resources in the group."
msgstr ""
-#: heat/engine/resources/openstack/heat/autoscaling_group.py:67
+#: heat/engine/resources/openstack/heat/autoscaling_group.py:74
msgid "Minimum number of resources in the group."
msgstr ""
-#: heat/engine/resources/openstack/heat/autoscaling_group.py:79
+#: heat/engine/resources/openstack/heat/autoscaling_group.py:86
msgid "Desired initial number of resources."
msgstr ""
-#: heat/engine/resources/openstack/heat/autoscaling_group.py:84
+#: heat/engine/resources/openstack/heat/autoscaling_group.py:91
msgid "Policy for rolling updates for this scaling group."
msgstr ""
-#: heat/engine/resources/openstack/heat/autoscaling_group.py:89
-#: heat/engine/resources/openstack/heat/resource_group.py:218
+#: heat/engine/resources/openstack/heat/autoscaling_group.py:96
+#: heat/engine/resources/openstack/heat/resource_group.py:213
msgid ""
"The minimum number of resources in service while rolling updates are "
"being executed."
msgstr ""
-#: heat/engine/resources/openstack/heat/autoscaling_group.py:95
-#: heat/engine/resources/openstack/heat/resource_group.py:224
+#: heat/engine/resources/openstack/heat/autoscaling_group.py:102
+#: heat/engine/resources/openstack/heat/resource_group.py:219
msgid "The maximum number of resources to replace at once."
msgstr ""
-#: heat/engine/resources/openstack/heat/autoscaling_group.py:100
-#: heat/engine/resources/openstack/heat/resource_group.py:229
+#: heat/engine/resources/openstack/heat/autoscaling_group.py:107
+#: heat/engine/resources/openstack/heat/resource_group.py:224
msgid "The number of seconds to wait between batches of updates."
msgstr ""
-#: heat/engine/resources/openstack/heat/autoscaling_group.py:116
+#: heat/engine/resources/openstack/heat/autoscaling_group.py:123
msgid ""
"A map of resource names to the specified attribute of each individual "
"resource. Requires heat_template_version: 2014-10-16 or higher."
msgstr ""
-#: heat/engine/resources/openstack/heat/autoscaling_group.py:123
+#: heat/engine/resources/openstack/heat/autoscaling_group.py:130
msgid ""
"A list of the specified attribute of each individual resource. Requires "
"heat_template_version: 2014-10-16 or higher."
msgstr ""
-#: heat/engine/resources/openstack/heat/autoscaling_group.py:129
+#: heat/engine/resources/openstack/heat/autoscaling_group.py:136
msgid "The current size of AutoscalingResourceGroup."
msgstr ""
@@ -3920,29 +3938,29 @@ msgstr ""
msgid "A signed url to handle the alarm (Heat extension)."
msgstr ""
-#: heat/engine/resources/openstack/heat/instance_group.py:78
+#: heat/engine/resources/openstack/heat/instance_group.py:84
msgid "Desired number of instances."
msgstr ""
-#: heat/engine/resources/openstack/heat/instance_group.py:146
+#: heat/engine/resources/openstack/heat/instance_group.py:141
#, python-format
msgid "Maximum %s is 1 hour."
msgstr ""
-#: heat/engine/resources/openstack/heat/instance_group.py:159
+#: heat/engine/resources/openstack/heat/instance_group.py:154
#, python-format
msgid "%(lc)s (%(ref)s) reference can not be found."
msgstr ""
-#: heat/engine/resources/openstack/heat/instance_group.py:164
+#: heat/engine/resources/openstack/heat/instance_group.py:159
#, python-format
msgid ""
"%(lc)s (%(ref)s) requires a reference to the configuration not just the "
"name of the resource."
msgstr ""
-#: heat/engine/resources/openstack/heat/instance_group.py:286
-#: heat/engine/resources/openstack/heat/resource_group.py:543
+#: heat/engine/resources/openstack/heat/instance_group.py:276
+#: heat/engine/resources/openstack/heat/resource_group.py:530
#, python-format
msgid "The current %s will result in stack update timeout."
msgstr ""
@@ -3969,135 +3987,168 @@ msgstr ""
msgid "Optional subtype to specify with the type."
msgstr ""
-#: heat/engine/resources/openstack/heat/random_string.py:65
+#: heat/engine/resources/openstack/heat/random_string.py:71
msgid "Length of the string to generate."
msgstr ""
-#: heat/engine/resources/openstack/heat/random_string.py:73
+#: heat/engine/resources/openstack/heat/random_string.py:79
msgid "Sequence of characters to build the random string from."
msgstr ""
-#: heat/engine/resources/openstack/heat/random_string.py:92
+#: heat/engine/resources/openstack/heat/random_string.py:98
msgid ""
"A list of character class and their constraints to generate the random "
"string from."
msgstr ""
-#: heat/engine/resources/openstack/heat/random_string.py:99
+#: heat/engine/resources/openstack/heat/random_string.py:105
#, python-format
msgid ""
"A character class and its corresponding %(min)s constraint to generate "
"the random string from."
msgstr ""
-#: heat/engine/resources/openstack/heat/random_string.py:111
+#: heat/engine/resources/openstack/heat/random_string.py:117
msgid ""
"The minimum number of characters from this character class that will be "
"in the generated string."
msgstr ""
-#: heat/engine/resources/openstack/heat/random_string.py:124
+#: heat/engine/resources/openstack/heat/random_string.py:130
msgid ""
"A list of character sequences and their constraints to generate the "
"random string from."
msgstr ""
-#: heat/engine/resources/openstack/heat/random_string.py:131
+#: heat/engine/resources/openstack/heat/random_string.py:137
#, python-format
msgid ""
"A character sequence and its corresponding %(min)s constraint to generate"
" the random string from."
msgstr ""
-#: heat/engine/resources/openstack/heat/random_string.py:137
+#: heat/engine/resources/openstack/heat/random_string.py:143
msgid ""
"The minimum number of characters from this sequence that will be in the "
"generated string."
msgstr ""
-#: heat/engine/resources/openstack/heat/random_string.py:150
+#: heat/engine/resources/openstack/heat/random_string.py:156
msgid ""
"Value which can be set or changed on stack update to trigger the resource"
-" for replacement with a new random string . The salt value itself is "
+" for replacement with a new random string. The salt value itself is "
"ignored by the random generator."
msgstr ""
-#: heat/engine/resources/openstack/heat/random_string.py:158
+#: heat/engine/resources/openstack/heat/random_string.py:164
msgid ""
"The random string generated by this resource. This value is also "
"available by referencing the resource."
msgstr ""
-#: heat/engine/resources/openstack/heat/random_string.py:257
+#: heat/engine/resources/openstack/heat/random_string.py:263
#, python-format
msgid ""
"Cannot use deprecated '%(seq)s' property along with '%(char_seqs)s' or "
"'%(char_classes)s' properties"
msgstr ""
-#: heat/engine/resources/openstack/heat/random_string.py:273
+#: heat/engine/resources/openstack/heat/random_string.py:279
msgid ""
"Length property cannot be smaller than combined character class and "
"character sequence minimums"
msgstr ""
-#: heat/engine/resources/openstack/heat/remote_stack.py:61
+#: heat/engine/resources/openstack/heat/remote_stack.py:64
msgid "Context for this stack."
msgstr ""
-#: heat/engine/resources/openstack/heat/remote_stack.py:65
+#: heat/engine/resources/openstack/heat/remote_stack.py:68
msgid "Region name in which this stack will be created."
msgstr ""
-#: heat/engine/resources/openstack/heat/remote_stack.py:72
+#: heat/engine/resources/openstack/heat/remote_stack.py:75
msgid "Template that specifies the stack to be created as a resource."
msgstr ""
-#: heat/engine/resources/openstack/heat/remote_stack.py:79
+#: heat/engine/resources/openstack/heat/remote_stack.py:82
msgid "Number of minutes to wait for this stack creation."
msgstr ""
-#: heat/engine/resources/openstack/heat/remote_stack.py:84
+#: heat/engine/resources/openstack/heat/remote_stack.py:87
msgid "Set of parameters passed to this stack."
msgstr ""
-#: heat/engine/resources/openstack/heat/remote_stack.py:92
+#: heat/engine/resources/openstack/heat/remote_stack.py:95
msgid "Name of the stack."
msgstr ""
-#: heat/engine/resources/openstack/heat/remote_stack.py:96
+#: heat/engine/resources/openstack/heat/remote_stack.py:99
msgid "A dict of key-value pairs output from the stack."
msgstr ""
-#: heat/engine/resources/openstack/heat/remote_stack.py:137
+#: heat/engine/resources/openstack/heat/remote_stack.py:140
#, python-format
msgid ""
"Cannot establish connection to Heat endpoint at region \"%(region)s\" due"
" to \"%(exc)s\""
msgstr ""
-#: heat/engine/resources/openstack/heat/remote_stack.py:154
+#: heat/engine/resources/openstack/heat/remote_stack.py:157
#, python-format
msgid ""
"Failed validating stack template using Heat endpoint at region "
"\"%(region)s\" due to \"%(exc)s\""
msgstr ""
-#: heat/engine/resources/openstack/heat/remote_stack.py:183
+#: heat/engine/resources/openstack/heat/remote_stack.py:184
#, python-format
msgid "Cannot resume %s, resource not found"
msgstr ""
-#: heat/engine/resources/openstack/heat/remote_stack.py:189
+#: heat/engine/resources/openstack/heat/remote_stack.py:190
#, python-format
msgid "Cannot suspend %s, resource not found"
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:123
+#: heat/engine/resources/openstack/heat/resource_chain.py:68
+msgid ""
+"The list of resource types to create. This list may contain type names or"
+" aliases defined in the resource registry. Specific template names are "
+"not supported."
+msgstr ""
+
+#: heat/engine/resources/openstack/heat/resource_chain.py:77
+msgid ""
+"If true, the resources in the chain will be created concurrently. If "
+"false or omitted, each resource will be treated as having a dependency on"
+" the previous resource in the list."
+msgstr ""
+
+#: heat/engine/resources/openstack/heat/resource_chain.py:85
+msgid "Properties to pass to each resource being created in the chain."
+msgstr ""
+
+#: heat/engine/resources/openstack/heat/resource_chain.py:92
+msgid "A list of resource IDs for the resources in the chain."
+msgstr ""
+
+#: heat/engine/resources/openstack/heat/resource_chain.py:97
+msgid ""
+"A map of resource names to the specified attribute of each individual "
+"resource."
+msgstr ""
+
+#: heat/engine/resources/openstack/heat/resource_chain.py:123
+#, python-format
+msgid "Failed to validate nested template: %s"
+msgstr ""
+
+#: heat/engine/resources/openstack/heat/resource_group.py:118
msgid "The number of resources to create."
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:132
+#: heat/engine/resources/openstack/heat/resource_group.py:127
msgid ""
"A variable that this resource will use to replace with the current index "
"of a given resource in the group. Can be used, for example, to customize "
@@ -4105,36 +4156,36 @@ msgid ""
"listed with nova client."
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:145
+#: heat/engine/resources/openstack/heat/resource_group.py:140
msgid ""
"Resource definition for the resources in the group. The value of this "
"property is the definition of a resource just as if it had been declared "
"in the template itself."
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:151
+#: heat/engine/resources/openstack/heat/resource_group.py:146
msgid "The type of the resources in the group"
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:156
+#: heat/engine/resources/openstack/heat/resource_group.py:151
msgid "Property values for the resources in the group"
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:160
+#: heat/engine/resources/openstack/heat/resource_group.py:155
msgid "Supplied metadata for the resources in the group"
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:170
+#: heat/engine/resources/openstack/heat/resource_group.py:165
msgid "Policies for removal of resources on update"
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:173
+#: heat/engine/resources/openstack/heat/resource_group.py:168
msgid ""
"Policy to be processed when doing an update which requires removal of "
"specific resources."
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:178
+#: heat/engine/resources/openstack/heat/resource_group.py:173
msgid ""
"List of resources to be removed when doing an update which requires "
"removal of specific resources. The resource may be specified several "
@@ -4145,25 +4196,25 @@ msgid ""
"it's name is never reused in subsequent updates"
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:203
+#: heat/engine/resources/openstack/heat/resource_group.py:198
msgid "A list of resource IDs for the resources in the group"
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:207
+#: heat/engine/resources/openstack/heat/resource_group.py:202
msgid ""
"A map of resource names to the specified attribute of each individual "
"resource. Requires heat_template_version: 2014-10-16."
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:238
+#: heat/engine/resources/openstack/heat/resource_group.py:233
msgid "The maximum number of resources to create at once."
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:244
+#: heat/engine/resources/openstack/heat/resource_group.py:239
msgid "The number of seconds to wait between batches."
msgstr ""
-#: heat/engine/resources/openstack/heat/resource_group.py:297
+#: heat/engine/resources/openstack/heat/resource_group.py:283
#, python-format
msgid "Failed to validate: %s"
msgstr ""
@@ -4219,101 +4270,101 @@ msgid ""
"SoftwareComponent \"%s\" is not allowed."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:71
+#: heat/engine/resources/openstack/heat/software_config.py:68
msgid "Name of the input."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:76
+#: heat/engine/resources/openstack/heat/software_config.py:73
msgid "Description of the input."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:80
+#: heat/engine/resources/openstack/heat/software_config.py:77
msgid "Type of the value of the input."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:87
+#: heat/engine/resources/openstack/heat/software_config.py:84
msgid "Default value for the input if none is specified."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:94
+#: heat/engine/resources/openstack/heat/software_config.py:91
msgid "Name of the output."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:99
+#: heat/engine/resources/openstack/heat/software_config.py:96
msgid "Description of the output."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:103
+#: heat/engine/resources/openstack/heat/software_config.py:100
msgid "Type of the value of the output."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:110
+#: heat/engine/resources/openstack/heat/software_config.py:107
msgid ""
"Denotes that the deployment is in an error state if this output has a "
"value."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:119
+#: heat/engine/resources/openstack/heat/software_config.py:116
msgid ""
"Namespace to group this software config by when delivered to a server. "
"This may imply what configuration tool is going to perform the "
"configuration."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:126
+#: heat/engine/resources/openstack/heat/software_config.py:123
msgid ""
"Configuration script or manifest which specifies what actual "
"configuration is performed."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:131
+#: heat/engine/resources/openstack/heat/software_config.py:128
msgid ""
"Map containing options specific to the configuration management tool used"
" by this resource."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:136
+#: heat/engine/resources/openstack/heat/software_config.py:133
msgid "Schema representing the inputs that this software config is expecting."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:143
+#: heat/engine/resources/openstack/heat/software_config.py:140
msgid "Schema representing the outputs that this software config will produce."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_config.py:152
+#: heat/engine/resources/openstack/heat/software_config.py:149
msgid "The config value of the software config."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:122
+#: heat/engine/resources/openstack/heat/software_deployment.py:123
msgid ""
"ID of software configuration resource to execute when applying to the "
"server."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:128
+#: heat/engine/resources/openstack/heat/software_deployment.py:129
msgid ""
"ID of resource to apply configuration to. Normally this should be a Nova "
"server ID."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:134
+#: heat/engine/resources/openstack/heat/software_deployment.py:135
msgid "Input values to apply to the software configuration on this server."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:140
+#: heat/engine/resources/openstack/heat/software_deployment.py:141
msgid ""
"Which lifecycle actions of the deployment resource will result in this "
"deployment being triggered."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:148
+#: heat/engine/resources/openstack/heat/software_deployment.py:149
msgid ""
"Name of the derived config associated with this deployment. This is used "
"to apply a sort order to the list of configurations currently deployed to"
" a server."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:154
+#: heat/engine/resources/openstack/heat/software_deployment.py:156
msgid ""
"How the server should signal to heat with the deployment output values. "
"CFN_SIGNAL will allow an HTTP POST to a CFN keypair signed URL. "
@@ -4325,141 +4376,143 @@ msgid ""
"for any signal."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:172
+#: heat/engine/resources/openstack/heat/software_deployment.py:174
msgid "Captured stdout from the configuration execution."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:176
+#: heat/engine/resources/openstack/heat/software_deployment.py:178
msgid "Captured stderr from the configuration execution."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:180
+#: heat/engine/resources/openstack/heat/software_deployment.py:182
msgid "Returned status code from the configuration execution"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:221
+#: heat/engine/resources/openstack/heat/software_deployment.py:223
msgid "Not waiting for outputs signal"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:224
+#: heat/engine/resources/openstack/heat/software_deployment.py:226
msgid "Deploy data available"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:289
+#: heat/engine/resources/openstack/heat/software_deployment.py:295
#, python-format
msgid "Deployment to server failed: %s"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:342
+#: heat/engine/resources/openstack/heat/software_deployment.py:348
msgid "ID of the server being deployed to"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:347
+#: heat/engine/resources/openstack/heat/software_deployment.py:353
msgid "Name of the current action being deployed"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:352
+#: heat/engine/resources/openstack/heat/software_deployment.py:358
msgid "ID of the stack this deployment belongs to"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:357
+#: heat/engine/resources/openstack/heat/software_deployment.py:363
msgid "Name of this deployment resource in the stack"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:363
+#: heat/engine/resources/openstack/heat/software_deployment.py:369
msgid "How the server should signal to heat with the deployment output values."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:371
-#: heat/engine/resources/openstack/heat/software_deployment.py:386
+#: heat/engine/resources/openstack/heat/software_deployment.py:377
+#: heat/engine/resources/openstack/heat/software_deployment.py:392
msgid "ID of signal to use for signaling output values"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:378
-#: heat/engine/resources/openstack/heat/software_deployment.py:393
+#: heat/engine/resources/openstack/heat/software_deployment.py:384
+#: heat/engine/resources/openstack/heat/software_deployment.py:399
msgid "HTTP verb to use for signaling output values"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:402
+#: heat/engine/resources/openstack/heat/software_deployment.py:408
msgid "URL for API authentication"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:407
+#: heat/engine/resources/openstack/heat/software_deployment.py:413
msgid "Username for API authentication"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:412
+#: heat/engine/resources/openstack/heat/software_deployment.py:418
msgid "User ID for API authentication"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:417
+#: heat/engine/resources/openstack/heat/software_deployment.py:423
msgid "Password for API authentication"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:422
+#: heat/engine/resources/openstack/heat/software_deployment.py:428
msgid "ID of project for API authentication"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:429
+#: heat/engine/resources/openstack/heat/software_deployment.py:435
msgid "ID of queue to use for signaling output values"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:539
+#: heat/engine/resources/openstack/heat/software_deployment.py:545
#, python-format
msgid ""
"Resource %s's property user_data_format should be set to SOFTWARE_CONFIG "
"since there are software deployments on it."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:587
+#: heat/engine/resources/openstack/heat/software_deployment.py:593
msgid "A map of Nova names and IDs to apply configuration to."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:599
+#: heat/engine/resources/openstack/heat/software_deployment.py:605
msgid ""
"A map of Nova names and captured stdouts from the configuration execution"
" to each server."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:604
+#: heat/engine/resources/openstack/heat/software_deployment.py:610
msgid ""
"A map of Nova names and captured stderrs from the configuration execution"
" to each server."
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:609
+#: heat/engine/resources/openstack/heat/software_deployment.py:615
msgid ""
"A map of Nova names and returned status code from the configuration "
"execution"
msgstr ""
-#: heat/engine/resources/openstack/heat/software_deployment.py:662
+#: heat/engine/resources/openstack/heat/software_deployment.py:659
msgid ""
-"This resource is deprecated and use is discouraged. Please use resource "
-"OS::Heat:SoftwareDeploymentGroup instead."
+"The resource OS::Heat::SoftwareDeployments is deprecated and usage is "
+"discouraged. Please use resource OS::Heat::SoftwareDeploymentGroup "
+"instead."
msgstr ""
-#: heat/engine/resources/openstack/heat/structured_config.py:62
+#: heat/engine/resources/openstack/heat/structured_config.py:64
msgid ""
"Map representing the configuration data structure which will be "
"serialized to JSON format."
msgstr ""
-#: heat/engine/resources/openstack/heat/structured_config.py:118
+#: heat/engine/resources/openstack/heat/structured_config.py:120
msgid "Name of key to use for substituting inputs during deployment"
msgstr ""
-#: heat/engine/resources/openstack/heat/structured_config.py:123
+#: heat/engine/resources/openstack/heat/structured_config.py:125
msgid ""
"Perform a check on the input values passed to verify that each required "
"input has a corresponding value. When the property is set to STRICT and "
"no value is passed, an exception is raised."
msgstr ""
-#: heat/engine/resources/openstack/heat/structured_config.py:238
+#: heat/engine/resources/openstack/heat/structured_config.py:233
msgid ""
-"This resource is deprecated and use is discouraged. Please use resource "
-"OS::Heat:StructuredDeploymentGroup instead."
+"The resource OS::Heat::StructuredDeployments is deprecated and usage is "
+"discouraged. Please use resource OS::Heat::StructuredDeploymentGroup "
+"instead."
msgstr ""
#: heat/engine/resources/openstack/heat/swiftsignal.py:71
@@ -4607,63 +4660,92 @@ msgid ""
" property."
msgstr ""
-#: heat/engine/resources/openstack/keystone/endpoint.py:26
-#: heat/engine/resources/openstack/keystone/group.py:28
-#: heat/engine/resources/openstack/keystone/project.py:26
-#: heat/engine/resources/openstack/keystone/role.py:25
-#: heat/engine/resources/openstack/keystone/role_assignments.py:317
-#: heat/engine/resources/openstack/keystone/role_assignments.py:368
-#: heat/engine/resources/openstack/keystone/service.py:25
-#: heat/engine/resources/openstack/keystone/user.py:28
+#: heat/engine/resources/openstack/keystone/endpoint.py:31
+#: heat/engine/resources/openstack/keystone/group.py:33
+#: heat/engine/resources/openstack/keystone/project.py:33
+#: heat/engine/resources/openstack/keystone/region.py:32
+#: heat/engine/resources/openstack/keystone/role.py:30
+#: heat/engine/resources/openstack/keystone/role_assignments.py:319
+#: heat/engine/resources/openstack/keystone/role_assignments.py:370
+#: heat/engine/resources/openstack/keystone/service.py:28
+#: heat/engine/resources/openstack/keystone/user.py:33
msgid "Supported versions: keystone v3"
msgstr ""
-#: heat/engine/resources/openstack/keystone/endpoint.py:41
+#: heat/engine/resources/openstack/keystone/endpoint.py:46
msgid "Name of keystone endpoint."
msgstr ""
-#: heat/engine/resources/openstack/keystone/endpoint.py:46
+#: heat/engine/resources/openstack/keystone/endpoint.py:51
msgid "Name or Id of keystone region."
msgstr ""
-#: heat/engine/resources/openstack/keystone/endpoint.py:51
+#: heat/engine/resources/openstack/keystone/endpoint.py:57
msgid "Name or Id of keystone service."
msgstr ""
-#: heat/engine/resources/openstack/keystone/endpoint.py:58
+#: heat/engine/resources/openstack/keystone/endpoint.py:64
msgid "Interface type of keystone service endpoint."
msgstr ""
-#: heat/engine/resources/openstack/keystone/endpoint.py:67
+#: heat/engine/resources/openstack/keystone/endpoint.py:73
msgid "URL of keystone service endpoint."
msgstr ""
-#: heat/engine/resources/openstack/keystone/group.py:43
-msgid "Name of keystone group."
+#: heat/engine/resources/openstack/keystone/endpoint.py:79
+msgid "This endpoint is enabled or disabled."
msgstr ""
#: heat/engine/resources/openstack/keystone/group.py:48
-#: heat/engine/resources/openstack/keystone/project.py:46
+msgid "Name of keystone group."
+msgstr ""
+
+#: heat/engine/resources/openstack/keystone/group.py:53
+#: heat/engine/resources/openstack/keystone/project.py:53
msgid "Name or id of keystone domain."
msgstr ""
-#: heat/engine/resources/openstack/keystone/group.py:55
+#: heat/engine/resources/openstack/keystone/group.py:60
msgid "Description of keystone group."
msgstr ""
-#: heat/engine/resources/openstack/keystone/project.py:41
+#: heat/engine/resources/openstack/keystone/project.py:48
msgid "Name of keystone project."
msgstr ""
-#: heat/engine/resources/openstack/keystone/project.py:53
+#: heat/engine/resources/openstack/keystone/project.py:60
msgid "Description of keystone project."
msgstr ""
-#: heat/engine/resources/openstack/keystone/project.py:59
+#: heat/engine/resources/openstack/keystone/project.py:66
msgid "This project is enabled or disabled."
msgstr ""
-#: heat/engine/resources/openstack/keystone/role.py:40
+#: heat/engine/resources/openstack/keystone/project.py:72
+msgid "The name or ID of parent of this keystone project in hierarchy."
+msgstr ""
+
+#: heat/engine/resources/openstack/keystone/region.py:47
+msgid ""
+"The user-defined region ID and should unique to the OpenStack deployment."
+" While creating the region, heat will url encode this ID."
+msgstr ""
+
+#: heat/engine/resources/openstack/keystone/region.py:53
+msgid ""
+"If the region is hierarchically a child of another region, set this "
+"parameter to the ID of the parent region."
+msgstr ""
+
+#: heat/engine/resources/openstack/keystone/region.py:60
+msgid "Description of keystone region."
+msgstr ""
+
+#: heat/engine/resources/openstack/keystone/region.py:65
+msgid "This region is enabled or disabled."
+msgstr ""
+
+#: heat/engine/resources/openstack/keystone/role.py:45
msgid "Name of keystone role."
msgstr ""
@@ -4687,64 +4769,68 @@ msgstr ""
msgid "Keystone domain"
msgstr ""
-#: heat/engine/resources/openstack/keystone/role_assignments.py:306
+#: heat/engine/resources/openstack/keystone/role_assignments.py:308
#, python-format
msgid "Either project or domain must be specified for role %s"
msgstr ""
-#: heat/engine/resources/openstack/keystone/role_assignments.py:330
+#: heat/engine/resources/openstack/keystone/role_assignments.py:332
msgid "Name or id of keystone user."
msgstr ""
-#: heat/engine/resources/openstack/keystone/role_assignments.py:381
+#: heat/engine/resources/openstack/keystone/role_assignments.py:383
msgid "Name or id of keystone group."
msgstr ""
-#: heat/engine/resources/openstack/keystone/service.py:40
+#: heat/engine/resources/openstack/keystone/service.py:43
msgid "Name of keystone service."
msgstr ""
-#: heat/engine/resources/openstack/keystone/service.py:45
+#: heat/engine/resources/openstack/keystone/service.py:48
msgid "Description of keystone service."
msgstr ""
-#: heat/engine/resources/openstack/keystone/service.py:50
+#: heat/engine/resources/openstack/keystone/service.py:53
msgid "Type of keystone Service."
msgstr ""
-#: heat/engine/resources/openstack/keystone/user.py:45
-msgid "Name of keystone user."
+#: heat/engine/resources/openstack/keystone/service.py:59
+msgid "This service is enabled or disabled."
msgstr ""
#: heat/engine/resources/openstack/keystone/user.py:50
+msgid "Name of keystone user."
+msgstr ""
+
+#: heat/engine/resources/openstack/keystone/user.py:55
msgid "Name of keystone domain."
msgstr ""
-#: heat/engine/resources/openstack/keystone/user.py:57
+#: heat/engine/resources/openstack/keystone/user.py:62
msgid "Description of keystone user."
msgstr ""
-#: heat/engine/resources/openstack/keystone/user.py:63
+#: heat/engine/resources/openstack/keystone/user.py:68
msgid "Keystone user is enabled or disabled"
msgstr ""
-#: heat/engine/resources/openstack/keystone/user.py:69
+#: heat/engine/resources/openstack/keystone/user.py:74
msgid "Email address of keystone user."
msgstr ""
-#: heat/engine/resources/openstack/keystone/user.py:74
+#: heat/engine/resources/openstack/keystone/user.py:79
msgid "Password of keystone user."
msgstr ""
-#: heat/engine/resources/openstack/keystone/user.py:79
+#: heat/engine/resources/openstack/keystone/user.py:84
msgid "Default project of keystone user."
msgstr ""
-#: heat/engine/resources/openstack/keystone/user.py:85
+#: heat/engine/resources/openstack/keystone/user.py:90
msgid "keystone user groups."
msgstr ""
-#: heat/engine/resources/openstack/keystone/user.py:89
+#: heat/engine/resources/openstack/keystone/user.py:94
msgid "keystone user group."
msgstr ""
@@ -4753,114 +4839,117 @@ msgid "The bay name."
msgstr ""
#: heat/engine/resources/openstack/magnum/bay.py:48
-msgid "The ID of the bay model."
+msgid "The name or ID of the bay model."
msgstr ""
-#: heat/engine/resources/openstack/magnum/bay.py:53
+#: heat/engine/resources/openstack/magnum/bay.py:56
msgid "The node count for this bay."
msgstr ""
-#: heat/engine/resources/openstack/magnum/bay.py:59
+#: heat/engine/resources/openstack/magnum/bay.py:62
msgid "The number of master nodes for this bay."
msgstr ""
-#: heat/engine/resources/openstack/magnum/bay.py:65
-msgid "Url used for bay node discovery."
+#: heat/engine/resources/openstack/magnum/bay.py:68
+msgid "Specifies a custom discovery url for node discovery."
msgstr ""
-#: heat/engine/resources/openstack/magnum/bay.py:69
+#: heat/engine/resources/openstack/magnum/bay.py:72
msgid "Timeout for creating the bay in minutes. Set to 0 for no timeout."
msgstr ""
-#: heat/engine/resources/openstack/magnum/bay.py:102
+#: heat/engine/resources/openstack/magnum/bay.py:105
#, python-format
msgid "Failed to create Bay '%(name)s' - %(reason)s"
msgstr ""
-#: heat/engine/resources/openstack/magnum/bay.py:107
+#: heat/engine/resources/openstack/magnum/bay.py:110
#, python-format
msgid "Unknown status creating Bay '%(name)s' - %(reason)s"
msgstr ""
-#: heat/engine/resources/openstack/magnum/bay.py:130
+#: heat/engine/resources/openstack/magnum/bay.py:133
#, python-format
msgid "Failed to update Bay '%(name)s' - %(reason)s"
msgstr ""
-#: heat/engine/resources/openstack/magnum/bay.py:136
+#: heat/engine/resources/openstack/magnum/bay.py:139
#, python-format
msgid "Unknown status updating Bay '%(name)s' - %(reason)s"
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:41
+#: heat/engine/resources/openstack/magnum/baymodel.py:45
msgid "The bay model name."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:45
+#: heat/engine/resources/openstack/magnum/baymodel.py:49
msgid "The image name or UUID to use as a base image for this baymodel."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:54
+#: heat/engine/resources/openstack/magnum/baymodel.py:58
msgid "The flavor of this bay model."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:61
+#: heat/engine/resources/openstack/magnum/baymodel.py:65
msgid "The flavor of the master node for this bay model."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:68
+#: heat/engine/resources/openstack/magnum/baymodel.py:72
msgid "The name or id of the nova ssh keypair."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:76
+#: heat/engine/resources/openstack/magnum/baymodel.py:80
msgid "The external network to attach the Bay."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:84
+#: heat/engine/resources/openstack/magnum/baymodel.py:88
msgid "The fixed network to attach the Bay."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:91
+#: heat/engine/resources/openstack/magnum/baymodel.py:95
msgid "The DNS nameserver address."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:99
+#: heat/engine/resources/openstack/magnum/baymodel.py:103
msgid "The size in GB of the docker volume."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:106
+#: heat/engine/resources/openstack/magnum/baymodel.py:110
msgid "The SSH Authorized Key."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:110
+#: heat/engine/resources/openstack/magnum/baymodel.py:114
msgid "The Container Orchestration Engine for this bay model."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:118
-msgid "The name of the driver used for instantiating container networks."
+#: heat/engine/resources/openstack/magnum/baymodel.py:122
+msgid ""
+"The name of the driver used for instantiating container networks. By "
+"default, Magnum will choose the pre-configured network driver based on "
+"COE type."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:125
+#: heat/engine/resources/openstack/magnum/baymodel.py:129
msgid "The http_proxy address to use for nodes in bay."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:130
+#: heat/engine/resources/openstack/magnum/baymodel.py:134
msgid "The https_proxy address to use for nodes in bay."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:135
+#: heat/engine/resources/openstack/magnum/baymodel.py:139
msgid ""
"A comma separated list of addresses for which proxies should not be used "
"in the bay."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:141
+#: heat/engine/resources/openstack/magnum/baymodel.py:145
msgid ""
"Arbitrary labels in the form of key=value pairs to associate with a "
"baymodel."
msgstr ""
-#: heat/engine/resources/openstack/magnum/baymodel.py:147
+#: heat/engine/resources/openstack/magnum/baymodel.py:151
msgid "Disable TLS in the Bay."
msgstr ""
@@ -5057,161 +5146,170 @@ msgstr ""
#: heat/engine/resources/openstack/manila/share_type.py:54
msgid ""
"Required extra specification. Defines if share drivers handles share "
-"servers. "
+"servers."
msgstr ""
#: heat/engine/resources/openstack/manila/share_type.py:60
msgid "Extra specs key-value pairs defined for share type."
msgstr ""
-#: heat/engine/resources/openstack/mistral/cron_trigger.py:46
+#: heat/engine/resources/openstack/mistral/cron_trigger.py:54
msgid "Name of the cron trigger."
msgstr ""
-#: heat/engine/resources/openstack/mistral/cron_trigger.py:50
+#: heat/engine/resources/openstack/mistral/cron_trigger.py:58
msgid "Cron expression."
msgstr ""
-#: heat/engine/resources/openstack/mistral/cron_trigger.py:58
+#: heat/engine/resources/openstack/mistral/cron_trigger.py:66
msgid "Workflow to execute."
msgstr ""
-#: heat/engine/resources/openstack/mistral/cron_trigger.py:63
+#: heat/engine/resources/openstack/mistral/cron_trigger.py:71
msgid "Name of the workflow."
msgstr ""
-#: heat/engine/resources/openstack/mistral/cron_trigger.py:67
+#: heat/engine/resources/openstack/mistral/cron_trigger.py:75
msgid "Input values for the workflow."
msgstr ""
-#: heat/engine/resources/openstack/mistral/cron_trigger.py:73
+#: heat/engine/resources/openstack/mistral/cron_trigger.py:81
msgid "Time of the first execution in format \"YYYY-MM-DD HH:MM\"."
msgstr ""
-#: heat/engine/resources/openstack/mistral/cron_trigger.py:77
+#: heat/engine/resources/openstack/mistral/cron_trigger.py:85
msgid "Remaining executions."
msgstr ""
-#: heat/engine/resources/openstack/mistral/cron_trigger.py:83
+#: heat/engine/resources/openstack/mistral/cron_trigger.py:91
msgid "Time of the next execution in format \"YYYY-MM-DD HH:MM:SS\"."
msgstr ""
-#: heat/engine/resources/openstack/mistral/cron_trigger.py:87
+#: heat/engine/resources/openstack/mistral/cron_trigger.py:95
msgid "Number of remaining executions."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:76
+#: heat/engine/resources/openstack/mistral/workflow.py:86
msgid "Workflow name."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:80
+#: heat/engine/resources/openstack/mistral/workflow.py:90
msgid "Workflow type."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:89
+#: heat/engine/resources/openstack/mistral/workflow.py:99
+msgid ""
+"Defines the method in which the request body for signaling a workflow "
+"would be parsed. In case this property is set to True, the body would be "
+"parsed as a simple json where each key is a workflow input, in other "
+"cases body would be parsed expecting a specific json format with two "
+"keys: \"input\" and \"params\""
+msgstr ""
+
+#: heat/engine/resources/openstack/mistral/workflow.py:110
msgid "Workflow description."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:94
+#: heat/engine/resources/openstack/mistral/workflow.py:115
msgid "Dictionary which contains input for workflow."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:99
+#: heat/engine/resources/openstack/mistral/workflow.py:120
msgid ""
"Any data structure arbitrarily containing YAQL expressions that defines "
"workflow output. May be nested."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:106
+#: heat/engine/resources/openstack/mistral/workflow.py:127
msgid ""
"Workflow additional parameters. If Workflow is reverse typed, params "
"requires 'task_name', which defines initial task."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:112
+#: heat/engine/resources/openstack/mistral/workflow.py:133
msgid "Default settings for some of task attributes defined at workflow level."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:119
-#: heat/engine/resources/openstack/mistral/workflow.py:210
+#: heat/engine/resources/openstack/mistral/workflow.py:140
+#: heat/engine/resources/openstack/mistral/workflow.py:231
msgid "List of tasks which will run after the task has completed successfully."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:124
-#: heat/engine/resources/openstack/mistral/workflow.py:215
+#: heat/engine/resources/openstack/mistral/workflow.py:145
+#: heat/engine/resources/openstack/mistral/workflow.py:236
msgid "List of tasks which will run after the task has completed with an error."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:129
-#: heat/engine/resources/openstack/mistral/workflow.py:220
+#: heat/engine/resources/openstack/mistral/workflow.py:150
+#: heat/engine/resources/openstack/mistral/workflow.py:241
msgid ""
"List of tasks which will run after the task has completed regardless of "
"whether it is successful or not."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:135
-#: heat/engine/resources/openstack/mistral/workflow.py:240
+#: heat/engine/resources/openstack/mistral/workflow.py:156
+#: heat/engine/resources/openstack/mistral/workflow.py:261
msgid ""
"List of tasks which should be executed before this task. Used only in "
"reverse workflows."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:140
-#: heat/engine/resources/openstack/mistral/workflow.py:245
+#: heat/engine/resources/openstack/mistral/workflow.py:161
+#: heat/engine/resources/openstack/mistral/workflow.py:266
msgid "Defines a pattern how task should be repeated in case of an error."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:145
-#: heat/engine/resources/openstack/mistral/workflow.py:251
+#: heat/engine/resources/openstack/mistral/workflow.py:166
+#: heat/engine/resources/openstack/mistral/workflow.py:272
msgid ""
"Defines a delay in seconds that Mistral Engine should wait before "
"starting a task."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:150
-#: heat/engine/resources/openstack/mistral/workflow.py:257
+#: heat/engine/resources/openstack/mistral/workflow.py:171
+#: heat/engine/resources/openstack/mistral/workflow.py:278
msgid ""
"Defines a delay in seconds that Mistral Engine should wait after a task "
"has completed before starting next tasks defined in on-success, on-error "
"or on-complete."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:157
+#: heat/engine/resources/openstack/mistral/workflow.py:178
msgid ""
"Defines whether Mistral Engine should put the workflow on hold or not "
"before starting a task"
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:162
-#: heat/engine/resources/openstack/mistral/workflow.py:272
+#: heat/engine/resources/openstack/mistral/workflow.py:183
+#: heat/engine/resources/openstack/mistral/workflow.py:293
msgid ""
"Defines a period of time in seconds after which a task will be failed "
"automatically by engine if hasn't completed."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:171
+#: heat/engine/resources/openstack/mistral/workflow.py:192
msgid "Dictionary containing workflow tasks."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:177
+#: heat/engine/resources/openstack/mistral/workflow.py:198
msgid "Task name."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:182
+#: heat/engine/resources/openstack/mistral/workflow.py:203
msgid "Task description."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:186
+#: heat/engine/resources/openstack/mistral/workflow.py:207
msgid "Actual input parameter values of the task."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:190
+#: heat/engine/resources/openstack/mistral/workflow.py:211
msgid ""
"Name of the action associated with the task. Either action or workflow "
"may be defined in the task."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:196
+#: heat/engine/resources/openstack/mistral/workflow.py:217
msgid ""
"Name of the workflow associated with the task. Can be defined by "
"intrinsic function get_resource or by name of the referenced workflow, "
@@ -5219,51 +5317,60 @@ msgid ""
"Either action or workflow may be defined in the task."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:205
+#: heat/engine/resources/openstack/mistral/workflow.py:226
msgid "Dictionary of variables to publish to the workflow context."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:226
+#: heat/engine/resources/openstack/mistral/workflow.py:247
msgid ""
"Dictionary-like section defining task policies that influence how Mistral"
" Engine runs tasks. Must satisfy Mistral DSL v2."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:232
+#: heat/engine/resources/openstack/mistral/workflow.py:253
msgid "Add needed policies directly to the task, Policy keyword is not needed"
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:265
+#: heat/engine/resources/openstack/mistral/workflow.py:286
msgid ""
"Defines whether Mistral Engine should put the workflow on hold or not "
"before starting a task."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:279
+#: heat/engine/resources/openstack/mistral/workflow.py:300
msgid ""
"If configured, it allows to run action or workflow associated with a task"
" multiple times on a provided list of items."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:286
+#: heat/engine/resources/openstack/mistral/workflow.py:307
msgid "Allowing not to store action results after task completion."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:292
+#: heat/engine/resources/openstack/mistral/workflow.py:313
msgid "It defines an executor to which task action should be sent to."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:305
+#: heat/engine/resources/openstack/mistral/workflow.py:319
+msgid ""
+"Allows to synchronize multiple parallel workflow branches and aggregate "
+"their data. Valid inputs: all - the task will run only if all upstream "
+"tasks are completed. Any numeric value - then the task will run once at "
+"least this number of upstream tasks are completed and corresponding "
+"conditions have triggered."
+msgstr ""
+
+#: heat/engine/resources/openstack/mistral/workflow.py:338
msgid "A dictionary which contains name and input of the workflow."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:309
+#: heat/engine/resources/openstack/mistral/workflow.py:342
msgid ""
"A signed url to create executions for workflows specified in Workflow "
"resource."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:314
+#: heat/engine/resources/openstack/mistral/workflow.py:347
msgid ""
"List of workflows' executions, each of them is a dictionary with "
"information about execution. Each dictionary returns values for next "
@@ -5271,124 +5378,126 @@ msgid ""
"execution state, input, output."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:331
+#: heat/engine/resources/openstack/mistral/workflow.py:373
#, python-format
msgid "Input in signal data must be a map, find a %s"
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:334
-#: heat/engine/resources/openstack/mistral/workflow.py:341
-#: heat/engine/resources/openstack/mistral/workflow.py:347
+#: heat/engine/resources/openstack/mistral/workflow.py:376
+#: heat/engine/resources/openstack/mistral/workflow.py:383
+#: heat/engine/resources/openstack/mistral/workflow.py:389
msgid "Signal data error"
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:339
+#: heat/engine/resources/openstack/mistral/workflow.py:381
#, python-format
msgid "Unknown input %s"
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:344
+#: heat/engine/resources/openstack/mistral/workflow.py:386
#, python-format
msgid "Params must be a map, find a %s"
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:356
-#: heat/engine/resources/openstack/mistral/workflow.py:383
+#: heat/engine/resources/openstack/mistral/workflow.py:398
+#: heat/engine/resources/openstack/mistral/workflow.py:425
msgid "Mistral resource validation error"
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:362
+#: heat/engine/resources/openstack/mistral/workflow.py:404
msgid "'task_name' is not assigned in 'params' in case of reverse type workflow."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:376
+#: heat/engine/resources/openstack/mistral/workflow.py:418
#, python-format
msgid ""
"task %(task)s contains property 'requires' in case of direct workflow. "
"Only reverse workflows can contain property 'requires'."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:396
+#: heat/engine/resources/openstack/mistral/workflow.py:438
#, python-format
msgid "Property %(policies)s and %(item)s cannot be used both at one time."
msgstr ""
-#: heat/engine/resources/openstack/mistral/workflow.py:415
+#: heat/engine/resources/openstack/mistral/workflow.py:457
#, python-format
msgid "No such workflow %s"
msgstr ""
-#: heat/engine/resources/openstack/monasca/alarm_definition.py:56
+#: heat/engine/resources/openstack/monasca/alarm_definition.py:61
msgid "Name of the alarm. By default, physical resource name is used."
msgstr ""
-#: heat/engine/resources/openstack/monasca/alarm_definition.py:62
+#: heat/engine/resources/openstack/monasca/alarm_definition.py:67
msgid "Description of the alarm."
msgstr ""
-#: heat/engine/resources/openstack/monasca/alarm_definition.py:67
+#: heat/engine/resources/openstack/monasca/alarm_definition.py:72
msgid "Expression of the alarm to evaluate."
msgstr ""
-#: heat/engine/resources/openstack/monasca/alarm_definition.py:73
+#: heat/engine/resources/openstack/monasca/alarm_definition.py:78
msgid ""
"The metric dimensions to match to the alarm dimensions. One or more "
"dimension key names separated by a comma."
msgstr ""
-#: heat/engine/resources/openstack/monasca/alarm_definition.py:87
+#: heat/engine/resources/openstack/monasca/alarm_definition.py:92
msgid "The notification methods to use when an alarm state is OK."
msgstr ""
-#: heat/engine/resources/openstack/monasca/alarm_definition.py:91
-#: heat/engine/resources/openstack/monasca/alarm_definition.py:103
-#: heat/engine/resources/openstack/monasca/alarm_definition.py:116
+#: heat/engine/resources/openstack/monasca/alarm_definition.py:96
+#: heat/engine/resources/openstack/monasca/alarm_definition.py:108
+#: heat/engine/resources/openstack/monasca/alarm_definition.py:121
msgid "Monasca notification"
msgstr ""
-#: heat/engine/resources/openstack/monasca/alarm_definition.py:99
+#: heat/engine/resources/openstack/monasca/alarm_definition.py:104
msgid "The notification methods to use when an alarm state is ALARM."
msgstr ""
-#: heat/engine/resources/openstack/monasca/alarm_definition.py:111
+#: heat/engine/resources/openstack/monasca/alarm_definition.py:116
msgid "The notification methods to use when an alarm state is UNDETERMINED."
msgstr ""
-#: heat/engine/resources/openstack/monasca/alarm_definition.py:124
+#: heat/engine/resources/openstack/monasca/alarm_definition.py:129
msgid "Whether to enable the actions or not."
msgstr ""
-#: heat/engine/resources/openstack/monasca/notification.py:52
+#: heat/engine/resources/openstack/monasca/notification.py:54
msgid "Name of the notification. By default, physical resource name is used."
msgstr ""
-#: heat/engine/resources/openstack/monasca/notification.py:58
+#: heat/engine/resources/openstack/monasca/notification.py:60
msgid "Type of the notification."
msgstr ""
-#: heat/engine/resources/openstack/monasca/notification.py:67
+#: heat/engine/resources/openstack/monasca/notification.py:69
msgid ""
"Address of the notification. It could be a valid email address, url or "
"service key based on notification type."
msgstr ""
#: heat/engine/resources/openstack/neutron/extraroute.py:31
-msgid "This resource is not supported, use at your own risk."
+msgid ""
+"The resource OS::Neutron::ExtraRoute is not supported, use at your own "
+"risk."
msgstr ""
-#: heat/engine/resources/openstack/neutron/extraroute.py:42
+#: heat/engine/resources/openstack/neutron/extraroute.py:43
msgid "The router id."
msgstr ""
-#: heat/engine/resources/openstack/neutron/extraroute.py:50
+#: heat/engine/resources/openstack/neutron/extraroute.py:51
msgid "Network in CIDR notation."
msgstr ""
-#: heat/engine/resources/openstack/neutron/extraroute.py:54
+#: heat/engine/resources/openstack/neutron/extraroute.py:55
msgid "Nexthop IP address."
msgstr ""
-#: heat/engine/resources/openstack/neutron/extraroute.py:86
+#: heat/engine/resources/openstack/neutron/extraroute.py:87
msgid "Route duplicates an existing route."
msgstr ""
@@ -5413,10 +5522,10 @@ msgid "The ID of the firewall policy that this firewall is associated with."
msgstr ""
#: heat/engine/resources/openstack/neutron/firewall.py:71
+#: heat/engine/resources/openstack/neutron/net.py:48
msgid ""
-"Extra parameters to include in the \"firewall\" object in the creation "
-"request. Parameters are often specific to installed hardware or "
-"extensions."
+"Extra parameters to include in the request. Parameters are often specific"
+" to installed hardware or extensions."
msgstr ""
#: heat/engine/resources/openstack/neutron/firewall.py:79
@@ -5447,24 +5556,24 @@ msgid "The status of the firewall."
msgstr ""
#: heat/engine/resources/openstack/neutron/firewall.py:115
-#: heat/engine/resources/openstack/neutron/firewall.py:412
+#: heat/engine/resources/openstack/neutron/firewall.py:414
msgid "Id of the tenant owning the firewall."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:167
-#: heat/engine/resources/openstack/neutron/firewall.py:201
+#: heat/engine/resources/openstack/neutron/firewall.py:169
+#: heat/engine/resources/openstack/neutron/firewall.py:203
msgid "Name for the firewall policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:172
+#: heat/engine/resources/openstack/neutron/firewall.py:174
msgid "Description for the firewall policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:177
+#: heat/engine/resources/openstack/neutron/firewall.py:179
msgid "Whether this policy should be shared across all tenants."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:183
+#: heat/engine/resources/openstack/neutron/firewall.py:185
msgid ""
"Whether this policy should be audited. When set to True, each time the "
"firewall policy or the associated firewall rules are changed, this "
@@ -5472,122 +5581,122 @@ msgid ""
" through an update operation."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:193
+#: heat/engine/resources/openstack/neutron/firewall.py:195
msgid "An ordered list of firewall rules to apply to the firewall."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:205
+#: heat/engine/resources/openstack/neutron/firewall.py:207
msgid "Description of the firewall policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:209
+#: heat/engine/resources/openstack/neutron/firewall.py:211
msgid "List of firewall rules in this firewall policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:213
+#: heat/engine/resources/openstack/neutron/firewall.py:215
msgid "Shared status of this firewall policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:217
+#: heat/engine/resources/openstack/neutron/firewall.py:219
msgid "Audit status of this firewall policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:221
+#: heat/engine/resources/openstack/neutron/firewall.py:223
msgid "Id of the tenant owning the firewall policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:282
-#: heat/engine/resources/openstack/neutron/firewall.py:359
+#: heat/engine/resources/openstack/neutron/firewall.py:284
+#: heat/engine/resources/openstack/neutron/firewall.py:361
msgid "Name for the firewall rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:287
+#: heat/engine/resources/openstack/neutron/firewall.py:289
msgid "Description for the firewall rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:292
+#: heat/engine/resources/openstack/neutron/firewall.py:294
msgid "Whether this rule should be shared across all tenants."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:298
+#: heat/engine/resources/openstack/neutron/firewall.py:300
msgid "Protocol for the firewall rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:307
+#: heat/engine/resources/openstack/neutron/firewall.py:309
msgid "Internet protocol version."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:316
+#: heat/engine/resources/openstack/neutron/firewall.py:318
msgid "Source IP address or CIDR."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:324
+#: heat/engine/resources/openstack/neutron/firewall.py:326
msgid "Destination IP address or CIDR."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:332
+#: heat/engine/resources/openstack/neutron/firewall.py:334
msgid "Source port number or a range."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:337
+#: heat/engine/resources/openstack/neutron/firewall.py:339
msgid "Destination port number or a range."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:342
+#: heat/engine/resources/openstack/neutron/firewall.py:344
msgid "Action to be performed on the traffic matching the rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:351
+#: heat/engine/resources/openstack/neutron/firewall.py:353
msgid "Whether this rule should be enabled."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:363
+#: heat/engine/resources/openstack/neutron/firewall.py:365
msgid "Description of the firewall rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:367
+#: heat/engine/resources/openstack/neutron/firewall.py:369
msgid ""
"Unique identifier of the firewall policy to which this firewall rule "
"belongs."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:372
+#: heat/engine/resources/openstack/neutron/firewall.py:374
msgid "Shared status of this firewall rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:376
+#: heat/engine/resources/openstack/neutron/firewall.py:378
msgid "Protocol value for this firewall rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:380
+#: heat/engine/resources/openstack/neutron/firewall.py:382
msgid "Ip_version for this firewall rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:384
+#: heat/engine/resources/openstack/neutron/firewall.py:386
msgid "Source ip_address for this firewall rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:388
+#: heat/engine/resources/openstack/neutron/firewall.py:390
msgid "Destination ip_address for this firewall rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:392
+#: heat/engine/resources/openstack/neutron/firewall.py:394
msgid "Source port range for this firewall rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:396
+#: heat/engine/resources/openstack/neutron/firewall.py:398
msgid "Destination port range for this firewall rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:400
+#: heat/engine/resources/openstack/neutron/firewall.py:402
msgid "Allow or deny action for this firewall rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:404
+#: heat/engine/resources/openstack/neutron/firewall.py:406
msgid "Indicates whether this firewall rule is enabled or not."
msgstr ""
-#: heat/engine/resources/openstack/neutron/firewall.py:408
+#: heat/engine/resources/openstack/neutron/firewall.py:410
msgid "Position of the rule within the firewall policy."
msgstr ""
@@ -5595,56 +5704,56 @@ msgstr ""
msgid "Network to allocate floating IP from."
msgstr ""
-#: heat/engine/resources/openstack/neutron/floatingip.py:69
+#: heat/engine/resources/openstack/neutron/floatingip.py:70
msgid ""
"Extra parameters to include in the \"floatingip\" object in the creation "
"request. Parameters are often specific to installed hardware or "
"extensions."
msgstr ""
-#: heat/engine/resources/openstack/neutron/floatingip.py:76
-#: heat/engine/resources/openstack/neutron/floatingip.py:270
+#: heat/engine/resources/openstack/neutron/floatingip.py:77
+#: heat/engine/resources/openstack/neutron/floatingip.py:263
msgid ""
"ID of an existing port with at least one IP address to associate with "
"this floating IP."
msgstr ""
-#: heat/engine/resources/openstack/neutron/floatingip.py:85
-#: heat/engine/resources/openstack/neutron/floatingip.py:280
+#: heat/engine/resources/openstack/neutron/floatingip.py:86
+#: heat/engine/resources/openstack/neutron/floatingip.py:273
msgid "IP address to use if the port has multiple addresses."
msgstr ""
-#: heat/engine/resources/openstack/neutron/floatingip.py:93
+#: heat/engine/resources/openstack/neutron/floatingip.py:94
msgid ""
"IP address of the floating IP. NOTE: The default policy setting in "
"Neutron restricts usage of this property to administrative users only."
msgstr ""
-#: heat/engine/resources/openstack/neutron/floatingip.py:105
+#: heat/engine/resources/openstack/neutron/floatingip.py:106
msgid "ID of the router used as gateway, set when associated with a port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/floatingip.py:110
+#: heat/engine/resources/openstack/neutron/floatingip.py:111
msgid "The tenant owning this floating IP."
msgstr ""
-#: heat/engine/resources/openstack/neutron/floatingip.py:114
+#: heat/engine/resources/openstack/neutron/floatingip.py:115
msgid "ID of the network in which this IP is allocated."
msgstr ""
-#: heat/engine/resources/openstack/neutron/floatingip.py:118
+#: heat/engine/resources/openstack/neutron/floatingip.py:119
msgid "IP address of the associated port, if specified."
msgstr ""
-#: heat/engine/resources/openstack/neutron/floatingip.py:122
+#: heat/engine/resources/openstack/neutron/floatingip.py:123
msgid "The allocated address of this IP."
msgstr ""
-#: heat/engine/resources/openstack/neutron/floatingip.py:126
+#: heat/engine/resources/openstack/neutron/floatingip.py:127
msgid "ID of the port associated with this IP."
msgstr ""
-#: heat/engine/resources/openstack/neutron/floatingip.py:264
+#: heat/engine/resources/openstack/neutron/floatingip.py:257
msgid "ID of the floating IP to associate."
msgstr ""
@@ -5708,169 +5817,169 @@ msgid "Protocol for balancing."
msgstr ""
#: heat/engine/resources/openstack/neutron/loadbalancer.py:238
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:363
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:367
msgid ""
"The subnet for the port on which the members of the pool will be "
"connected."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:247
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:368
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:248
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:372
msgid "The algorithm used to distribute load between the members of the pool."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:258
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:355
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:259
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:359
msgid "Name of the pool."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:262
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:373
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:263
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:377
msgid "Description of the pool."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:267
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:351
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:268
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:355
msgid "The administrative state of this pool."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:273
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:274
msgid "LBaaS provider to implement this load balancer instance."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:278
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:282
msgid "IP address and port of the pool."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:282
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:286
msgid "Name of the vip."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:286
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:290
msgid "Description of the vip."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:290
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:294
msgid "Subnet of the vip."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:297
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:301
msgid "IP address of the vip."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:304
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:308
msgid "The maximum number of connections per second allowed for the vip."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:309
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:313
msgid ""
"TCP port on which to listen for client traffic that is associated with "
"the vip address."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:315
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:319
msgid "Configuration of session persistence."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:319
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:323
msgid "Method of implementation of session persistence feature."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:328
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:332
msgid "Name of the cookie, required if type is APP_COOKIE."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:335
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:339
msgid "The administrative state of this vip."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:343
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:347
msgid "List of health monitors associated with the pool."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:359
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:363
msgid "Protocol to balance."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:377
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:381
msgid "Tenant owning the pool."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:381
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:385
msgid "Vip associated with the pool."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:385
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:389
msgid "Provider implementing this load balancer instance."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:417
-#: heat/tests/neutron/test_neutron_loadbalancer.py:606
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:419
+#: heat/tests/openstack/neutron/test_neutron_loadbalancer.py:615
msgid ""
"Property cookie_name is required, when session_persistence type is set to"
" APP_COOKIE."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:478
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:480
msgid "error in vip"
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:481
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:483
msgid "Pool creation failed due to vip"
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:485
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:487
msgid "error in pool"
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:489
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:491
msgid "Pool creation failed"
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:577
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:631
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:692
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:579
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:633
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:694
msgid "The ID of the load balancing pool."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:583
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:585
msgid "IP address of the pool member on the pool network."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:591
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:635
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:593
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:637
msgid "TCP port on which the pool member listens for requests or connections."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:600
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:602
msgid "Weight of pool member in the pool (default to 1)."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:608
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:610
msgid "The administrative state of the pool member."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:615
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:617
msgid "The administrative state of this pool member."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:619
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:621
msgid "Tenant owning the pool member."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:623
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:625
msgid "Weight of the pool member in the pool."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:627
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:629
msgid "IP address of the pool member."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:698
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:700
msgid "Port number on which the servers are running on the members."
msgstr ""
-#: heat/engine/resources/openstack/neutron/loadbalancer.py:706
+#: heat/engine/resources/openstack/neutron/loadbalancer.py:708
msgid "The list of Nova server IDs load balanced."
msgstr ""
@@ -5924,19 +6033,12 @@ msgstr ""
msgid "CIDR to be associated with this metering rule."
msgstr ""
-#: heat/engine/resources/openstack/neutron/net.py:41
+#: heat/engine/resources/openstack/neutron/net.py:42
msgid ""
"A string specifying a symbolic name for the network, which is not "
"required to be unique."
msgstr ""
-#: heat/engine/resources/openstack/neutron/net.py:47
-msgid ""
-"Extra parameters to include in the \"network\" object in the creation "
-"request. Parameters are often specific to installed hardware or "
-"extensions."
-msgstr ""
-
#: heat/engine/resources/openstack/neutron/net.py:55
msgid "A boolean value specifying the administrative status of the network."
msgstr ""
@@ -5968,36 +6070,44 @@ msgid ""
"default value for the attribute of the ports created on this network"
msgstr ""
-#: heat/engine/resources/openstack/neutron/net.py:93
-#: heat/engine/resources/openstack/neutron/provider_net.py:81
+#: heat/engine/resources/openstack/neutron/net.py:91
+msgid "The name or ID of QoS policy to attach to this network."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/net.py:102
+#: heat/engine/resources/openstack/neutron/provider_net.py:79
msgid "The status of the network."
msgstr ""
-#: heat/engine/resources/openstack/neutron/net.py:97
+#: heat/engine/resources/openstack/neutron/net.py:106
msgid "The name of the network."
msgstr ""
-#: heat/engine/resources/openstack/neutron/net.py:101
-#: heat/engine/resources/openstack/neutron/provider_net.py:85
+#: heat/engine/resources/openstack/neutron/net.py:110
+#: heat/engine/resources/openstack/neutron/provider_net.py:83
msgid "Subnets of this network."
msgstr ""
-#: heat/engine/resources/openstack/neutron/net.py:105
+#: heat/engine/resources/openstack/neutron/net.py:114
msgid "The administrative status of the network."
msgstr ""
-#: heat/engine/resources/openstack/neutron/net.py:109
+#: heat/engine/resources/openstack/neutron/net.py:118
msgid "The tenant owning this network."
msgstr ""
-#: heat/engine/resources/openstack/neutron/net.py:113
+#: heat/engine/resources/openstack/neutron/net.py:122
msgid "Port security enabled of the network."
msgstr ""
-#: heat/engine/resources/openstack/neutron/net.py:118
+#: heat/engine/resources/openstack/neutron/net.py:127
msgid "The maximum transmission unit size(in bytes) for the network."
msgstr ""
+#: heat/engine/resources/openstack/neutron/net.py:132
+msgid "The QoS policy ID attached to this network."
+msgstr ""
+
#: heat/engine/resources/openstack/neutron/network_gateway.py:60
msgid "The name of the network gateway."
msgstr ""
@@ -6022,70 +6132,71 @@ msgstr ""
msgid "The internal network to connect on the network gateway."
msgstr ""
-#: heat/engine/resources/openstack/neutron/network_gateway.py:122
+#: heat/engine/resources/openstack/neutron/network_gateway.py:123
msgid "L2 segmentation strategy on the external side of the network gateway."
msgstr ""
-#: heat/engine/resources/openstack/neutron/network_gateway.py:131
+#: heat/engine/resources/openstack/neutron/network_gateway.py:132
msgid ""
"The id for L2 segment on the external side of the network gateway. Must "
"be specified when using vlan."
msgstr ""
-#: heat/engine/resources/openstack/neutron/network_gateway.py:144
+#: heat/engine/resources/openstack/neutron/network_gateway.py:145
msgid "A boolean value of default flag."
msgstr ""
-#: heat/engine/resources/openstack/neutron/network_gateway.py:175
+#: heat/engine/resources/openstack/neutron/network_gateway.py:174
msgid "segmentation_id must be specified for using vlan"
msgstr ""
-#: heat/engine/resources/openstack/neutron/network_gateway.py:179
+#: heat/engine/resources/openstack/neutron/network_gateway.py:178
msgid "segmentation_id cannot be specified except 0 for using flat"
msgstr ""
-#: heat/engine/resources/openstack/neutron/neutron.py:120
+#: heat/engine/resources/openstack/neutron/neutron.py:110
msgid "Resource is not built"
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:78
+#: heat/engine/resources/openstack/neutron/port.py:79
msgid "A symbolic name for this port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:99
+#: heat/engine/resources/openstack/neutron/port.py:101
#, python-format
msgid ""
"Network this port belongs to. If you plan to use current port to assign "
-"Floating IP, you should specify %(fixed_ips)s with %(subnet)s"
+"Floating IP, you should specify %(fixed_ips)s with %(subnet)s. Note if "
+"this changes to a different network update, the port will be replaced"
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:110
+#: heat/engine/resources/openstack/neutron/port.py:115
msgid "Device ID of this port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:115
+#: heat/engine/resources/openstack/neutron/port.py:120
msgid ""
"Name of the network owning the port. The value is typically "
"network:floatingip or network:router_interface or network:dhcp"
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:122
+#: heat/engine/resources/openstack/neutron/port.py:127
msgid "Desired IPs for this port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:144
+#: heat/engine/resources/openstack/neutron/port.py:149
msgid "Subnet in which to allocate the IP address for this port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:153
+#: heat/engine/resources/openstack/neutron/port.py:158
msgid "IP address desired in the subnet for this port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:164
+#: heat/engine/resources/openstack/neutron/port.py:169
msgid "Security group IDs to associate with this port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:169
+#: heat/engine/resources/openstack/neutron/port.py:174
msgid ""
"Policy on how to respond to a stack-update for this resource. "
"REPLACE_ALWAYS will replace the port regardless of any property changes. "
@@ -6093,34 +6204,34 @@ msgid ""
"property."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:186
+#: heat/engine/resources/openstack/neutron/port.py:191
msgid ""
"Extra parameters to include in the \"port\" object in the creation "
"request."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:192
-#: heat/engine/resources/openstack/neutron/port.py:255
+#: heat/engine/resources/openstack/neutron/port.py:197
+#: heat/engine/resources/openstack/neutron/port.py:269
msgid "The administrative state of this port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:198
+#: heat/engine/resources/openstack/neutron/port.py:203
msgid "MAC address to give to this port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:205
+#: heat/engine/resources/openstack/neutron/port.py:210
msgid "Additional MAC/IP address pairs allowed to pass through the port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:212
+#: heat/engine/resources/openstack/neutron/port.py:217
msgid "MAC address to allow through this port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:219
+#: heat/engine/resources/openstack/neutron/port.py:224
msgid "IP address to allow through this port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:230
+#: heat/engine/resources/openstack/neutron/port.py:235
msgid ""
"The vnic type to be bound on the neutron port. To support SR-IOV PCI "
"passthrough networking, you can request that the neutron port to be "
@@ -6129,123 +6240,166 @@ msgid ""
"only works for Neutron deployments that support the bindings extension."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:245
+#: heat/engine/resources/openstack/neutron/port.py:250
msgid ""
"Flag to enable/disable port security on the port. When disable this "
"feature(set it to False), there will be no packages filtering, like "
"security-group and address-pairs."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:259
+#: heat/engine/resources/openstack/neutron/port.py:258
+msgid "The name or ID of QoS policy to attach to this port."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/port.py:273
msgid "Unique identifier for the device."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:263
+#: heat/engine/resources/openstack/neutron/port.py:277
msgid "Name of the network owning the port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:267
+#: heat/engine/resources/openstack/neutron/port.py:281
msgid "Fixed IP addresses."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:271
+#: heat/engine/resources/openstack/neutron/port.py:285
msgid "MAC address of the port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:275
+#: heat/engine/resources/openstack/neutron/port.py:289
msgid "Friendly name of the port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:279
+#: heat/engine/resources/openstack/neutron/port.py:293
msgid "Unique identifier for the network owning the port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:283
+#: heat/engine/resources/openstack/neutron/port.py:297
msgid "A list of security groups for the port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:287
+#: heat/engine/resources/openstack/neutron/port.py:301
msgid "The status of the port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:291
+#: heat/engine/resources/openstack/neutron/port.py:305
msgid "Tenant owning the port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:295
+#: heat/engine/resources/openstack/neutron/port.py:309
msgid "Additional MAC/IP address pairs allowed to pass through a port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:300
+#: heat/engine/resources/openstack/neutron/port.py:314
msgid "A list of all subnet attributes for the port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/port.py:304
+#: heat/engine/resources/openstack/neutron/port.py:318
msgid "Port security enabled of the port."
msgstr ""
-#: heat/engine/resources/openstack/neutron/provider_net.py:49
+#: heat/engine/resources/openstack/neutron/port.py:323
+msgid "The QoS policy ID attached to this port."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/provider_net.py:47
msgid "A string specifying the provider network type for the network."
msgstr ""
-#: heat/engine/resources/openstack/neutron/provider_net.py:59
+#: heat/engine/resources/openstack/neutron/provider_net.py:57
msgid "A string specifying physical network mapping for the network."
msgstr ""
-#: heat/engine/resources/openstack/neutron/provider_net.py:66
+#: heat/engine/resources/openstack/neutron/provider_net.py:64
msgid "A string specifying the segmentation id for the network."
msgstr ""
-#: heat/engine/resources/openstack/neutron/provider_net.py:73
+#: heat/engine/resources/openstack/neutron/provider_net.py:71
msgid "Whether this network should be shared across all tenants."
msgstr ""
-#: heat/engine/resources/openstack/neutron/provider_net.py:100
+#: heat/engine/resources/openstack/neutron/provider_net.py:98
msgid "segmentation_id not allowed for flat network type."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:55
-msgid "The name of the router."
+#: heat/engine/resources/openstack/neutron/qos.py:52
+msgid "The name for the QoS policy."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/qos.py:58
+msgid "The description for the QoS policy."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/qos.py:63
+msgid "Whether this QoS policy should be shared to other tenants."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/qos.py:69
+msgid "The owner tenant ID of this QoS policy."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/qos.py:75
+msgid "A list of all rules for the QoS policy."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/qos.py:123
+msgid "ID or name of the QoS policy."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/qos.py:129
+msgid "The owner tenant ID of this rule."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/qos.py:166
+msgid "Max bandwidth in kbps."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/qos.py:175
+msgid "Max burst bandwidth in kbps."
msgstr ""
#: heat/engine/resources/openstack/neutron/router.py:60
+msgid "The name of the router."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/router.py:65
msgid "External network gateway configuration for a router."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:64
+#: heat/engine/resources/openstack/neutron/router.py:69
msgid "ID or name of the external network for the gateway."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:70
+#: heat/engine/resources/openstack/neutron/router.py:75
msgid ""
"Enables Source NAT on the router gateway. NOTE: The default policy "
"setting in Neutron restricts usage of this property to administrative "
"users only."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:80
-#: heat/engine/resources/openstack/neutron/subnet.py:99
+#: heat/engine/resources/openstack/neutron/router.py:85
msgid "Extra parameters to include in the creation request."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:86
+#: heat/engine/resources/openstack/neutron/router.py:91
msgid "The administrative state of the router."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:92
+#: heat/engine/resources/openstack/neutron/router.py:97
msgid ""
"ID of the L3 agent. NOTE: The default policy setting in Neutron restricts"
" usage of this property to administrative users only."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:109
+#: heat/engine/resources/openstack/neutron/router.py:114
msgid ""
"ID list of the L3 agent. User can specify multi-agents for highly "
"available router. NOTE: The default policy setting in Neutron restricts "
"usage of this property to administrative users only."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:121
+#: heat/engine/resources/openstack/neutron/router.py:126
msgid ""
"Indicates whether or not to create a distributed router. NOTE: The "
"default policy setting in Neutron restricts usage of this property to "
@@ -6253,7 +6407,7 @@ msgid ""
"with the L3 agent ID."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:129
+#: heat/engine/resources/openstack/neutron/router.py:134
msgid ""
"Indicates whether or not to create a highly available router. NOTE: The "
"default policy setting in Neutron restricts usage of this property to "
@@ -6261,58 +6415,58 @@ msgid ""
" ha at the same time."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:139
+#: heat/engine/resources/openstack/neutron/router.py:144
msgid "The status of the router."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:143
+#: heat/engine/resources/openstack/neutron/router.py:148
msgid "Gateway network for the router."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:147
+#: heat/engine/resources/openstack/neutron/router.py:152
msgid "Friendly name of the router."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:151
+#: heat/engine/resources/openstack/neutron/router.py:156
msgid "Administrative state of the router."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:155
+#: heat/engine/resources/openstack/neutron/router.py:160
msgid "Tenant owning the router."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:193
+#: heat/engine/resources/openstack/neutron/router.py:198
msgid "Non HA routers can only have one L3 agent."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:296
+#: heat/engine/resources/openstack/neutron/router.py:299
msgid "The router."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:303
-#: heat/engine/resources/openstack/neutron/router.py:475
+#: heat/engine/resources/openstack/neutron/router.py:307
+#: heat/engine/resources/openstack/neutron/router.py:460
msgid "ID of the router."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:335
+#: heat/engine/resources/openstack/neutron/router.py:339
msgid "The subnet, either subnet or port should be specified."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:343
+#: heat/engine/resources/openstack/neutron/router.py:347
msgid "The port id, either subnet or port_id should be specified."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:360
+#: heat/engine/resources/openstack/neutron/router.py:364
msgid "The port, either subnet or port should be specified."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:457
+#: heat/engine/resources/openstack/neutron/router.py:442
msgid ""
"Use the `external_gateway_info` property in the router resource to set up"
" the gateway."
msgstr ""
-#: heat/engine/resources/openstack/neutron/router.py:493
+#: heat/engine/resources/openstack/neutron/router.py:478
msgid "external network for the gateway."
msgstr ""
@@ -6381,110 +6535,188 @@ msgstr ""
msgid "Security groups cannot be assigned the name \"default\"."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:83
+#: heat/engine/resources/openstack/neutron/subnet.py:85
msgid "The ID of the attached network."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:91
+#: heat/engine/resources/openstack/neutron/subnet.py:94
+msgid "The name or ID of the subnet pool."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnet.py:102
+msgid "Prefix length for subnet allocation from subnet pool."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnet.py:108
msgid "The CIDR."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:105
+#: heat/engine/resources/openstack/neutron/subnet.py:115
+msgid "Extra parameters to include in the request."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnet.py:121
msgid "The name of the subnet."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:110
+#: heat/engine/resources/openstack/neutron/subnet.py:126
msgid "The IP version, which is 4 or 6."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:118
+#: heat/engine/resources/openstack/neutron/subnet.py:134
msgid "A specified set of DNS name servers to be used."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:124
+#: heat/engine/resources/openstack/neutron/subnet.py:140
msgid ""
-"The gateway IP address. Set to any of [ null | ~ | \"\" ] to create the "
-"subnet without a gateway. If omitted, the first IP address within the "
-"subnet is assigned to the gateway."
+"The gateway IP address. Set to any of [ null | ~ | \"\" ] to "
+"create/update a subnet without a gateway. If omitted when creation, "
+"neutron will assign the first free IP address within the subnet to the "
+"gateway automatically. If remove this from template when update, the old "
+"gateway IP address will be detached."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:131
+#: heat/engine/resources/openstack/neutron/subnet.py:150
msgid "Set to true if DHCP is enabled and false if DHCP is disabled."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:137
+#: heat/engine/resources/openstack/neutron/subnet.py:156
msgid "The start and end addresses for the allocation pools."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:160
+#: heat/engine/resources/openstack/neutron/subnet.py:180
msgid ""
"The ID of the tenant who owns the network. Only administrative users can "
"specify a tenant ID other than their own."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:185
+#: heat/engine/resources/openstack/neutron/subnet.py:208
msgid ""
"IPv6 RA (Router Advertisement) mode. dhcpv6-stateful, dhcpv6-stateless, "
"or slaac."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:195
+#: heat/engine/resources/openstack/neutron/subnet.py:218
msgid "IPv6 address mode. dhcpv6-stateful, dhcpv6-stateless, or slaac."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:207
+#: heat/engine/resources/openstack/neutron/subnet.py:230
msgid "Friendly name of the subnet."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:211
+#: heat/engine/resources/openstack/neutron/subnet.py:234
msgid "Parent network of the subnet."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:215
+#: heat/engine/resources/openstack/neutron/subnet.py:238
msgid "Tenant owning the subnet."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:219
+#: heat/engine/resources/openstack/neutron/subnet.py:242
msgid "Ip allocation pools and their ranges."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:223
+#: heat/engine/resources/openstack/neutron/subnet.py:246
msgid "Ip of the subnet's gateway."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:227
+#: heat/engine/resources/openstack/neutron/subnet.py:250
msgid "Additional routes for this subnet."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:231
+#: heat/engine/resources/openstack/neutron/subnet.py:254
msgid "Ip version for the subnet."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:235
+#: heat/engine/resources/openstack/neutron/subnet.py:258
msgid "CIDR block notation for this subnet."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:239
+#: heat/engine/resources/openstack/neutron/subnet.py:262
msgid "List of dns nameservers."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:243
+#: heat/engine/resources/openstack/neutron/subnet.py:266
msgid "'true' if DHCP is enabled for this subnet; 'false' otherwise."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:276
+#: heat/engine/resources/openstack/neutron/subnet.py:310
msgid "ipv6_ra_mode and ipv6_address_mode are not supported for ipv4."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:280
+#: heat/engine/resources/openstack/neutron/subnet.py:314
msgid "When both ipv6_ra_mode and ipv6_address_mode are set, they must be equal."
msgstr ""
-#: heat/engine/resources/openstack/neutron/subnet.py:287
+#: heat/engine/resources/openstack/neutron/subnet.py:321
#, python-format
msgid "Gateway IP address \"%(gateway)s\" is in invalid format."
msgstr ""
+#: heat/engine/resources/openstack/neutron/subnetpool.py:47
+msgid "Name of the subnet pool."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnetpool.py:52
+msgid "List of subnet prefixes to assign."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnetpool.py:65
+msgid "An address scope ID to assign to the subnet pool."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnetpool.py:73
+msgid ""
+"A per-tenant quota on the prefix space that can be allocated from the "
+"subnet pool for tenant subnets."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnetpool.py:80
+msgid ""
+"The size of the prefix to allocate when the cidr or prefixlen attributes "
+"are not specified while creating a subnet."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnetpool.py:88
+msgid "Smallest prefix size that can be allocated from the subnet pool."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnetpool.py:95
+msgid "Maximum prefix size that can be allocated from the subnet pool."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnetpool.py:102
+msgid ""
+"Whether this is default IPv4/IPv6 subnet pool.There can only be one "
+"default subnet pool for each IP family.Note that the default policy "
+"setting restricts administrative users to set this to True"
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnetpool.py:111
+msgid ""
+"The ID of the tenant who owns the subnet pool. Only administrative users "
+"can specify a tenant ID other than their own."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnetpool.py:117
+msgid ""
+"Whether the subnet pool will be shared across all tenants.Note that the "
+"default policy setting restricts usage of this attribute to "
+"administrative users only."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnetpool.py:132
+#, python-format
+msgid "Illegal prefix bounds: %(key1)s=%(value1)s, %(key2)s=%(value2)s."
+msgstr ""
+
+#: heat/engine/resources/openstack/neutron/subnetpool.py:163
+#, python-format
+msgid ""
+"Property %(key)s updated value %(new)s should be superset of existing "
+"value %(old)s."
+msgstr ""
+
#: heat/engine/resources/openstack/neutron/vpnservice.py:46
msgid "Name for the vpn service."
msgstr ""
@@ -6501,583 +6733,601 @@ msgstr ""
msgid "Subnet in which the vpn service will be created."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:85
+#: heat/engine/resources/openstack/neutron/vpnservice.py:86
msgid ""
"Unique identifier for the router to which the vpn service will be "
"inserted."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:92
+#: heat/engine/resources/openstack/neutron/vpnservice.py:93
#, python-format
msgid "Use property %s"
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:102
+#: heat/engine/resources/openstack/neutron/vpnservice.py:103
msgid "The router to which the vpn service will be inserted."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:112
+#: heat/engine/resources/openstack/neutron/vpnservice.py:114
msgid "The administrative state of the vpn service."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:116
+#: heat/engine/resources/openstack/neutron/vpnservice.py:118
msgid "The description of the vpn service."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:120
+#: heat/engine/resources/openstack/neutron/vpnservice.py:122
msgid "The name of the vpn service."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:124
+#: heat/engine/resources/openstack/neutron/vpnservice.py:126
msgid "The unique identifier of the router to which the vpn service was inserted."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:129
+#: heat/engine/resources/openstack/neutron/vpnservice.py:131
msgid "The status of the vpn service."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:133
+#: heat/engine/resources/openstack/neutron/vpnservice.py:135
msgid "The unique identifier of the subnet in which the vpn service was created."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:138
+#: heat/engine/resources/openstack/neutron/vpnservice.py:140
msgid "The unique identifier of the tenant owning the vpn service."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:229
+#: heat/engine/resources/openstack/neutron/vpnservice.py:224
msgid "Name for the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:234
+#: heat/engine/resources/openstack/neutron/vpnservice.py:229
msgid "Description for the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:239
+#: heat/engine/resources/openstack/neutron/vpnservice.py:234
msgid "Remote branch router public IPv4 address or IPv6 address or FQDN."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:245
+#: heat/engine/resources/openstack/neutron/vpnservice.py:240
msgid "Remote branch router identity."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:250
+#: heat/engine/resources/openstack/neutron/vpnservice.py:245
msgid "Remote subnet(s) in CIDR format."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:261
+#: heat/engine/resources/openstack/neutron/vpnservice.py:256
msgid "Maximum transmission unit size (in bytes) for the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:267
+#: heat/engine/resources/openstack/neutron/vpnservice.py:262
msgid "Dead Peer Detection protocol configuration for the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:272
+#: heat/engine/resources/openstack/neutron/vpnservice.py:267
msgid "Controls DPD protocol mode."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:282
+#: heat/engine/resources/openstack/neutron/vpnservice.py:277
msgid "Number of seconds for the DPD delay."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:287
+#: heat/engine/resources/openstack/neutron/vpnservice.py:282
msgid "Number of seconds for the DPD timeout."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:294
+#: heat/engine/resources/openstack/neutron/vpnservice.py:289
msgid "Pre-shared key string for the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:299
+#: heat/engine/resources/openstack/neutron/vpnservice.py:294
msgid "Initiator state in lowercase for the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:307
+#: heat/engine/resources/openstack/neutron/vpnservice.py:302
msgid "Administrative state for the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:313
+#: heat/engine/resources/openstack/neutron/vpnservice.py:308
msgid ""
"Unique identifier for the ike policy associated with the ipsec site "
"connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:319
+#: heat/engine/resources/openstack/neutron/vpnservice.py:314
msgid ""
"Unique identifier for the ipsec policy associated with the ipsec site "
"connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:325
+#: heat/engine/resources/openstack/neutron/vpnservice.py:320
msgid ""
"Unique identifier for the vpn service associated with the ipsec site "
"connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:333
+#: heat/engine/resources/openstack/neutron/vpnservice.py:328
msgid "The administrative state of the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:337
+#: heat/engine/resources/openstack/neutron/vpnservice.py:332
msgid "The authentication mode of the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:341
+#: heat/engine/resources/openstack/neutron/vpnservice.py:336
msgid "The description of the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:345
+#: heat/engine/resources/openstack/neutron/vpnservice.py:340
msgid ""
"The dead peer detection protocol configuration of the ipsec site "
"connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:350
+#: heat/engine/resources/openstack/neutron/vpnservice.py:345
msgid ""
"The unique identifier of ike policy associated with the ipsec site "
"connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:355
+#: heat/engine/resources/openstack/neutron/vpnservice.py:350
msgid "The initiator of the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:359
+#: heat/engine/resources/openstack/neutron/vpnservice.py:354
msgid ""
"The unique identifier of ipsec policy associated with the ipsec site "
"connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:364
+#: heat/engine/resources/openstack/neutron/vpnservice.py:359
msgid ""
"The maximum transmission unit size (in bytes) of the ipsec site "
"connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:369
+#: heat/engine/resources/openstack/neutron/vpnservice.py:364
msgid "The name of the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:373
+#: heat/engine/resources/openstack/neutron/vpnservice.py:368
msgid "The remote branch router public IPv4 address or IPv6 address or FQDN."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:378
+#: heat/engine/resources/openstack/neutron/vpnservice.py:373
msgid "The remote subnet(s) in CIDR format of the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:383
+#: heat/engine/resources/openstack/neutron/vpnservice.py:378
msgid "The remote branch router identity of the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:388
+#: heat/engine/resources/openstack/neutron/vpnservice.py:383
msgid "The pre-shared key string of the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:392
+#: heat/engine/resources/openstack/neutron/vpnservice.py:387
msgid "The route mode of the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:396
+#: heat/engine/resources/openstack/neutron/vpnservice.py:391
msgid "The status of the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:400
+#: heat/engine/resources/openstack/neutron/vpnservice.py:395
msgid "The unique identifier of the tenant owning the ipsec site connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:405
+#: heat/engine/resources/openstack/neutron/vpnservice.py:400
msgid ""
"The unique identifier of vpn service associated with the ipsec site "
"connection."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:469
+#: heat/engine/resources/openstack/neutron/vpnservice.py:464
msgid "Name for the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:474
+#: heat/engine/resources/openstack/neutron/vpnservice.py:469
msgid "Description for the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:479
+#: heat/engine/resources/openstack/neutron/vpnservice.py:474
msgid "Authentication hash algorithm for the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:487
+#: heat/engine/resources/openstack/neutron/vpnservice.py:482
msgid "Encryption algorithm for the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:496
+#: heat/engine/resources/openstack/neutron/vpnservice.py:491
msgid "Negotiation mode for the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:504
+#: heat/engine/resources/openstack/neutron/vpnservice.py:499
msgid "Safety assessment lifetime configuration for the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:508
-#: heat/engine/resources/openstack/neutron/vpnservice.py:685
+#: heat/engine/resources/openstack/neutron/vpnservice.py:503
+#: heat/engine/resources/openstack/neutron/vpnservice.py:680
msgid "Safety assessment lifetime units."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:516
-#: heat/engine/resources/openstack/neutron/vpnservice.py:694
+#: heat/engine/resources/openstack/neutron/vpnservice.py:511
+#: heat/engine/resources/openstack/neutron/vpnservice.py:689
msgid "Safety assessment lifetime value in specified units."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:524
+#: heat/engine/resources/openstack/neutron/vpnservice.py:519
msgid "Perfect forward secrecy in lowercase for the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:532
+#: heat/engine/resources/openstack/neutron/vpnservice.py:527
msgid "Version for the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:542
+#: heat/engine/resources/openstack/neutron/vpnservice.py:537
msgid "The authentication hash algorithm used by the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:546
+#: heat/engine/resources/openstack/neutron/vpnservice.py:541
msgid "The description of the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:550
+#: heat/engine/resources/openstack/neutron/vpnservice.py:545
msgid "The encryption algorithm used by the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:554
+#: heat/engine/resources/openstack/neutron/vpnservice.py:549
msgid "The version of the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:558
+#: heat/engine/resources/openstack/neutron/vpnservice.py:553
msgid "The safety assessment lifetime configuration for the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:563
+#: heat/engine/resources/openstack/neutron/vpnservice.py:558
msgid "The name of the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:567
+#: heat/engine/resources/openstack/neutron/vpnservice.py:562
msgid "The perfect forward secrecy of the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:571
+#: heat/engine/resources/openstack/neutron/vpnservice.py:566
msgid "The negotiation mode of the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:575
+#: heat/engine/resources/openstack/neutron/vpnservice.py:570
msgid "The unique identifier of the tenant owning the ike policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:637
+#: heat/engine/resources/openstack/neutron/vpnservice.py:632
msgid "Name for the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:642
+#: heat/engine/resources/openstack/neutron/vpnservice.py:637
msgid "Description for the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:647
+#: heat/engine/resources/openstack/neutron/vpnservice.py:642
msgid "Transform protocol for the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:655
+#: heat/engine/resources/openstack/neutron/vpnservice.py:650
msgid "Encapsulation mode for the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:663
+#: heat/engine/resources/openstack/neutron/vpnservice.py:658
msgid "Authentication hash algorithm for the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:671
+#: heat/engine/resources/openstack/neutron/vpnservice.py:666
msgid "Encryption algorithm for the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:680
+#: heat/engine/resources/openstack/neutron/vpnservice.py:675
msgid "Safety assessment lifetime configuration for the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:702
+#: heat/engine/resources/openstack/neutron/vpnservice.py:697
msgid "Perfect forward secrecy for the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:712
+#: heat/engine/resources/openstack/neutron/vpnservice.py:707
msgid "The authentication hash algorithm of the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:716
+#: heat/engine/resources/openstack/neutron/vpnservice.py:711
msgid "The description of the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:720
+#: heat/engine/resources/openstack/neutron/vpnservice.py:715
msgid "The encapsulation mode of the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:724
+#: heat/engine/resources/openstack/neutron/vpnservice.py:719
msgid "The encryption algorithm of the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:728
+#: heat/engine/resources/openstack/neutron/vpnservice.py:723
msgid "The safety assessment lifetime configuration of the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:733
+#: heat/engine/resources/openstack/neutron/vpnservice.py:728
msgid "The name of the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:737
+#: heat/engine/resources/openstack/neutron/vpnservice.py:732
msgid "The perfect forward secrecy of the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:741
+#: heat/engine/resources/openstack/neutron/vpnservice.py:736
msgid "The unique identifier of the tenant owning the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/neutron/vpnservice.py:745
+#: heat/engine/resources/openstack/neutron/vpnservice.py:740
msgid "The transform protocol of the ipsec policy."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_flavor.py:64
+#: heat/engine/resources/openstack/nova/flavor.py:73
msgid "Memory in MB for the flavor."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_flavor.py:69
+#: heat/engine/resources/openstack/nova/flavor.py:78
msgid "Number of VCPUs for the flavor."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_flavor.py:74
+#: heat/engine/resources/openstack/nova/flavor.py:83
msgid ""
"Size of local disk in GB. The \"0\" size is a special case that uses the "
"native base image size as the size of the ephemeral root volume."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_flavor.py:81
+#: heat/engine/resources/openstack/nova/flavor.py:90
msgid "Swap space in MB."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_flavor.py:86
+#: heat/engine/resources/openstack/nova/flavor.py:95
msgid "Size of a secondary ephemeral data disk in GB."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_flavor.py:91
+#: heat/engine/resources/openstack/nova/flavor.py:100
msgid "RX/TX factor."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_flavor.py:96
+#: heat/engine/resources/openstack/nova/flavor.py:105
msgid "Key/Value pairs to extend the capabilities of the flavor."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_floatingip.py:43
+#: heat/engine/resources/openstack/nova/flavor.py:110
+msgid ""
+"Scope of flavor accessibility. Public or private.Default value is True, "
+"means public, shared across all projects."
+msgstr ""
+
+#: heat/engine/resources/openstack/nova/flavor.py:121
+msgid "Whether the flavor is shared across all projects."
+msgstr ""
+
+#: heat/engine/resources/openstack/nova/floatingip.py:45
msgid "Allocate a floating IP from a given floating IP pool."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_floatingip.py:50
+#: heat/engine/resources/openstack/nova/floatingip.py:52
msgid "Pool from which floating IP is allocated."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_floatingip.py:54
+#: heat/engine/resources/openstack/nova/floatingip.py:56
msgid "Allocated floating IP address."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_floatingip.py:110
+#: heat/engine/resources/openstack/nova/floatingip.py:112
msgid "Server to assign floating IP to."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_floatingip.py:119
+#: heat/engine/resources/openstack/nova/floatingip.py:121
msgid "ID of the floating IP to assign to the server."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_keypair.py:53
+#: heat/engine/resources/openstack/nova/host_aggregate.py:52
+msgid "Name for the aggregate."
+msgstr ""
+
+#: heat/engine/resources/openstack/nova/host_aggregate.py:58
+msgid "Name for the availability zone."
+msgstr ""
+
+#: heat/engine/resources/openstack/nova/host_aggregate.py:64
+msgid "List of hosts to join aggregate."
+msgstr ""
+
+#: heat/engine/resources/openstack/nova/host_aggregate.py:73
+msgid "Arbitrary key/value metadata to store information for aggregate."
+msgstr ""
+
+#: heat/engine/resources/openstack/nova/keypair.py:55
msgid "The name of the key pair."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_keypair.py:61
+#: heat/engine/resources/openstack/nova/keypair.py:63
msgid ""
"True if the system should remember a generated private key; False "
"otherwise."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_keypair.py:67
+#: heat/engine/resources/openstack/nova/keypair.py:69
msgid ""
"The optional public key. This allows users to supply the public key from "
"a pre-existing key pair. If not supplied, a new key pair will be "
"generated."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_keypair.py:75
+#: heat/engine/resources/openstack/nova/keypair.py:77
msgid "The public key."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_keypair.py:79
+#: heat/engine/resources/openstack/nova/keypair.py:81
msgid "The private key if it has been saved."
msgstr ""
-#: heat/engine/resources/openstack/nova/nova_servergroup.py:38
-msgid "Server Group name."
-msgstr ""
-
-#: heat/engine/resources/openstack/nova/nova_servergroup.py:42
-msgid "A list of string policies to apply. Defaults to anti-affinity."
-msgstr ""
-
-#: heat/engine/resources/openstack/nova/server.py:129
+#: heat/engine/resources/openstack/nova/server.py:130
msgid "Server name."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:134
+#: heat/engine/resources/openstack/nova/server.py:135
msgid "The ID or name of the image to boot with."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:142
+#: heat/engine/resources/openstack/nova/server.py:143
msgid "Block device mappings for this server."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:148
-#: heat/engine/resources/openstack/nova/server.py:192
+#: heat/engine/resources/openstack/nova/server.py:149
+#: heat/engine/resources/openstack/nova/server.py:193
msgid ""
"A device name where the volume will be attached in the system at "
"/dev/device_name. This value is typically vda."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:155
+#: heat/engine/resources/openstack/nova/server.py:156
msgid ""
"The ID of the volume to boot from. Only one of volume_id or snapshot_id "
"should be provided."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:172
+#: heat/engine/resources/openstack/nova/server.py:173
msgid ""
"The size of the volume, in GB. It is safe to leave this blank and have "
"the Compute service infer the size."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:178
-#: heat/engine/resources/openstack/nova/server.py:252
+#: heat/engine/resources/openstack/nova/server.py:179
+#: heat/engine/resources/openstack/nova/server.py:253
msgid ""
"Indicate whether the volume should be deleted when the server is "
"terminated."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:186
+#: heat/engine/resources/openstack/nova/server.py:187
msgid "Block device mappings v2 for this server."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:198
+#: heat/engine/resources/openstack/nova/server.py:199
msgid "The volume_id can be boot or non-boot device to the server."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:206
+#: heat/engine/resources/openstack/nova/server.py:207
msgid "The ID of the image to create a volume from."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:221
+#: heat/engine/resources/openstack/nova/server.py:222
msgid "The size of the swap, in MB."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:225
+#: heat/engine/resources/openstack/nova/server.py:226
msgid ""
"Device type: at the moment we can make distinction only between disk and "
"cdrom."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:233
+#: heat/engine/resources/openstack/nova/server.py:234
msgid ""
"Bus of the device: hypervisor driver chooses a suitable default if "
"omitted."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:243
+#: heat/engine/resources/openstack/nova/server.py:244
msgid "Integer used for ordering the boot disks."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:247
+#: heat/engine/resources/openstack/nova/server.py:248
msgid ""
"Size of the block device in GB. If it is omitted, hypervisor driver "
"calculates size."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:261
+#: heat/engine/resources/openstack/nova/server.py:262
msgid "The ID or name of the flavor to boot onto."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:270
+#: heat/engine/resources/openstack/nova/server.py:271
msgid ""
"Policy on how to apply a flavor update; either by requesting a server "
"resize or by replacing the entire server."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:280
+#: heat/engine/resources/openstack/nova/server.py:281
msgid ""
"Policy on how to apply an image-id update; either by requesting a server "
"rebuild or by replacing the entire server"
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:291
+#: heat/engine/resources/openstack/nova/server.py:292
msgid "Name of keypair to inject into the server."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:298
+#: heat/engine/resources/openstack/nova/server.py:299
msgid "Name of the administrative user to use on the server."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:302
+#: heat/engine/resources/openstack/nova/server.py:303
msgid ""
"The default cloud-init user set up for each image (e.g. \"ubuntu\" for "
"Ubuntu 12.04+, \"fedora\" for Fedora 19+ and \"cloud-user\" for "
"CentOS/RHEL 6.5)."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:314
+#: heat/engine/resources/openstack/nova/server.py:315
msgid "Name of the availability zone for server placement."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:318
+#: heat/engine/resources/openstack/nova/server.py:319
msgid ""
"List of security group names or IDs. Cannot be used if neutron ports are "
"associated with this server; assign security groups to the ports instead."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:325
+#: heat/engine/resources/openstack/nova/server.py:326
msgid ""
"An ordered list of nics to be added to this server, with information "
"about connected networks, fixed ips, port etc."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:332
+#: heat/engine/resources/openstack/nova/server.py:333
msgid "ID of network to create a port on."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:348
+#: heat/engine/resources/openstack/nova/server.py:349
msgid "Name or ID of network to create a port on."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:355
+#: heat/engine/resources/openstack/nova/server.py:356
msgid "Fixed IP address to specify for the port created on the requested network."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:363
+#: heat/engine/resources/openstack/nova/server.py:364
msgid "ID of an existing port to associate with this server."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:371
+#: heat/engine/resources/openstack/nova/server.py:372
msgid ""
"Dict, which has expand properties for port. Used only if port property is"
" not specified for creating port."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:379
+#: heat/engine/resources/openstack/nova/server.py:380
msgid ""
"Subnet in which to allocate the IP address for port. Used for creating "
"port, based on derived properties. If subnet is specified, network "
"property becomes optional."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:391
+#: heat/engine/resources/openstack/nova/server.py:392
msgid "Arbitrary key-value pairs specified by the client to help boot a server."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:396
+#: heat/engine/resources/openstack/nova/server.py:397
msgid ""
"Arbitrary key/value metadata to store for this server. Both keys and "
"values must be 255 characters or less. Non-string values will be "
@@ -7085,7 +7335,7 @@ msgid ""
"less)."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:404
+#: heat/engine/resources/openstack/nova/server.py:405
msgid ""
"How the user_data should be formatted for the server. For HEAT_CFNTOOLS, "
"the user_data is bundled as part of the heat-cfntools cloud-init boot "
@@ -7095,7 +7345,7 @@ msgid ""
"resources."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:418
+#: heat/engine/resources/openstack/nova/server.py:419
msgid ""
"How the server should receive the metadata required for software "
"configuration. POLL_SERVER_CFN will allow calls to the cfn API action "
@@ -7106,37 +7356,37 @@ msgid ""
"dedicated zaqar queue and post the metadata for polling."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:434
+#: heat/engine/resources/openstack/nova/server.py:436
msgid "User data script to be executed by cloud-init."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:439
+#: heat/engine/resources/openstack/nova/server.py:441
msgid "A UUID for the set of servers being requested."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:443
+#: heat/engine/resources/openstack/nova/server.py:445
msgid "If True, enable config drive on the server."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:447
+#: heat/engine/resources/openstack/nova/server.py:449
msgid "Control how the disk is partitioned when the server is created."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:455
+#: heat/engine/resources/openstack/nova/server.py:457
msgid ""
"A map of files to create/overwrite on the server upon boot. Keys are file"
" names and values are the file contents."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:461
+#: heat/engine/resources/openstack/nova/server.py:463
msgid "The administrator password for the server."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:468
+#: heat/engine/resources/openstack/nova/server.py:470
msgid "Name of the server."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:472
+#: heat/engine/resources/openstack/nova/server.py:474
msgid ""
"A dict of all network addresses with corresponding port_id. Each network "
"will have two keys in dict, they are network name and network id. The "
@@ -7144,40 +7394,40 @@ msgid ""
"[<server>, addresses, <network name_or_id>, 0, port]}\"."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:481
+#: heat/engine/resources/openstack/nova/server.py:483
msgid ""
"A dict of assigned network addresses of the form: {\"public\": [ip1, "
"ip2...], \"private\": [ip3, ip4], \"public_uuid\": [ip1, ip2...], "
"\"private_uuid\": [ip3, ip4]}. Each network will have two keys in dict, "
-"they are network name and network id. "
+"they are network name and network id."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:489
+#: heat/engine/resources/openstack/nova/server.py:491
msgid ""
"Convenience attribute to fetch the first assigned network address, or an "
"empty string if nothing has been assigned at this time. Result may not be"
" predictable if the server has addresses from more than one network."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:496
+#: heat/engine/resources/openstack/nova/server.py:498
msgid ""
"Use the networks attribute instead of first_address. For example: "
"\"{get_attr: [<server name>, networks, <network name>, 0]}\""
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:507
+#: heat/engine/resources/openstack/nova/server.py:509
msgid "AWS compatible instance name."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:511
+#: heat/engine/resources/openstack/nova/server.py:513
msgid "The manually assigned alternative public IPv4 address of the server."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:516
+#: heat/engine/resources/openstack/nova/server.py:518
msgid "The manually assigned alternative public IPv6 address of the server."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:521
+#: heat/engine/resources/openstack/nova/server.py:523
msgid ""
"URLs of server's consoles. To get a specific console type, the requested "
"type can be specified as parameter to the get_attr function, e.g. "
@@ -7185,56 +7435,64 @@ msgid ""
"are novnc, xvpvnc, spice-html5, rdp-html5, serial."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:1145
+#: heat/engine/resources/openstack/nova/server.py:1192
#, python-format
msgid "Either volume_id or snapshot_id must be specified for device mapping %s"
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:1170
+#: heat/engine/resources/openstack/nova/server.py:1217
msgid "Either volume_id, snapshot_id, image_id or swap_size must be specified."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:1185
+#: heat/engine/resources/openstack/nova/server.py:1232
msgid ""
"deployments key not allowed in resource metadata with user_data_format of"
" SOFTWARE_CONFIG"
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:1194
+#: heat/engine/resources/openstack/nova/server.py:1241
#, python-format
msgid "Neither image nor bootable volume is specified for instance %s"
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:1225
+#: heat/engine/resources/openstack/nova/server.py:1272
#, python-format
msgid ""
"Instance metadata must not contain greater than %s entries. This is the "
"maximum number allowed by your service provider"
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:1234
+#: heat/engine/resources/openstack/nova/server.py:1281
#, python-format
msgid "The personality property may not contain greater than %s entries."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:1240
+#: heat/engine/resources/openstack/nova/server.py:1287
#, python-format
msgid ""
"The contents of personality file \"%(path)s\" is larger than the maximum "
"allowed personality file size (%(max_size)s bytes)."
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:1335
-#: heat/engine/resources/openstack/nova/server.py:1378
+#: heat/engine/resources/openstack/nova/server.py:1385
+#: heat/engine/resources/openstack/nova/server.py:1428
#, python-format
msgid "Failed to find server %s"
msgstr ""
-#: heat/engine/resources/openstack/nova/server.py:1359
+#: heat/engine/resources/openstack/nova/server.py:1409
#, python-format
msgid "Suspend of server %s failed"
msgstr ""
+#: heat/engine/resources/openstack/nova/server_group.py:40
+msgid "Server Group name."
+msgstr ""
+
+#: heat/engine/resources/openstack/nova/server_group.py:44
+msgid "A list of string policies to apply. Defaults to anti-affinity."
+msgstr ""
+
#: heat/engine/resources/openstack/nova/server_network_mixin.py:40
#, python-format
msgid ""
@@ -7261,256 +7519,363 @@ msgstr ""
msgid "%(server)s-port-%(number)s"
msgstr ""
-#: heat/engine/resources/openstack/sahara/data_source.py:53
-msgid "Name of the data source."
+#: heat/engine/resources/openstack/sahara/cluster.py:62
+msgid "Hadoop cluster name."
msgstr ""
-#: heat/engine/resources/openstack/sahara/data_source.py:58
-msgid "Type of the data source."
+#: heat/engine/resources/openstack/sahara/cluster.py:66
+#: heat/engine/resources/openstack/sahara/templates.py:84
+#: heat/engine/resources/openstack/sahara/templates.py:400
+msgid "Plugin name."
msgstr ""
-#: heat/engine/resources/openstack/sahara/data_source.py:67
-msgid "URL for the data source."
+#: heat/engine/resources/openstack/sahara/cluster.py:74
+#: heat/engine/resources/openstack/sahara/templates.py:93
+#: heat/engine/resources/openstack/sahara/templates.py:409
+msgid "Version of Hadoop running on instances."
msgstr ""
-#: heat/engine/resources/openstack/sahara/data_source.py:73
-msgid "Description of the data source."
+#: heat/engine/resources/openstack/sahara/cluster.py:79
+msgid "ID of the Cluster Template used for Node Groups and configurations."
msgstr ""
-#: heat/engine/resources/openstack/sahara/data_source.py:79
-#: heat/engine/resources/openstack/sahara/job_binary.py:67
-msgid ""
-"Credentials used for swift. Not required if sahara is configured to use "
-"proxy users and delegated trusts for access."
+#: heat/engine/resources/openstack/sahara/cluster.py:85
+msgid "Keypair added to instances to make them accessible for user."
msgstr ""
-#: heat/engine/resources/openstack/sahara/data_source.py:85
-msgid "Username for accessing the data source URL."
+#: heat/engine/resources/openstack/sahara/cluster.py:92
+msgid "Name or UUID of the image used to boot Hadoop nodes."
msgstr ""
-#: heat/engine/resources/openstack/sahara/data_source.py:90
-msgid "Password for accessing the data source URL."
+#: heat/engine/resources/openstack/sahara/cluster.py:108
+msgid "Default name or UUID of the image used to boot Hadoop nodes."
msgstr ""
-#: heat/engine/resources/openstack/sahara/job_binary.py:49
-msgid "Name of the job binary."
+#: heat/engine/resources/openstack/sahara/cluster.py:116
+#: heat/engine/resources/openstack/sahara/templates.py:423
+msgid "Name or UUID of network."
msgstr ""
-#: heat/engine/resources/openstack/sahara/job_binary.py:54
+#: heat/engine/resources/openstack/sahara/cluster.py:123
+#: heat/engine/resources/openstack/sahara/templates.py:203
+#: heat/engine/resources/openstack/sahara/templates.py:472
+msgid "Configure most important configs automatically."
+msgstr ""
+
+#: heat/engine/resources/openstack/sahara/cluster.py:128
+#: heat/engine/resources/openstack/sahara/templates.py:209
+#: heat/engine/resources/openstack/sahara/templates.py:477
+msgid "List of manila shares to be mounted."
+msgstr ""
+
+#: heat/engine/resources/openstack/sahara/cluster.py:134
+#: heat/engine/resources/openstack/sahara/templates.py:215
+#: heat/engine/resources/openstack/sahara/templates.py:483
+msgid "Id of the manila share."
+msgstr ""
+
+#: heat/engine/resources/openstack/sahara/cluster.py:139
+#: heat/engine/resources/openstack/sahara/templates.py:220
+#: heat/engine/resources/openstack/sahara/templates.py:488
msgid ""
-"URL for the job binary. Must be in the format swift://<container>/<path> "
-"or internal-db://<uuid>"
+"Local path on each cluster node on which to mount the share. Defaults to "
+"'/mnt/{share_id}'."
msgstr ""
-#: heat/engine/resources/openstack/sahara/job_binary.py:61
-msgid "Description of the job binary."
+#: heat/engine/resources/openstack/sahara/cluster.py:144
+#: heat/engine/resources/openstack/sahara/templates.py:225
+#: heat/engine/resources/openstack/sahara/templates.py:493
+msgid "Governs permissions set in manila for the cluster ips."
msgstr ""
-#: heat/engine/resources/openstack/sahara/job_binary.py:73
-msgid "Username for accessing the job binary URL."
+#: heat/engine/resources/openstack/sahara/cluster.py:159
+msgid "Cluster status."
msgstr ""
-#: heat/engine/resources/openstack/sahara/job_binary.py:78
-msgid "Password for accessing the job binary URL."
+#: heat/engine/resources/openstack/sahara/cluster.py:163
+msgid "Cluster information."
msgstr ""
-#: heat/engine/resources/openstack/sahara/job_binary.py:107
+#: heat/engine/resources/openstack/sahara/cluster.py:206
#, python-format
-msgid "%s is not a valid job location."
+msgid ""
+"%(img)s must be provided: Referenced cluster template %(tmpl)s has no "
+"default_image_id defined."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:56
-msgid "Hadoop cluster name."
+#: heat/engine/resources/openstack/sahara/cluster.py:278
+#: heat/engine/resources/openstack/sahara/templates.py:566
+#, python-format
+msgid "%s must be provided"
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:60
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:76
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:353
-msgid "Plugin name."
+#: heat/engine/resources/openstack/sahara/data_source.py:53
+msgid "Name of the data source."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:68
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:85
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:362
-msgid "Version of Hadoop running on instances."
+#: heat/engine/resources/openstack/sahara/data_source.py:58
+msgid "Type of the data source."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:73
-msgid "ID of the Cluster Template used for Node Groups and configurations."
+#: heat/engine/resources/openstack/sahara/data_source.py:67
+msgid "URL for the data source."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:79
-msgid "Keypair added to instances to make them accessible for user."
+#: heat/engine/resources/openstack/sahara/data_source.py:73
+msgid "Description of the data source."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:86
-msgid "Name or UUID of the image used to boot Hadoop nodes."
+#: heat/engine/resources/openstack/sahara/data_source.py:79
+#: heat/engine/resources/openstack/sahara/job_binary.py:67
+msgid ""
+"Credentials used for swift. Not required if sahara is configured to use "
+"proxy users and delegated trusts for access."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:102
-msgid "Default name or UUID of the image used to boot Hadoop nodes."
+#: heat/engine/resources/openstack/sahara/data_source.py:85
+msgid "Username for accessing the data source URL."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:110
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:376
-msgid "Name or UUID of network."
+#: heat/engine/resources/openstack/sahara/data_source.py:90
+msgid "Password for accessing the data source URL."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:117
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:195
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:425
-msgid "Configure most important configs automatically."
+#: heat/engine/resources/openstack/sahara/image.py:40
+msgid "ID or name of the image to register."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:124
-msgid "Cluster status."
+#: heat/engine/resources/openstack/sahara/image.py:48
+msgid "Username of privileged user in the image."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:128
-msgid "Cluster information."
+#: heat/engine/resources/openstack/sahara/image.py:54
+msgid "Description of the image."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:171
-#, python-format
-msgid ""
-"%(img)s must be provided: Referenced cluster template %(tmpl)s has no "
-"default_image_id defined."
+#: heat/engine/resources/openstack/sahara/image.py:60
+msgid "Tags to add to the image."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_cluster.py:241
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:488
-#, python-format
-msgid "%s must be provided"
+#: heat/engine/resources/openstack/sahara/job_binary.py:49
+msgid "Name of the job binary."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_image.py:40
-msgid "ID or name of the image to register."
+#: heat/engine/resources/openstack/sahara/job_binary.py:54
+msgid ""
+"URL for the job binary. Must be in the format swift://<container>/<path> "
+"or internal-db://<uuid>"
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_image.py:48
-msgid "Username of privileged user in the image."
+#: heat/engine/resources/openstack/sahara/job_binary.py:61
+msgid "Description of the job binary."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_image.py:54
-msgid "Description of the image."
+#: heat/engine/resources/openstack/sahara/job_binary.py:73
+msgid "Username for accessing the job binary URL."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_image.py:60
-msgid "Tags to add to the image."
+#: heat/engine/resources/openstack/sahara/job_binary.py:78
+msgid "Password for accessing the job binary URL."
+msgstr ""
+
+#: heat/engine/resources/openstack/sahara/job_binary.py:107
+#, python-format
+msgid "%s is not a valid job location."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:61
+#: heat/engine/resources/openstack/sahara/templates.py:69
msgid "Name for the Sahara Node Group Template."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:70
+#: heat/engine/resources/openstack/sahara/templates.py:78
msgid "Description of the Node Group Template."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:91
+#: heat/engine/resources/openstack/sahara/templates.py:99
msgid "Name or ID Nova flavor for the nodes."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:100
+#: heat/engine/resources/openstack/sahara/templates.py:108
msgid "Volumes per node."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:108
+#: heat/engine/resources/openstack/sahara/templates.py:116
msgid "Size of the volumes, in GB."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:116
+#: heat/engine/resources/openstack/sahara/templates.py:124
msgid "Type of the volume to create on Cinder backend."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:124
+#: heat/engine/resources/openstack/sahara/templates.py:132
msgid "List of security group names or IDs to assign to this Node Group template."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:133
+#: heat/engine/resources/openstack/sahara/templates.py:141
msgid "Defines whether auto-assign security group to this Node Group template."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:139
+#: heat/engine/resources/openstack/sahara/templates.py:147
msgid "Availability zone to create servers in."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:144
+#: heat/engine/resources/openstack/sahara/templates.py:152
msgid "Availability zone to create volumes in."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:149
+#: heat/engine/resources/openstack/sahara/templates.py:157
msgid "List of processes to run on every node."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:161
+#: heat/engine/resources/openstack/sahara/templates.py:169
msgid ""
"Name or UUID of the Neutron floating IP network or name of the Nova "
"floating ip pool to use. Should not be provided when used with Nova-"
"network that auto-assign floating IPs."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:169
+#: heat/engine/resources/openstack/sahara/templates.py:177
msgid "Dictionary of node configurations."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:174
+#: heat/engine/resources/openstack/sahara/templates.py:182
msgid "ID of the image to use for the template."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:182
+#: heat/engine/resources/openstack/sahara/templates.py:190
msgid ""
"Provide access to nodes using other nodes of the cluster as proxy "
"gateways."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:189
+#: heat/engine/resources/openstack/sahara/templates.py:197
msgid "Create volumes on the same physical port as an instance."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:302
+#: heat/engine/resources/openstack/sahara/templates.py:341
#, python-format
msgid ""
"Plugin %(plugin)s doesn't support the following node processes: "
"%(unsupported)s. Allowed processes are: %(allowed)s"
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:338
+#: heat/engine/resources/openstack/sahara/templates.py:385
msgid "Name for the Sahara Cluster Template."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:347
+#: heat/engine/resources/openstack/sahara/templates.py:394
msgid "Description of the Sahara Group Template."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:368
+#: heat/engine/resources/openstack/sahara/templates.py:415
msgid "ID of the default image to use for the template."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:384
+#: heat/engine/resources/openstack/sahara/templates.py:431
msgid "List of processes to enable anti-affinity for."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:392
+#: heat/engine/resources/openstack/sahara/templates.py:439
msgid "Cluster configs dictionary."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:397
+#: heat/engine/resources/openstack/sahara/templates.py:444
msgid "Node groups."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:403
+#: heat/engine/resources/openstack/sahara/templates.py:450
msgid "Name of the Node group."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:408
+#: heat/engine/resources/openstack/sahara/templates.py:455
msgid "Number of instances in the Node group."
msgstr ""
-#: heat/engine/resources/openstack/sahara/sahara_templates.py:416
+#: heat/engine/resources/openstack/sahara/templates.py:463
msgid "ID of the Node Group Template."
msgstr ""
+#: heat/engine/resources/openstack/senlin/cluster.py:63
+msgid "The name or id of the Senlin profile."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:71
+msgid "Name of the cluster. By default, physical resource name is used."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:76
+msgid "Desired initial number of resources in cluster."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:81
+msgid "Minimum number of resources in the cluster."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:89
+msgid "Maximum number of resources in the cluster. -1 means unlimited."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:98
+msgid "Metadata key-values defined for cluster."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:102
+msgid "The number of seconds to wait for the cluster actions."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:111
+msgid "Cluster name."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:115
+msgid "Cluster metadata."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:119
+msgid "Desired capacity of the cluster."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:123
+msgid "Nodes list in the cluster."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:127
+msgid "Min size of the cluster."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:131
+msgid "Max size of the cluster."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:186
+#, python-format
+msgid "%(min_size)s can not be greater than %(max_size)s"
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/cluster.py:194
+#, python-format
+msgid "%(desired_capacity)s must be between %(min_size)s and %(max_size)s"
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/profile.py:44
+msgid "Name of the senlin profile. By default, physical resource name is used."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/profile.py:50
+msgid ""
+"The spec template content for Senlin profile, should be either in YAML or"
+" JSON format."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/profile.py:56
+msgid "Metadata key-values defined for profile."
+msgstr ""
+
+#: heat/engine/resources/openstack/senlin/profile.py:90
+#, python-format
+msgid "Failed to parse %(spec)s: %(ex)s"
+msgstr ""
+
#: heat/engine/resources/openstack/swift/swift.py:49
msgid "Name for the container. If not specified, a unique name will be generated."
msgstr ""
@@ -7568,39 +7933,35 @@ msgstr ""
msgid "A map containing all headers for the container."
msgstr ""
-#: heat/engine/resources/openstack/swift/swift.py:195
+#: heat/engine/resources/openstack/swift/swift.py:194
#, python-format
msgid "Deleting non-empty container (%(id)s) when %(prop)s is False"
msgstr ""
+#: heat/engine/resources/openstack/trove/cluster.py:40
#: heat/engine/resources/openstack/trove/os_database.py:41
-#: heat/engine/resources/openstack/trove/trove_cluster.py:40
msgid ""
"The database instance was created, but heat failed to set up the "
"datastore. If a database instance is in the FAILED state, it should be "
"deleted and a new one should be created."
msgstr ""
+#: heat/engine/resources/openstack/trove/cluster.py:44
#: heat/engine/resources/openstack/trove/os_database.py:45
-#: heat/engine/resources/openstack/trove/trove_cluster.py:44
msgid "The last operation for the database instance failed due to an error."
msgstr ""
-#: heat/engine/resources/openstack/trove/os_database.py:87
-msgid "Name of the DB instance to create."
-msgstr ""
-
-#: heat/engine/resources/openstack/trove/os_database.py:94
-msgid "Reference to a flavor for creating DB instance."
+#: heat/engine/resources/openstack/trove/cluster.py:71
+msgid "Name of the cluster to create."
msgstr ""
+#: heat/engine/resources/openstack/trove/cluster.py:78
#: heat/engine/resources/openstack/trove/os_database.py:102
-#: heat/engine/resources/openstack/trove/trove_cluster.py:78
msgid "Name of registered datastore type."
msgstr ""
+#: heat/engine/resources/openstack/trove/cluster.py:86
#: heat/engine/resources/openstack/trove/os_database.py:109
-#: heat/engine/resources/openstack/trove/trove_cluster.py:86
msgid ""
"Name of the registered datastore version. It must exist for provided "
"datastore type. Defaults to using single active version. If several "
@@ -7608,6 +7969,34 @@ msgid ""
"this parameter must be specified."
msgstr ""
+#: heat/engine/resources/openstack/trove/cluster.py:96
+msgid "List of database instances."
+msgstr ""
+
+#: heat/engine/resources/openstack/trove/cluster.py:103
+msgid "Flavor of the instance."
+msgstr ""
+
+#: heat/engine/resources/openstack/trove/cluster.py:111
+msgid "Size of the instance disk volume in GB."
+msgstr ""
+
+#: heat/engine/resources/openstack/trove/cluster.py:124
+msgid "A list of instances ids."
+msgstr ""
+
+#: heat/engine/resources/openstack/trove/cluster.py:128
+msgid "A list of cluster instance IPs."
+msgstr ""
+
+#: heat/engine/resources/openstack/trove/os_database.py:87
+msgid "Name of the DB instance to create."
+msgstr ""
+
+#: heat/engine/resources/openstack/trove/os_database.py:94
+msgid "Reference to a flavor for creating DB instance."
+msgstr ""
+
#: heat/engine/resources/openstack/trove/os_database.py:118
msgid "Database volume size in GB."
msgstr ""
@@ -7718,30 +8107,6 @@ msgstr ""
msgid "Either %(net)s or %(port)s must be provided."
msgstr ""
-#: heat/engine/resources/openstack/trove/trove_cluster.py:71
-msgid "Name of the cluster to create."
-msgstr ""
-
-#: heat/engine/resources/openstack/trove/trove_cluster.py:96
-msgid "List of database instances."
-msgstr ""
-
-#: heat/engine/resources/openstack/trove/trove_cluster.py:103
-msgid "Flavor of the instance."
-msgstr ""
-
-#: heat/engine/resources/openstack/trove/trove_cluster.py:111
-msgid "Size of the instance disk volume in GB."
-msgstr ""
-
-#: heat/engine/resources/openstack/trove/trove_cluster.py:124
-msgid "A list of instances ids."
-msgstr ""
-
-#: heat/engine/resources/openstack/trove/trove_cluster.py:128
-msgid "A list of cluster instance IPs."
-msgstr ""
-
#: heat/engine/resources/openstack/zaqar/queue.py:43
msgid "Name of the queue instance to create."
msgstr ""
@@ -7776,7 +8141,7 @@ msgstr ""
msgid "Message queue %s creation failed."
msgstr ""
-#: heat/objects/stack.py:184
+#: heat/objects/stack.py:181
#, python-format
msgid "Attempt to update a stack with id: %(id)s %(traversal)s %(msg)s"
msgstr ""
@@ -7813,107 +8178,106 @@ msgstr ""
msgid "Need more arguments"
msgstr ""
-#: heat/tests/test_provider_template.py:696
-#: heat/tests/test_provider_template.py:813
-#: heat/tests/test_provider_template.py:842
+#: heat/tests/test_provider_template.py:809
+#: heat/tests/test_provider_template.py:838
msgid "Failed to retrieve template"
msgstr ""
-#: heat/tests/test_remote_stack.py:640
-msgid ""
-"ResourceInError: resources.remote_stack: Went to status UPDATE_FAILED due"
-" to \"Remote stack update failed\""
-msgstr ""
-
-#: heat/tests/test_resource.py:1810
+#: heat/tests/test_resource.py:1832
msgid "Resource update failed"
msgstr ""
-#: heat/tests/test_software_deployment.py:852
-msgid "need more memory."
-msgstr ""
-
-#: heat/tests/test_validate.py:1473
+#: heat/tests/test_validate.py:1458
msgid ""
"Parameter Groups error: parameter_groups.Database Group: The InstanceType"
" parameter must be assigned to one parameter group only."
msgstr ""
-#: heat/tests/test_validate.py:1486
+#: heat/tests/test_validate.py:1471
msgid ""
"Parameter Groups error: parameter_groups.: The key_name parameter must be"
" assigned to one parameter group only."
msgstr ""
-#: heat/tests/test_validate.py:1504
+#: heat/tests/test_validate.py:1489
msgid ""
"Parameter Groups error: parameter_groups.Database Group: The grouped "
"parameter SomethingNotHere does not reference a valid parameter."
msgstr ""
-#: heat/tests/test_validate.py:1518
+#: heat/tests/test_validate.py:1503
msgid ""
"Parameter Groups error: parameter_groups.: The grouped parameter key_name"
" does not reference a valid parameter."
msgstr ""
-#: heat/tests/test_validate.py:1531
+#: heat/tests/test_validate.py:1516
msgid ""
"Parameter Groups error: parameter_groups.Server Group: The parameters "
"must be provided for each parameter group."
msgstr ""
-#: heat/tests/test_validate.py:1542
+#: heat/tests/test_validate.py:1527
msgid ""
"Parameter Groups error: parameter_groups: The parameter_groups should be "
"a list."
msgstr ""
-#: heat/tests/test_validate.py:1553
+#: heat/tests/test_validate.py:1538
msgid ""
"Parameter Groups error: parameter_groups.Server Group: The parameters of "
"parameter group should be a list."
msgstr ""
-#: heat/tests/test_validate.py:1565
+#: heat/tests/test_validate.py:1550
msgid ""
"Parameter Groups error: parameter_groups.: The parameters of parameter "
"group should be a list."
msgstr ""
-#: heat/tests/convergence/framework/fake_resource.py:41
+#: heat/tests/convergence/framework/fake_resource.py:38
msgid "Fake property a."
msgstr ""
-#: heat/tests/convergence/framework/fake_resource.py:47
+#: heat/tests/convergence/framework/fake_resource.py:44
msgid "Fake property c."
msgstr ""
-#: heat/tests/convergence/framework/fake_resource.py:53
+#: heat/tests/convergence/framework/fake_resource.py:50
msgid "Fake property ca."
msgstr ""
-#: heat/tests/convergence/framework/fake_resource.py:59
+#: heat/tests/convergence/framework/fake_resource.py:56
msgid "Fake property !a."
msgstr ""
-#: heat/tests/convergence/framework/fake_resource.py:65
+#: heat/tests/convergence/framework/fake_resource.py:62
msgid "Fake property !c."
msgstr ""
-#: heat/tests/convergence/framework/fake_resource.py:73
+#: heat/tests/convergence/framework/fake_resource.py:70
msgid "Fake attribute a."
msgstr ""
-#: heat/tests/convergence/framework/fake_resource.py:77
+#: heat/tests/convergence/framework/fake_resource.py:74
msgid "Fake attribute !a."
msgstr ""
-#: heat/tests/nova/test_server.py:1309
+#: heat/tests/openstack/heat/test_remote_stack.py:640
+msgid ""
+"ResourceInError: resources.remote_stack: Went to status UPDATE_FAILED due"
+" to \"Remote stack update failed\""
+msgstr ""
+
+#: heat/tests/openstack/heat/test_software_deployment.py:859
+msgid "need more memory."
+msgstr ""
+
+#: heat/tests/openstack/nova/test_server.py:1327
msgid "Cannot use network and uuid at the same time."
msgstr ""
-#: heat/tests/nova/test_server.py:1350
+#: heat/tests/openstack/nova/test_server.py:1368
#, python-format
msgid ""
"One of the properties \"network\", \"port\", \"uuid\" or \"subnet\" "
diff --git a/heat/locale/it/LC_MESSAGES/heat-log-critical.po b/heat/locale/it/LC_MESSAGES/heat-log-critical.po
index b431b63e6..b64cd6d9c 100644
--- a/heat/locale/it/LC_MESSAGES/heat-log-critical.po
+++ b/heat/locale/it/LC_MESSAGES/heat-log-critical.po
@@ -6,19 +6,19 @@
# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:03+0000\n"
-"PO-Revision-Date: 2015-09-04 08:15+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Italian\n"
-"Language: it\n"
+"POT-Creation-Date: 2016-01-17 12:11+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-04 08:15+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: Italian\n"
#, python-format
msgid "%s"
diff --git a/heat/locale/ja/LC_MESSAGES/heat-log-critical.po b/heat/locale/ja/LC_MESSAGES/heat-log-critical.po
index 3d703cd1f..f0d318a85 100644
--- a/heat/locale/ja/LC_MESSAGES/heat-log-critical.po
+++ b/heat/locale/ja/LC_MESSAGES/heat-log-critical.po
@@ -6,19 +6,19 @@
# KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:03+0000\n"
-"PO-Revision-Date: 2015-09-04 08:15+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Japanese\n"
-"Language: ja\n"
+"POT-Creation-Date: 2016-01-17 12:11+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-04 08:15+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: Japanese\n"
#, python-format
msgid "%s"
diff --git a/heat/locale/ko_KR/LC_MESSAGES/heat-log-critical.po b/heat/locale/ko_KR/LC_MESSAGES/heat-log-critical.po
index fa01a5a22..d5802b01c 100644
--- a/heat/locale/ko_KR/LC_MESSAGES/heat-log-critical.po
+++ b/heat/locale/ko_KR/LC_MESSAGES/heat-log-critical.po
@@ -6,19 +6,19 @@
# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:03+0000\n"
-"PO-Revision-Date: 2015-09-04 08:15+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Korean (South Korea)\n"
-"Language: ko-KR\n"
+"POT-Creation-Date: 2016-01-17 12:11+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-04 08:15+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language: ko-KR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: Korean (South Korea)\n"
#, python-format
msgid "%s"
diff --git a/heat/locale/pt/LC_MESSAGES/heat-log-critical.po b/heat/locale/pt/LC_MESSAGES/heat-log-critical.po
index 8c54acf85..72647aa7b 100644
--- a/heat/locale/pt/LC_MESSAGES/heat-log-critical.po
+++ b/heat/locale/pt/LC_MESSAGES/heat-log-critical.po
@@ -6,19 +6,19 @@
# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:03+0000\n"
-"PO-Revision-Date: 2015-09-04 08:15+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Portuguese\n"
-"Language: pt\n"
+"POT-Creation-Date: 2016-01-17 12:11+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-04 08:15+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language: pt\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: Portuguese\n"
#, python-format
msgid "%s"
diff --git a/heat/locale/pt_BR/LC_MESSAGES/heat-log-critical.po b/heat/locale/pt_BR/LC_MESSAGES/heat-log-critical.po
index 5baeef561..bb3d983ac 100644
--- a/heat/locale/pt_BR/LC_MESSAGES/heat-log-critical.po
+++ b/heat/locale/pt_BR/LC_MESSAGES/heat-log-critical.po
@@ -6,19 +6,19 @@
# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:03+0000\n"
-"PO-Revision-Date: 2015-09-04 08:15+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Portuguese (Brazil)\n"
-"Language: pt-BR\n"
+"POT-Creation-Date: 2016-01-17 12:11+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-04 08:15+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language: pt-BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: Portuguese (Brazil)\n"
#, python-format
msgid "%s"
diff --git a/heat/locale/tr_TR/LC_MESSAGES/heat-log-critical.po b/heat/locale/tr_TR/LC_MESSAGES/heat-log-critical.po
index c02fc46df..be1afb751 100644
--- a/heat/locale/tr_TR/LC_MESSAGES/heat-log-critical.po
+++ b/heat/locale/tr_TR/LC_MESSAGES/heat-log-critical.po
@@ -6,19 +6,19 @@
# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:03+0000\n"
-"PO-Revision-Date: 2015-09-04 08:15+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Turkish (Turkey)\n"
-"Language: tr-TR\n"
+"POT-Creation-Date: 2016-01-17 12:11+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-04 08:15+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language: tr-TR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: Turkish (Turkey)\n"
#, python-format
msgid "%s"
diff --git a/heat/locale/zh_CN/LC_MESSAGES/heat-log-critical.po b/heat/locale/zh_CN/LC_MESSAGES/heat-log-critical.po
index e1342a300..605946e58 100644
--- a/heat/locale/zh_CN/LC_MESSAGES/heat-log-critical.po
+++ b/heat/locale/zh_CN/LC_MESSAGES/heat-log-critical.po
@@ -6,19 +6,19 @@
# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:03+0000\n"
-"PO-Revision-Date: 2015-09-04 08:15+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Chinese (China)\n"
-"Language: zh-CN\n"
+"POT-Creation-Date: 2016-01-17 12:11+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-04 08:15+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language: zh-CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: Chinese (China)\n"
#, python-format
msgid "%s"
diff --git a/heat/locale/zh_TW/LC_MESSAGES/heat-log-critical.po b/heat/locale/zh_TW/LC_MESSAGES/heat-log-critical.po
index c0224b626..7bb5e9e9b 100644
--- a/heat/locale/zh_TW/LC_MESSAGES/heat-log-critical.po
+++ b/heat/locale/zh_TW/LC_MESSAGES/heat-log-critical.po
@@ -6,19 +6,19 @@
# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
msgid ""
msgstr ""
-"Project-Id-Version: heat 6.0.0.dev128\n"
+"Project-Id-Version: heat 6.0.0.0b2.dev223\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:03+0000\n"
-"PO-Revision-Date: 2015-09-04 08:15+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Chinese (Taiwan)\n"
-"Language: zh-TW\n"
+"POT-Creation-Date: 2016-01-17 12:11+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-04 08:15+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language: zh-TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Generated-By: Babel 2.0\n"
-"X-Generator: Zanata 3.7.1\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: Chinese (Taiwan)\n"
#, python-format
msgid "%s"