diff options
| author |   Ben Nemec <bnemec@redhat.com> | 2017-07-13 10:44:16 -0500 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-07-26 13:36:52 +0000 |
| commit | 56bf9cfb7857af1607b2539a705916b8323bbe1a (patch) | |
| tree | e34009045d8e98ea11f523d231081bbed9734fe9 /environments | |
| parent | 0d469e82e89be74e637ea6c7d064733d2c001670 (diff) | |
Fix enable-ceph sample environment
The necessary resource registry entries were missing from this env
and the old environment was not deprecated.
Change-Id: I6a9b148514fc5da1f96b9fd7fe09f564c2f82419
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/puppet-ceph.yaml | 4 | ||||
| -rw-r--r-- | environments/storage/enable-ceph.yaml | 4 |
2 files changed, 8 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 |