From 192d358148233e1185407e59683780bbf7a1f4fe Mon Sep 17 00:00:00 2001
From: Samuel Cassiba <samuel@cassi.ba>
Date: Tue, 4 Sep 2018 15:29:28 -0700
Subject: [PATCH] Rename bare-metal to baremetal for Ironic

Change-Id: I55eb4401dbc1e7c8cbd098a2bafca7f414d250de
---
 attributes/default.rb   | 2 +-
 attributes/messaging.rb | 2 +-
 spec/default_spec.rb    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index 22dd66ef..c7c7cff4 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -33,7 +33,7 @@ default['openstack']['common']['custom_template_banner'] = '
 # OpenStack services and their project names
 default['openstack']['common']['services'] = {
   'aodh' => 'aodh',
-  'bare-metal' => 'ironic',
+  'baremetal' => 'ironic',
   'block-storage' => 'cinder',
   'compute' => 'nova',
   'compute_api' => 'nova_api',
diff --git a/attributes/messaging.rb b/attributes/messaging.rb
index 1e1ba84a..579b97c9 100644
--- a/attributes/messaging.rb
+++ b/attributes/messaging.rb
@@ -34,7 +34,7 @@ default['openstack']['bind_service']['mq']['interface'] = nil
 ###################################################################
 # Services to assign mq attributes for
 ###################################################################
-services = %w(aodh bare-metal block-storage compute database dns image
+services = %w(aodh baremetal block-storage compute database dns image
               identity telemetry network orchestration)
 
 ###################################################################
diff --git a/spec/default_spec.rb b/spec/default_spec.rb
index 5272adcb..a2c349a9 100644
--- a/spec/default_spec.rb
+++ b/spec/default_spec.rb
@@ -4,7 +4,7 @@ require_relative 'spec_helper'
 describe 'openstack-common::default' do
   describe 'ubuntu' do
     let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
-    let(:mq_services) { %w(bare-metal block-storage compute database image telemetry network orchestration) }
+    let(:mq_services) { %w(baremetal block-storage compute database image telemetry network orchestration) }
     let(:node) { runner.node }
     let(:chef_run) do
       runner.converge(described_recipe)