diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-11 14:47:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-11 14:47:28 +0000 |
| commit | b0ffc79452d64bf3996adb5b6a04628c4de1c8b7 (patch) | |
| tree | 78bded0162bbc91f69bb287b90ebc6aa964509a5 /environments/manila-generic-config.yaml | |
| parent | 9211e2b61d6fcccbcdefb87667fd72a165ef882f (diff) | |
| parent | 548bf8ada59e812428a85c89aa4630d53120b141 (diff) | |
Merge "Fix inconsistent Manila service naming"
Diffstat (limited to 'environments/manila-generic-config.yaml')
| -rw-r--r-- | environments/manila-generic-config.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/environments/manila-generic-config.yaml b/environments/manila-generic-config.yaml index 9344bc6e..65884a94 100644 --- a/environments/manila-generic-config.yaml +++ b/environments/manila-generic-config.yaml @@ -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: '' |