From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Mon, 8 Aug 2016 10:48:24 +0000 (+0300)
Subject: Remove KeystoneRegion from controller.yaml
X-Git-Tag: opnfv-6.0.0~1765^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=90978109348009581919af7339ad0b7c5822f8e2;p=apex-tripleo-heat-templates.git

Remove KeystoneRegion from controller.yaml

this is no longer needed here as it's not used anymore.

Change-Id: I8aa9cc5f991fccc8c9acc81fb96e71b7e3fc145e
---

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 3e12fbb3..f78cc930 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -137,10 +137,6 @@ parameters:
     type: string
     constraints:
       - custom_constraint: nova.keypair
-  KeystoneRegion:
-    type: string
-    default: 'regionOne'
-    description: Keystone region for endpoint
   ManageFirewall:
     default: false
     description: Whether to manage IPtables rules.
@@ -558,7 +554,6 @@ resources:
         heat_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
         keystone_public_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
         keystone_admin_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
-        keystone_region: {get_param: KeystoneRegion}
         manila_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ManilaApiNetwork]}]}
         mongo_db_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]}
         neutron_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}