diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-03 16:16:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-03 16:16:24 +0000 |
| commit | 656b4f9887878b6d933311086cf1e2316f5f593a (patch) | |
| tree | 0509e34642c17a5f2be0edf2a777ae6d1090faaa /overcloud-resource-registry-puppet.yaml | |
| parent | 6d211425d7db5328d94638e7684561ff81b5195f (diff) | |
| parent | b99733d08ae8e90b7ace4c2521ec74f2520dba93 (diff) | |
Merge "Enable Manila integration - as a composable controller service"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index c71ced2d..dc74e889 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -193,6 +193,10 @@ resource_registry: OS::TripleO::Services::GnocchiApi: puppet/services/gnocchi-api.yaml OS::TripleO::Services::GnocchiMetricd: puppet/services/gnocchi-metricd.yaml OS::TripleO::Services::GnocchiStatsd: puppet/services/gnocchi-statsd.yaml + # Services that are disabled by default (use relevant environment files): + OS::Tripleo::Services::ManilaApi: OS::Heat::None + OS::Tripleo::Services::ManilaScheduler: OS::Heat::None + OS::Tripleo::Services::ManilaShare: OS::Heat::None parameter_defaults: EnablePackageInstall: false |