diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-19 20:07:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-19 20:07:00 +0000 |
| commit | e03627a05c5ebf89cd078692c06ea237a75b95e2 (patch) | |
| tree | 4e361bb960e57f31f78977a19f7564350c4e22c8 | |
| parent | fab494ed4a89bd7c9fa6207b791922d522cf5cae (diff) | |
| parent | d8df132a72cbd207097a181fede58df00185cd57 (diff) | |
Merge "Disable Sahara by default"
| -rw-r--r-- | environments/services/sahara.yaml | 3 | ||||
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 4 |
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 |