summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Camacho <ccamacho@redhat.com>2016-08-01 10:34:24 +0200
committerCarlos Camacho <ccamacho@redhat.com>2016-08-06 10:38:54 +0200
commit2f52658a6b86984a9fe84a78a68440c6bbd8399b (patch)
tree9a5e1823e5bda6abe5e2e3f0342ff7a5b37e7af8
parent77cca14bd760f091a1e481bd44e96f8882fb99cc (diff)
Disable mistral services by default.
Optional services should be disabled by default in the overcloud nodes. This submission makes mistral disabled by default and allows to enable it base on an environment file. Depends-On: I942d419be951651e305d01460f394870c30a9878 Change-Id: I0dd245b75142834f71f3bd591b43c3f69d63217b
-rw-r--r--environments/services/mistral.yaml4
-rw-r--r--overcloud-resource-registry-puppet.yaml3
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