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:
parent
977106ff5e
commit
548bf8ada5
@ -1,11 +1,11 @@
|
||||
# A Heat environment file which can be used to enable a
|
||||
# a Manila CephFS Native driver backend.
|
||||
resource_registry:
|
||||
OS::Tripleo::Services::ManilaApi: ../puppet/services/manila-api.yaml
|
||||
OS::Tripleo::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
|
||||
OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
|
||||
OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
|
||||
# Only manila-share is pacemaker managed:
|
||||
OS::Tripleo::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
|
||||
OS::Tripleo::Services::ManilaBackendCephFs: ../puppet/services/manila-backend-cephfs.yaml
|
||||
OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
|
||||
OS::TripleO::Services::ManilaBackendCephFs: ../puppet/services/manila-backend-cephfs.yaml
|
||||
|
||||
|
||||
parameter_defaults:
|
||||
|
@ -1,10 +1,10 @@
|
||||
# This environment file enables Manila with the Generic backend.
|
||||
resource_registry:
|
||||
OS::Tripleo::Services::ManilaApi: ../puppet/services/manila-api.yaml
|
||||
OS::Tripleo::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
|
||||
OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
|
||||
OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
|
||||
# Only manila-share is pacemaker managed:
|
||||
OS::Tripleo::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
|
||||
OS::Tripleo::Services::ManilaBackendGeneric: ../puppet/services/manila-backend-generic.yaml
|
||||
OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
|
||||
OS::TripleO::Services::ManilaBackendGeneric: ../puppet/services/manila-backend-generic.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ManilaServiceInstanceUser: ''
|
||||
|
@ -1,10 +1,10 @@
|
||||
# This environment file enables Manila with the Netapp backend.
|
||||
resource_registry:
|
||||
OS::Tripleo::Services::ManilaApi: ../puppet/services/manila-api.yaml
|
||||
OS::Tripleo::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
|
||||
OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
|
||||
OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
|
||||
# Only manila-share is pacemaker managed:
|
||||
OS::Tripleo::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
|
||||
OS::Tripleo::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml
|
||||
OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
|
||||
OS::TripleO::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ManilaNetappBackendName: tripleo_netapp
|
||||
|
@ -184,12 +184,12 @@ resource_registry:
|
||||
# Services that are disabled by default (use relevant environment files):
|
||||
OS::TripleO::Services::FluentdClient: OS::Heat::None
|
||||
OS::TripleO::LoggingConfiguration: puppet/services/logging/fluentd-config.yaml
|
||||
OS::Tripleo::Services::ManilaApi: OS::Heat::None
|
||||
OS::Tripleo::Services::ManilaScheduler: OS::Heat::None
|
||||
OS::Tripleo::Services::ManilaShare: OS::Heat::None
|
||||
OS::Tripleo::Services::ManilaBackendGeneric: OS::Heat::None
|
||||
OS::Tripleo::Services::ManilaBackendNetapp: OS::Heat::None
|
||||
OS::Tripleo::Services::ManilaBackendCephFs: OS::Heat::None
|
||||
OS::TripleO::Services::ManilaApi: OS::Heat::None
|
||||
OS::TripleO::Services::ManilaScheduler: OS::Heat::None
|
||||
OS::TripleO::Services::ManilaShare: OS::Heat::None
|
||||
OS::TripleO::Services::ManilaBackendGeneric: OS::Heat::None
|
||||
OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
|
||||
OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
|
||||
OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None
|
||||
OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None
|
||||
OS::TripleO::Services::BarbicanApi: OS::Heat::None
|
||||
|
@ -73,12 +73,12 @@
|
||||
- OS::TripleO::Services::GnocchiApi
|
||||
- OS::TripleO::Services::GnocchiMetricd
|
||||
- OS::TripleO::Services::GnocchiStatsd
|
||||
- OS::Tripleo::Services::ManilaApi
|
||||
- OS::Tripleo::Services::ManilaScheduler
|
||||
- OS::Tripleo::Services::ManilaBackendGeneric
|
||||
- OS::Tripleo::Services::ManilaBackendNetapp
|
||||
- OS::Tripleo::Services::ManilaBackendCephFs
|
||||
- OS::Tripleo::Services::ManilaShare
|
||||
- OS::TripleO::Services::ManilaApi
|
||||
- OS::TripleO::Services::ManilaScheduler
|
||||
- OS::TripleO::Services::ManilaBackendGeneric
|
||||
- OS::TripleO::Services::ManilaBackendNetapp
|
||||
- OS::TripleO::Services::ManilaBackendCephFs
|
||||
- OS::TripleO::Services::ManilaShare
|
||||
- OS::TripleO::Services::AodhApi
|
||||
- OS::TripleO::Services::AodhEvaluator
|
||||
- OS::TripleO::Services::AodhNotifier
|
||||
|
Loading…
Reference in New Issue
Block a user