diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-09 13:05:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-09 13:05:58 +0000 |
| commit | d87e2a380095494085e5ed5e0348faba24331d9d (patch) | |
| tree | 957eb76f6a72dfebbcd73395c8d7392a4d567b98 | |
| parent | 80c692af218a3266780ab795dadf619f3f4395a4 (diff) | |
| parent | 2f52658a6b86984a9fe84a78a68440c6bbd8399b (diff) | |
Merge "Disable mistral services by default."
| -rw-r--r-- | environments/services/mistral.yaml | 4 | ||||
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/environments/services/mistral.yaml b/environments/services/mistral.yaml new file mode 100644 index 00000000..4e99fa01 --- /dev/null +++ b/environments/services/mistral.yaml @@ -0,0 +1,4 @@ +resource_registry: + OS::TripleO::Services::MistralEngine: ../../puppet/services/mistral-engine.yaml + OS::TripleO::Services::MistralApi: ../../puppet/services/mistral-api.yaml + OS::TripleO::Services::MistralExecutor: ../../puppet/services/mistral-executor.yaml diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index f6d76d97..59c0d7da 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -203,6 +203,9 @@ resource_registry: OS::TripleO::Services::AodhEvaluator: puppet/services/aodh-evaluator.yaml OS::TripleO::Services::AodhNotifier: puppet/services/aodh-notifier.yaml OS::TripleO::Services::AodhListener: puppet/services/aodh-listener.yaml + OS::TripleO::Services::MistralEngine: OS::Heat::None + OS::TripleO::Services::MistralApi: OS::Heat::None + OS::TripleO::Services::MistralExecutor: OS::Heat::None parameter_defaults: EnablePackageInstall: false |