summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-08-19 08:53:37 -0400
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-08-19 13:37:59 +0000
commitd8df132a72cbd207097a181fede58df00185cd57 (patch)
treea56ee6cdf3f70fd621d279d0432921b9a78f883f
parent9b739012b71e2833e59e94cbe423cda77405c6cb (diff)
Disable Sahara by default
Users who want Sahara enable now can simply include the environments/services/sahara.yaml Heat environment. Change-Id: I3df96b6e78ba3eddb62e79d854862a7e2d614c51
-rw-r--r--environments/services/sahara.yaml3
-rw-r--r--overcloud-resource-registry-puppet.yaml4
2 files changed, 5 insertions, 2 deletions
diff --git a/environments/services/sahara.yaml b/environments/services/sahara.yaml
new file mode 100644
index 00000000..d4be3742
--- /dev/null
+++ b/environments/services/sahara.yaml
@@ -0,0 +1,3 @@
+resource_registry:
+ OS::TripleO::Services::SaharaApi: puppet/services/sahara-api.yaml
+ OS::TripleO::Services::SaharaEngine: puppet/services/sahara-engine.yaml
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 1f6cbf94..bced4d56 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -170,8 +170,8 @@ resource_registry:
OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml
OS::TripleO::Services::Keepalived: puppet/services/keepalived.yaml
OS::TripleO::Services::Memcached: puppet/services/memcached.yaml
- OS::TripleO::Services::SaharaApi: puppet/services/sahara-api.yaml
- OS::TripleO::Services::SaharaEngine: puppet/services/sahara-engine.yaml
+ OS::TripleO::Services::SaharaApi: OS::Heat::None
+ OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Redis: puppet/services/database/redis.yaml
OS::TripleO::Services::NovaConductor: puppet/services/nova-conductor.yaml
OS::TripleO::Services::MongoDb: puppet/services/database/mongodb.yaml