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