aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.yaml
diff options
context:
space:
mode:
authorRyan Hefner <rhefner1@gmail.com>2015-11-10 13:56:54 -0500
committermarios <marios@redhat.com>2016-08-02 17:18:07 +0300
commitb99733d08ae8e90b7ace4c2521ec74f2520dba93 (patch)
treed7276a2ee456f81c0a28e5da4b408b3589dc07c2 /overcloud-resource-registry-puppet.yaml
parent59603a04b3c0bea8a9411ff8182d8240ea745b6d (diff)
Enable Manila integration - as a composable controller service
Allows the installation and configuration of Manila. Supports the generic driver only. This has a dependency on the puppet-tripleo classes for manila where the puppet specific config now lives. The review at https://review.openstack.org/#/c/315658/ has been merge into this one, as of v68, so manila lands as a composable service. This was brought up on the mailing list at [1] [1] http://lists.openstack.org/pipermail/openstack-dev/2016-May/096126.html Co-Authored-By: Marios Andreou <marios@redhat.com> Implements: blueprint composable-services-within-roles Depends-On: I444916d60a67bf730bf4089323dba1c1429e2e71 Depends-On: I9eda4b3364e5c59342761a1ec71b0eb567c69cf1 Depends-On: I571b65a5402c1028418476a573ebeb9450ed00c9 Change-Id: I7acebac4354fca1f8d7ff6c343c1346bf29b81c6
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
-rw-r--r--overcloud-resource-registry-puppet.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index c71ced2..dc74e88 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