From: Thomas Goirand <thomas@goirand.fr>
Date: Fri, 7 Dec 2012 10:54:00 +0000 (+0000)
Subject: Uses always heat/ instead of heat-*/ in debconf
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=284b9766129f313bd5a88e62f0df6314632d7741;p=openstack-build%2Fheat-build.git

Uses always heat/ instead of heat-*/ in debconf

Rewritten-From: c40fd8c63b1c3404431f1b08db40d7eb6e9814dd
---

diff --git a/trusty/debian/heat-api-cfn.templates b/trusty/debian/heat-api-cfn.templates
index 9a3a85e0..ca914f37 100644
--- a/trusty/debian/heat-api-cfn.templates
+++ b/trusty/debian/heat-api-cfn.templates
@@ -1,20 +1,20 @@
-Template: heat-api-cfn/auth-host
+Template: heat/auth-host
 Type: string
 Default: 127.0.0.1
 _Description: Auth server hostname:
  Please specify the URL of your authentication server. Typically this is also
  the URL of your OpenStack Identity Service (Keystone).
 
-Template: heat-api-cfn/admin-tenant-name
+Template: heat/admin-tenant-name
 Type: string
 Default: admin
 _Description: Auth server tenant name:
 
-Template: heat-api-cfn/admin-user
+Template: heat/admin-user
 Type: string
 Default: admin
 _Description: Auth server username:
 
-Template: heat-api-cfn/admin-password
+Template: heat/admin-password
 Type: password
 _Description: Auth server password:
diff --git a/trusty/debian/heat-api-cloudwatch.templates b/trusty/debian/heat-api-cloudwatch.templates
index ab3083c9..46427e48 100644
--- a/trusty/debian/heat-api-cloudwatch.templates
+++ b/trusty/debian/heat-api-cloudwatch.templates
@@ -1,20 +1,20 @@
-Template: heat-api-cloudwatch/auth-host
+Template: heat/auth-host
 Type: string
 Default: 127.0.0.1
 _Description: Auth server hostname:
  Please specify the URL of your authentication server. Typically
  this is also the URL of your OpenStack Identity Service (Keystone).
 
-Template: heat-api-cloudwatch/admin-tenant-name
+Template: heat/admin-tenant-name
 Type: string
 Default: admin
 _Description: Auth server tenant name:
 
-Template: heat-api-cloudwatch/admin-user
+Template: heat/admin-user
 Type: string
 Default: admin
 _Description: Auth server username:
 
-Template: heat-api-cloudwatch/admin-password
+Template: heat/admin-password
 Type: password
 _Description: Auth server password: