Convert hyphens to underscores for service names
The Chef Style Guide[1] does not recommend using hyphens for cookbook or resource names. To maintain consistency, we should follow best practices. In order to pass Zuul's one-way CRD requirements[2], both hyphens and underscores must exist for a compatibility period. [1]: https://docs.chef.io/ruby.html#use-of-hyphens [2]: http://lists.openstack.org/pipermail/openstack-dev/2015-February/056515.html Change-Id: Ic2b6d8f1cdf719791faaebdbd7e29e789eb3f31c
This commit is contained in:
parent
713e615822
commit
7c31fb629b
|
@ -34,6 +34,8 @@ default['openstack']['common']['custom_template_banner'] = '
|
||||||
default['openstack']['common']['services'] = {
|
default['openstack']['common']['services'] = {
|
||||||
'aodh' => 'aodh',
|
'aodh' => 'aodh',
|
||||||
'baremetal' => 'ironic',
|
'baremetal' => 'ironic',
|
||||||
|
'bare_metal' => 'ironic',
|
||||||
|
'block_storage' => 'cinder',
|
||||||
'block-storage' => 'cinder',
|
'block-storage' => 'cinder',
|
||||||
'compute' => 'nova',
|
'compute' => 'nova',
|
||||||
'compute_api' => 'nova_api',
|
'compute_api' => 'nova_api',
|
||||||
|
@ -44,11 +46,11 @@ default['openstack']['common']['services'] = {
|
||||||
'identity' => 'keystone',
|
'identity' => 'keystone',
|
||||||
'image' => 'glance',
|
'image' => 'glance',
|
||||||
'network' => 'neutron',
|
'network' => 'neutron',
|
||||||
'object-storage' => 'swift',
|
'object_storage' => 'swift',
|
||||||
'orchestration' => 'heat',
|
'orchestration' => 'heat',
|
||||||
'telemetry' => 'ceilometer',
|
'telemetry' => 'ceilometer',
|
||||||
'telemetry-metric' => 'gnocchi',
|
'telemetry_metric' => 'gnocchi',
|
||||||
'application-catalog' => 'murano',
|
'application_catalog' => 'murano',
|
||||||
}
|
}
|
||||||
|
|
||||||
# Setting this to True means that database passwords and service user
|
# Setting this to True means that database passwords and service user
|
||||||
|
|
|
@ -34,8 +34,9 @@ default['openstack']['bind_service']['mq']['interface'] = nil
|
||||||
###################################################################
|
###################################################################
|
||||||
# Services to assign mq attributes for
|
# Services to assign mq attributes for
|
||||||
###################################################################
|
###################################################################
|
||||||
services = %w(aodh baremetal block-storage compute database dns image
|
services = %w(aodh bare_metal block_storage compute database dns image
|
||||||
identity telemetry network orchestration)
|
identity telemetry network orchestration
|
||||||
|
baremetal block-storage)
|
||||||
|
|
||||||
###################################################################
|
###################################################################
|
||||||
# Generic default attributes
|
# Generic default attributes
|
||||||
|
|
|
@ -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(baremetal block-storage compute database image telemetry network orchestration) }
|
let(:mq_services) { %w(bare_metal 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)
|
||||||
|
|
Loading…
Reference in New Issue