Merge "Set CephX user for Ganesha"

docker/services/ceph-ansible/ceph-nfs.yaml

@@ -30,6 +30,9 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ManilaCephFSCephFSAuthId:
+    type: string
+    default: 'manila'
 
 resources:
   CephBase:
@@ -55,6 +58,8 @@ resources:
           ceph_nfs_service_suffix: pacemaker
           nfs_obj_gw: false
           ceph_nfs_rados_backend: true
+          ceph_nfs_disable_caching: true
+          ceph_nfs_ceph_user: {get_param: ManilaCephFSCephFSAuthId}
 
 outputs:
   role_data:
@@ -89,14 +94,4 @@ outputs:
               dport:
               # We support only NFS 4.1 to start
               - 2049
-        - ceph_nfs_ansible_vars:
-            map_merge:
-            - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
-            - ceph_nfs_bind_addr: {get_param: [EndpointMap, GaneshaInternal, host]}
-            - ceph_nfs_enable_service: false
-            - ceph_nfs_use_pacemaker: true
-            - ceph_nfs_dynamic_exports: true
-            - ceph_nfs_service_suffix: pacemaker
-            - nfs_obj_gw: false
-            - ceph_nfs_rados_backend: true
-            - ceph_nfs_disable_caching: true
+        - {}