Rename bare-metal to baremetal for Ironic
Change-Id: I55eb4401dbc1e7c8cbd098a2bafca7f414d250de
This commit is contained in:
		@@ -33,7 +33,7 @@ default['openstack']['common']['custom_template_banner'] = '
 | 
				
			|||||||
# OpenStack services and their project names
 | 
					# OpenStack services and their project names
 | 
				
			||||||
default['openstack']['common']['services'] = {
 | 
					default['openstack']['common']['services'] = {
 | 
				
			||||||
  'aodh' => 'aodh',
 | 
					  'aodh' => 'aodh',
 | 
				
			||||||
  'bare-metal' => 'ironic',
 | 
					  'baremetal' => 'ironic',
 | 
				
			||||||
  'block-storage' => 'cinder',
 | 
					  'block-storage' => 'cinder',
 | 
				
			||||||
  'compute' => 'nova',
 | 
					  'compute' => 'nova',
 | 
				
			||||||
  'compute_api' => 'nova_api',
 | 
					  'compute_api' => 'nova_api',
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,7 +34,7 @@ default['openstack']['bind_service']['mq']['interface'] = nil
 | 
				
			|||||||
###################################################################
 | 
					###################################################################
 | 
				
			||||||
# Services to assign mq attributes for
 | 
					# 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)
 | 
					              identity telemetry network orchestration)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
###################################################################
 | 
					###################################################################
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,7 +4,7 @@ require_relative 'spec_helper'
 | 
				
			|||||||
describe 'openstack-common::default' do
 | 
					describe 'openstack-common::default' do
 | 
				
			||||||
  describe 'ubuntu' do
 | 
					  describe 'ubuntu' do
 | 
				
			||||||
    let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
 | 
					    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(:node) { runner.node }
 | 
				
			||||||
    let(:chef_run) do
 | 
					    let(:chef_run) do
 | 
				
			||||||
      runner.converge(described_recipe)
 | 
					      runner.converge(described_recipe)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user