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

2021-01-07 23:52:52 +00:00 · 2021-01-07 23:52:52 +00:00 · 9fd709019f
parent 2bbaa8dc62 79686663e8
commit 9fd709019f
25 changed files with 34 additions and 17 deletions
--- a/ci/environments/scenario001-standalone.yaml
+++ b/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
--- a/deployment/ceph-ansible/ceph-base.yaml
+++ b/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
--- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
+++ b/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.

--- a/deployment/cinder/cinder-common-container-puppet.yaml
+++ b/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.

--- a/deployment/cinder/cinder-volume-container-puppet.yaml
+++ b/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.

--- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+++ b/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.

--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/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:
--- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml
+++ b/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.

--- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
+++ b/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.

--- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
+++ b/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.

--- a/deployment/manila/manila-backend-cephfs.yaml
+++ b/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:
--- a/deployment/manila/manila-share-common.yaml
+++ b/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.

--- a/deployment/manila/manila-share-container-puppet.yaml
+++ b/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:
--- a/deployment/manila/manila-share-pacemaker-puppet.yaml
+++ b/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.

--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/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:
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@ -263,7 +263,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.

--- a/roles/Controller.yaml
+++ b/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
--- a/roles/ControllerAllNovaStandalone.yaml
+++ b/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
--- a/roles/ControllerNovaStandalone.yaml
+++ b/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
--- a/roles/ControllerOpenstack.yaml
+++ b/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
--- a/roles/ControllerSriov.yaml
+++ b/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
--- a/roles/ControllerStorageDashboard.yaml
+++ b/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
--- a/roles/ControllerStorageNfs.yaml
+++ b/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
--- a/roles_data.yaml
+++ b/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
--- a/tools/yaml-validate.py
+++ b/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')