diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-29 15:29:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-29 15:29:02 +0000 |
| commit | 52de7ade31dc033424d03a0f5f088873cd70c55c (patch) | |
| tree | fdd2425dc93401166bad1faa61ce9ea27967d516 /overcloud-resource-registry-puppet.yaml | |
| parent | 9878997b6e84ba68d1e966d61957062ae592ccd8 (diff) | |
| parent | 50ee410184369f1b2d26369e855e2ab281d12b31 (diff) | |
Merge "Convert swift storage to composable services"
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 13d8e13d..e4fc8a0b 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -148,7 +148,6 @@ 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::SwiftProxy: puppet/services/swift-proxy.yaml OS::TripleO::Services::SaharaApi: puppet/services/sahara-api.yaml OS::TripleO::Services::SaharaEngine: puppet/services/sahara-engine.yaml OS::TripleO::Services::Redis: puppet/services/database/redis.yaml @@ -160,6 +159,8 @@ resource_registry: OS::TripleO::Services::NovaVncproxy: puppet/services/nova-vncproxy.yaml OS::TripleO::Services::NovaCompute: puppet/services/nova-compute.yaml OS::TripleO::Services::Ntp: puppet/services/time/ntp.yaml + OS::TripleO::Services::SwiftProxy: puppet/services/swift-proxy.yaml + OS::TripleO::Services::SwiftStorage: puppet/services/swift-storage.yaml parameter_defaults: EnablePackageInstall: false |