Update sample-env-generator files to make it use ceph-ansible

Previously the old sample-env-generator files where pointing to
the puppet-ceph implementation of the Ceph services, which isn't
supported in Queens.

Change-Id: Icf5cf2f7878206329260cc897e2820521a41209e
Closes-Bug: 1790862

environments/storage/enable-ceph.yaml

@@ -34,6 +34,7 @@ parameter_defaults:
   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
+  OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
+  OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
+  OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
+  OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml

environments/storage/external-ceph.yaml

@@ -9,10 +9,6 @@
 #   A Heat environment file which can be used to enable the
 #   use of an externally managed Ceph cluster.
 parameter_defaults:
-  # The Ceph admin client key. Can be created with ceph-authtool --gen-print-key.
-  # Type: string
-  CephAdminKey: ''
-
   # The Ceph client key. Can be created with ceph-authtool --gen-print-key.
   # Mandatory. This parameter must be set by the user.
   # Type: string
@@ -67,12 +63,5 @@ parameter_defaults:
   # Type: string
   NovaRbdPoolName: vms
 
-  # The default features enabled when creating a block device image. Only applies to format 2 images. Set to '1' for Jewel clients using older Ceph servers.
-  # Type: string
-  RbdDefaultFeatures: ''
-
 resource_registry:
-  OS::TripleO::Services::CephClient: OS::Heat::None
-  OS::TripleO::Services::CephExternal: ../../puppet/services/ceph-external.yaml
-  OS::TripleO::Services::CephMon: OS::Heat::None
-  OS::TripleO::Services::CephOSD: OS::Heat::None
+  OS::TripleO::Services::CephExternal: ../../docker/services/ceph-ansible/ceph-external.yaml

sample-env-generator/storage.yaml

@@ -27,9 +27,10 @@ environments:
       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
+      OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
+      OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
+      OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
+      OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
     description: |
       Include this environment to enable Ceph as the backend for
       Cinder, Nova, Gnocchi, and Glance.
@@ -115,15 +116,13 @@ environments:
       puppet/services/gnocchi-base.yaml:
         parameters:
           - GnocchiRbdPoolName
-      puppet/services/ceph-external.yaml:
+      docker/services/ceph-ansible/ceph-external.yaml:
+        parameters:
+          - CephExternalMonHost
+      docker/services/ceph-ansible/ceph-base.yaml:
         parameters:
           - CephClusterFSID
           - CephClientKey
-          - CephExternalMonHost
-          - RbdDefaultFeatures
-      puppet/services/ceph-base.yaml:
-        parameters:
-          - CephAdminKey
     sample_values:
       CinderEnableIscsiBackend: False
       CinderEnableRbdBackend: True
@@ -135,15 +134,11 @@ environments:
       GlanceRbdPoolName: images
       GnocchiRbdPoolName: metrics
       CephClientUserName: openstack
-      CephAdminKey: ''
     description: |
        A Heat environment file which can be used to enable the
        use of an externally managed Ceph cluster.
     resource_registry:
-      OS::TripleO::Services::CephExternal: ../../puppet/services/ceph-external.yaml
-      OS::TripleO::Services::CephMon: OS::Heat::None
-      OS::TripleO::Services::CephClient: OS::Heat::None
-      OS::TripleO::Services::CephOSD: OS::Heat::None
+      OS::TripleO::Services::CephExternal: ../../docker/services/ceph-ansible/ceph-external.yaml
   -
     name: storage/cinder-netapp-config
     title: Enable the Cinder NetApp Backend