Configure Ceph clients via tripleo-ceph-client (not ceph-ansible)

Default CephAnsibleSkipClient to True and CephConfigPath to
/var/lib/tripleo-config/ceph (instead of /etc/ceph) and set
these paramters explicitly in scenario00{1,4}. This will
result in all Ceph client configuration being done not by
ceph-ansible but by the new tripleo-ceph-client role from
tripleo-ansible.

Add the CephClient service to all Controller* roles which will
use Ceph. The service could have always been there as there are
Ceph clients on the these controllers, but it was not because
ceph-ansible configured clients as a side effect. With new
CephConfigPath default they no longer overlap so the service
is required.

Add support for CephExternalMultiConfig via tripleo-ceph-client
by looping on the contents of the CephExternalMultiConfig list
and passing each map as the dcn variable while including the
tripleo-ceph-client role each time.

Related-Bug: #1708302
Depends-On: I938ab604859fda88f3491399444841a3a373d162
Change-Id: I784e6a476752ed701192b3a0155c42edd4836d97

ci/environments/scenario001-standalone.yaml

@@ -188,6 +188,8 @@ parameter_defaults:
     foo: bar
   NfsUrl: 127.0.0.1
   CephMsgrSecureMode: true
+  CephAnsibleSkipClient: false
+  CephConfigPath: "/etc/ceph"
   LVMFilterEnabled: true
   LVMFilterAllowlist:
     - /dev/loop2

deployment/ceph-ansible/ceph-base.yaml

@@ -335,7 +335,7 @@ parameters:
     default: false
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
   CephAnsibleSkipClient:
@@ -343,7 +343,7 @@ parameters:
       This boolean (when true) prevents the ceph-ansible client role execution
       by adding the ceph-ansible tag 'ceph_client' to the --skip-tags list.
     type: boolean
-    default: false
+    default: true
 
 parameter_groups:
 - label: deprecated
@@ -714,6 +714,14 @@ outputs:
               vars:
                 tripleo_ceph_client_config_home: {get_param: CephConfigPath}
               when: {get_param: CephAnsibleSkipClient}
+            - include_role:
+                name: tripleo_ceph_client
+              name: tripleo client role
+              vars:
+                tripleo_ceph_client_config_home: {get_param: CephConfigPath}
+                dcn: "{{ item }}"
+              loop: "{{ ceph_external_multi_config }}"
+              when: {get_param: CephAnsibleSkipClient}
             - name: ensure ceph health is OK before proceeding
               import_role:
                 role: ceph

deployment/cinder/cinder-backup-pacemaker-puppet.yaml

@@ -85,7 +85,7 @@ parameters:
       file: /var/log/containers/cinder/cinder-backup.log
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
 

deployment/cinder/cinder-common-container-puppet.yaml

@@ -75,7 +75,7 @@ parameters:
     default: false
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
 

deployment/cinder/cinder-volume-container-puppet.yaml

@@ -178,7 +178,7 @@ parameters:
     default: false
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
 

deployment/cinder/cinder-volume-pacemaker-puppet.yaml

@@ -73,7 +73,7 @@ parameters:
       file: /var/log/containers/cinder/cinder-volume.log
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
 

deployment/glance/glance-api-container-puppet.yaml

@@ -278,7 +278,7 @@ parameters:
         letters and numbers.
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
   MultipathdEnable:

deployment/gnocchi/gnocchi-api-container-puppet.yaml

@@ -124,7 +124,7 @@ parameters:
                  "origin" header.
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
 

deployment/gnocchi/gnocchi-metricd-container-puppet.yaml

@@ -71,7 +71,7 @@ parameters:
     type: number
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
 

deployment/gnocchi/gnocchi-statsd-container-puppet.yaml

@@ -63,7 +63,7 @@ parameters:
     type: string
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
 

deployment/manila/manila-backend-cephfs.yaml

@@ -41,7 +41,7 @@ parameters:
         letters and numbers.
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
   # CephFS backend params:

deployment/manila/manila-share-common.yaml

@@ -40,7 +40,7 @@ parameters:
     - allowed_values: ['CEPHFS', 'NFS']
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
 

deployment/manila/manila-share-container-puppet.yaml

@@ -50,7 +50,7 @@ parameters:
         letters and numbers.
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
   MonitoringSubscriptionManilaShare:

deployment/manila/manila-share-pacemaker-puppet.yaml

@@ -68,7 +68,7 @@ parameters:
       perform configuration on a Heat stack-update.
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
 

deployment/nova/nova-compute-container-puppet.yaml

@@ -59,7 +59,7 @@ parameters:
         letters and numbers.
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
   NovaComputeOptVolumes:

deployment/nova/nova-libvirt-container-puppet.yaml

@@ -238,7 +238,7 @@ parameters:
       - role_specific
   CephConfigPath:
     type: string
-    default: "/etc/ceph"
+    default: "/var/lib/tripleo-config/ceph"
     description: |
       The path where the Ceph Cluster config files are stored on the host.
 

roles/Controller.yaml

@@ -51,6 +51,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentNotification
+    - OS::TripleO::Services::CephClient
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::CephGrafana
     - OS::TripleO::Services::CephMds

roles/ControllerAllNovaStandalone.yaml

@@ -35,6 +35,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentNotification
+    - OS::TripleO::Services::CephClient
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::CephMds
     - OS::TripleO::Services::CephMgr

roles/ControllerNovaStandalone.yaml

@@ -34,6 +34,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentNotification
+    - OS::TripleO::Services::CephClient
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::CephMds
     - OS::TripleO::Services::CephMgr

roles/ControllerOpenstack.yaml

@@ -39,6 +39,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentNotification
+    - OS::TripleO::Services::CephClient
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::CephGrafana
     - OS::TripleO::Services::CephMds

roles/ControllerSriov.yaml

@@ -48,6 +48,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentNotification
+    - OS::TripleO::Services::CephClient
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::CephGrafana
     - OS::TripleO::Services::CephMds

roles/ControllerStorageDashboard.yaml

@@ -49,6 +49,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentNotification
+    - OS::TripleO::Services::CephClient
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::CephGrafana
     - OS::TripleO::Services::CephMds

roles/ControllerStorageNfs.yaml

@@ -49,6 +49,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentNotification
+    - OS::TripleO::Services::CephClient
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::CephGrafana
     - OS::TripleO::Services::CephMds

roles_data.yaml

@@ -54,6 +54,7 @@
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CeilometerAgentCentral
     - OS::TripleO::Services::CeilometerAgentNotification
+    - OS::TripleO::Services::CephClient
     - OS::TripleO::Services::CephExternal
     - OS::TripleO::Services::CephGrafana
     - OS::TripleO::Services::CephMds

tools/yaml-validate.py

@@ -497,7 +497,6 @@ def validate_controller_no_ceph_role(filename, tpl):
     for role in tpl:
         if role['name'] == 'ControllerNoCeph':
             services = role['ServicesDefault']
-            services.remove('OS::TripleO::Services::CephClient')
             services.append('OS::TripleO::Services::CephMds')
             services.append('OS::TripleO::Services::CephMgr')
             services.append('OS::TripleO::Services::CephGrafana')