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
This commit is contained in:
Ricardo Carrillo Cruz 2016-09-12 13:35:44 +02:00
parent f2c3b8372a
commit cff7cf98dc
3 changed files with 3 additions and 3 deletions

View File

@ -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'],
}