diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index 096de863da..8200098056 100644 --- 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 diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml index 93ced3948d..3157e5a8cd 100644 --- 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 diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 7fe8babd5a..8f0f68575c 100644 --- 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. diff --git a/deployment/cinder/cinder-common-container-puppet.yaml b/deployment/cinder/cinder-common-container-puppet.yaml index 3b33e5404c..ddba11f8ed 100644 --- 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. diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml index 8538c14d98..10de511d7c 100644 --- 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. diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index 3b71c412dc..ef6428d4db 100644 --- 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. diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index d1b205514d..2887593140 100644 --- 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: diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index 15d153d9f6..c7dc620fd0 100644 --- 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. diff --git a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml index 32ee106a16..ac5b6b7b30 100644 --- 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. diff --git a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml index 04ce2df073..d0be5eb1ad 100644 --- 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. diff --git a/deployment/manila/manila-backend-cephfs.yaml b/deployment/manila/manila-backend-cephfs.yaml index 4ddb1d30ef..319748443a 100644 --- 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: diff --git a/deployment/manila/manila-share-common.yaml b/deployment/manila/manila-share-common.yaml index 56a682047e..d5f3ad357d 100644 --- 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. diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml index 4e8ba79f74..18bcca75b0 100644 --- 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: diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index b6218821ea..7adfd440eb 100644 --- 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. diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index 8511d29611..6926148d8c 100644 --- 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: diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml index 4bbb013e60..888e073f8b 100644 --- a/deployment/nova/nova-libvirt-container-puppet.yaml +++ b/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. diff --git a/roles/Controller.yaml b/roles/Controller.yaml index cf31bfde82..02d1e1b6ba 100644 --- 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 diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index e9a09a719c..6ba9e506a9 100644 --- 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 diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 8b8b359163..a3b9fb7f86 100644 --- 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 diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index d55326da04..6e936c2580 100644 --- 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 diff --git a/roles/ControllerSriov.yaml b/roles/ControllerSriov.yaml index 666a518574..1b069cc24f 100644 --- 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 diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index afa8012f20..9f89144e9c 100644 --- 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 diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index a6ba0a53b7..f8115c1e16 100644 --- 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 diff --git a/roles_data.yaml b/roles_data.yaml index 9870f83424..29b12e4fa2 100644 --- 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 diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 4c4f6f30d2..ef7df58296 100755 --- 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')