From cff7cf98dceb6e1beb3dbbc4dafe02794d94be5d Mon Sep 17 00:00:00 2001
From: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com>
Date: Mon, 12 Sep 2016 13:35:44 +0200
Subject: [PATCH] Remove per-region handling

Since vanilla and chocolate are on the same VLAN, we don't have
two different bifrost machines, just one to handle both.
Therefore, the per-region split logic is not needed anymore and makes
it impossible to have on the current baremetal machine in prod
having both inventories at the same time.

Note: I'm leaving the 'region' parameter on purpose, otherwise
the apply tests fail.
Will remove it in a subsequent patch.

Change-Id: I433cdb8675c3acd2e699272aaf6a0e67eb9200b0
---
 manifests/bifrost.pp                                        | 6 +++---
 ...rost_global_vars.vanilla.erb => bifrost_global_vars.erb} | 0
 .../{inventory.vanilla.json.erb => inventory.json.erb}      | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename templates/bifrost/{bifrost_global_vars.vanilla.erb => bifrost_global_vars.erb} (100%)
 rename templates/bifrost/{inventory.vanilla.json.erb => inventory.json.erb} (100%)

diff --git a/manifests/bifrost.pp b/manifests/bifrost.pp
index 848525d..f6267e3 100644
--- a/manifests/bifrost.pp
+++ b/manifests/bifrost.pp
@@ -18,7 +18,7 @@ class infracloud::bifrost (
   $ironic_db_password,
   $ironic_inventory,
   $mysql_password,
-  $region,
+  $region = 'vanilla',
   $ssh_private_key,
   $ssh_public_key,
   $vlan,
@@ -62,12 +62,12 @@ class infracloud::bifrost (
 
   file { '/etc/bifrost/bifrost_global_vars':
     ensure  => present,
-    content => template("infracloud/bifrost/bifrost_global_vars.${region}.erb"),
+    content => template('infracloud/bifrost/bifrost_global_vars.erb'),
   }
 
   file { '/opt/stack/baremetal.json':
     ensure  => file,
-    content => template("infracloud/bifrost/inventory.${region}.json.erb"),
+    content => template('infracloud/bifrost/inventory.json.erb'),
     require => Vcsrepo['/opt/stack/bifrost'],
   }
 
diff --git a/templates/bifrost/bifrost_global_vars.vanilla.erb b/templates/bifrost/bifrost_global_vars.erb
similarity index 100%
rename from templates/bifrost/bifrost_global_vars.vanilla.erb
rename to templates/bifrost/bifrost_global_vars.erb
diff --git a/templates/bifrost/inventory.vanilla.json.erb b/templates/bifrost/inventory.json.erb
similarity index 100%
rename from templates/bifrost/inventory.vanilla.json.erb
rename to templates/bifrost/inventory.json.erb