diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-26 22:57:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-26 22:57:18 +0000 |
| commit | 895b96e8631a1a323335616ec5e13731f560187c (patch) | |
| tree | b8f6f127f9911d04596155bdcb80592d9d0be030 | |
| parent | f1395f77066eef5d9114a2b13756746f9b1adb2c (diff) | |
| parent | 56bf9cfb7857af1607b2539a705916b8323bbe1a (diff) | |
Merge "Fix enable-ceph sample environment"
| -rw-r--r-- | environments/puppet-ceph.yaml | 4 | ||||
| -rw-r--r-- | environments/storage/enable-ceph.yaml | 4 | ||||
| -rw-r--r-- | sample-env-generator/storage.yaml | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/environments/puppet-ceph.yaml b/environments/puppet-ceph.yaml index 57af540a..2b4dfa05 100644 --- a/environments/puppet-ceph.yaml +++ b/environments/puppet-ceph.yaml @@ -1,3 +1,7 @@ +# **************************************************************************** +# DEPRECATED: Use tripleo-heat-templates/environments/storage/enable-ceph.yaml +# instead. +# **************************************************************************** resource_registry: OS::TripleO::Services::CephMon: ../puppet/services/ceph-mon.yaml OS::TripleO::Services::CephOSD: ../puppet/services/ceph-osd.yaml diff --git a/environments/storage/enable-ceph.yaml b/environments/storage/enable-ceph.yaml index c629f74b..596ec16e 100644 --- a/environments/storage/enable-ceph.yaml +++ b/environments/storage/enable-ceph.yaml @@ -33,3 +33,7 @@ parameter_defaults: # Type: boolean NovaEnableRbdBackend: True +resource_registry: + OS::TripleO::Services::CephClient: ../../puppet/services/ceph-client.yaml + OS::TripleO::Services::CephMon: ../../puppet/services/ceph-mon.yaml + OS::TripleO::Services::CephOSD: ../../puppet/services/ceph-osd.yaml diff --git a/sample-env-generator/storage.yaml b/sample-env-generator/storage.yaml index aa0385cc..dc4fbb10 100644 --- a/sample-env-generator/storage.yaml +++ b/sample-env-generator/storage.yaml @@ -26,6 +26,10 @@ environments: NovaEnableRbdBackend: True GlanceBackend: rbd GnocchiBackend: rbd + resource_registry: + OS::TripleO::Services::CephMon: ../../puppet/services/ceph-mon.yaml + OS::TripleO::Services::CephOSD: ../../puppet/services/ceph-osd.yaml + OS::TripleO::Services::CephClient: ../../puppet/services/ceph-client.yaml description: | Include this environment to enable Ceph as the backend for Cinder, Nova, Gnocchi, and Glance. |