openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix inconsistent Manila service naming 

The capitalization of OS::Tripleo is wrong compared to all other services
so correct this for avoidance of confusion when folks write custom roles_data
files or pass custom service lists via *Services parameters.

Change-Id: Ib73c80871b45586edb5774e90280ff89fc0d9895
Closes-Bug: 1640871
This commit is contained in:
Steven Hardy 2016-11-10 17:06:47 +00:00
parent 977106ff5e
commit 548bf8ada5
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
environments/manila-cephfsnative-config.yaml
View File

@ -1,11 +1,11 @@
# A Heat environment file which can be used to enable a # A Heat environment file which can be used to enable a
# a Manila CephFS Native driver backend. # a Manila CephFS Native driver backend.
resource_registry: resource_registry:
OS::Tripleo::Services::ManilaApi: ../puppet/services/manila-api.yaml OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
OS::Tripleo::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
# Only manila-share is pacemaker managed: # Only manila-share is pacemaker managed:
OS::Tripleo::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
OS::Tripleo::Services::ManilaBackendCephFs: ../puppet/services/manila-backend-cephfs.yaml OS::TripleO::Services::ManilaBackendCephFs: ../puppet/services/manila-backend-cephfs.yaml
parameter_defaults: parameter_defaults:

8
environments/manila-generic-config.yaml
View File

@ -1,10 +1,10 @@
# This environment file enables Manila with the Generic backend. # This environment file enables Manila with the Generic backend.
resource_registry: resource_registry:
OS::Tripleo::Services::ManilaApi: ../puppet/services/manila-api.yaml OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
OS::Tripleo::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
# Only manila-share is pacemaker managed: # Only manila-share is pacemaker managed:
OS::Tripleo::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
OS::Tripleo::Services::ManilaBackendGeneric: ../puppet/services/manila-backend-generic.yaml OS::TripleO::Services::ManilaBackendGeneric: ../puppet/services/manila-backend-generic.yaml
parameter_defaults: parameter_defaults:
ManilaServiceInstanceUser: '' ManilaServiceInstanceUser: ''

8
environments/manila-netapp-config.yaml
View File

@ -1,10 +1,10 @@
# This environment file enables Manila with the Netapp backend. # This environment file enables Manila with the Netapp backend.
resource_registry: resource_registry:
OS::Tripleo::Services::ManilaApi: ../puppet/services/manila-api.yaml OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
OS::Tripleo::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
# Only manila-share is pacemaker managed: # Only manila-share is pacemaker managed:
OS::Tripleo::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
OS::Tripleo::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml OS::TripleO::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml
parameter_defaults: parameter_defaults:
ManilaNetappBackendName: tripleo_netapp ManilaNetappBackendName: tripleo_netapp

12
overcloud-resource-registry-puppet.j2.yaml
View File

@ -184,12 +184,12 @@ resource_registry:
# Services that are disabled by default (use relevant environment files): # Services that are disabled by default (use relevant environment files):
OS::TripleO::Services::FluentdClient: OS::Heat::None OS::TripleO::Services::FluentdClient: OS::Heat::None
OS::TripleO::LoggingConfiguration: puppet/services/logging/fluentd-config.yaml OS::TripleO::LoggingConfiguration: puppet/services/logging/fluentd-config.yaml
OS::Tripleo::Services::ManilaApi: OS::Heat::None OS::TripleO::Services::ManilaApi: OS::Heat::None
OS::Tripleo::Services::ManilaScheduler: OS::Heat::None OS::TripleO::Services::ManilaScheduler: OS::Heat::None
OS::Tripleo::Services::ManilaShare: OS::Heat::None OS::TripleO::Services::ManilaShare: OS::Heat::None
OS::Tripleo::Services::ManilaBackendGeneric: OS::Heat::None OS::TripleO::Services::ManilaBackendGeneric: OS::Heat::None
OS::Tripleo::Services::ManilaBackendNetapp: OS::Heat::None OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
OS::Tripleo::Services::ManilaBackendCephFs: OS::Heat::None OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::BarbicanApi: OS::Heat::None OS::TripleO::Services::BarbicanApi: OS::Heat::None

12
roles_data.yaml
View File

@ -73,12 +73,12 @@
- OS::TripleO::Services::GnocchiApi - OS::TripleO::Services::GnocchiApi
- OS::TripleO::Services::GnocchiMetricd - OS::TripleO::Services::GnocchiMetricd
- OS::TripleO::Services::GnocchiStatsd - OS::TripleO::Services::GnocchiStatsd
- OS::Tripleo::Services::ManilaApi - OS::TripleO::Services::ManilaApi
- OS::Tripleo::Services::ManilaScheduler - OS::TripleO::Services::ManilaScheduler
- OS::Tripleo::Services::ManilaBackendGeneric - OS::TripleO::Services::ManilaBackendGeneric
- OS::Tripleo::Services::ManilaBackendNetapp - OS::TripleO::Services::ManilaBackendNetapp
- OS::Tripleo::Services::ManilaBackendCephFs - OS::TripleO::Services::ManilaBackendCephFs
- OS::Tripleo::Services::ManilaShare - OS::TripleO::Services::ManilaShare
- OS::TripleO::Services::AodhApi - OS::TripleO::Services::AodhApi
- OS::TripleO::Services::AodhEvaluator - OS::TripleO::Services::AodhEvaluator
- OS::TripleO::Services::AodhNotifier - OS::TripleO::Services::AodhNotifier