From 652b86e80131693929ac7bd3742d7f1510bd71cf Mon Sep 17 00:00:00 2001 From: ramishra Date: Fri, 9 Apr 2021 16:15:29 +0530 Subject: [PATCH] Simplify cinder service templates Removes unnecessary conditions and verbosity. Change-Id: I0ffb201c7c0a453a022cca45255afc7ab2c08046 --- .../cinder/cinder-api-container-puppet.yaml | 21 ++-------- ...nder-backend-dellemc-powerflex-puppet.yaml | 6 +-- ...inder-backend-dellemc-powermax-puppet.yaml | 6 +-- ...der-backend-dellemc-powerstore-puppet.yaml | 6 +-- .../cinder-backend-dellemc-sc-puppet.yaml | 6 +-- .../cinder-backend-dellemc-unity-puppet.yaml | 6 +-- ...der-backend-dellemc-vmax-iscsi-puppet.yaml | 6 +-- .../cinder-backend-dellemc-vnx-puppet.yaml | 6 +-- ...-backend-dellemc-xtremio-iscsi-puppet.yaml | 6 +-- ...cinder-backend-dellemc-xtremio-puppet.yaml | 6 +-- .../cinder/cinder-backend-dellsc-puppet.yaml | 6 +-- .../cinder/cinder-backend-netapp-puppet.yaml | 6 +-- .../cinder/cinder-backend-nvmeof-puppet.yaml | 6 +-- .../cinder/cinder-backend-pure-puppet.yaml | 6 +-- ...der-backend-veritas-hyperscale-puppet.yaml | 6 +-- .../cinder-backup-container-puppet.yaml | 24 +++-------- .../cinder-backup-pacemaker-puppet.yaml | 10 +---- deployment/cinder/cinder-base.yaml | 22 ++++------ .../cinder-common-container-puppet.yaml | 41 ++++++------------- .../cinder-hpelefthand-iscsi-puppet.yaml | 6 +-- .../cinder-scheduler-container-puppet.yaml | 1 - .../cinder-volume-container-puppet.yaml | 30 +++++--------- .../cinder-volume-pacemaker-puppet.yaml | 10 +---- 23 files changed, 75 insertions(+), 174 deletions(-) diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 922f7d8643..102cd08419 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -89,13 +89,7 @@ parameters: description: The name of the stack/plan. type: string -conditions: - - internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} - cinder_workers_zero: {equals : [{get_param: CinderWorkers}, 0]} - resources: - ContainersCommon: type: ../containers-common.yaml @@ -206,11 +200,7 @@ outputs: "Timeout TIMEOUT" params: TIMEOUT: {get_param: CinderApiWsgiTimeout} - - - if: - - cinder_workers_zero - - {} - - cinder::wsgi::apache::workers: {get_param: CinderWorkers} + cinder::wsgi::apache::workers: {get_param: CinderWorkers} service_config_settings: rsyslog: tripleo_logging_sources_cinder_api: @@ -322,15 +312,12 @@ outputs: volumes: list_concat: - {get_attr: [CinderCommon, cinder_common_volumes]} - - - - /var/lib/kolla/config_files/cinder_api.json:/var/lib/kolla/config_files/config.json:ro + - - /var/lib/kolla/config_files/cinder_api.json:/var/lib/kolla/config_files/config.json:ro - /var/log/containers/httpd/cinder-api:/var/log/httpd:z - if: - - internal_tls_enabled - - - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro + - {get_param: EnableInternalTLS} + - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - [] environment: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS cinder_api_cron: diff --git a/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml index ed18055684..63c389447f 100644 --- a/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml @@ -139,8 +139,6 @@ outputs: cinder::backend::dellemc_powerflex::san_thin_provision: {get_param: CinderPowerFlexSanThinProvision} cinder::backend::dellemc_powerflex::driver_ssl_cert_verify: {get_param: CinderPowerFlexDriverSSLCertVerify} cinder::backend::dellemc_powerflex::driver_ssl_cert_path: {get_param: CinderPowerFlexDriverSSLCertPath} - - - if: - - {equals : [{get_param: CinderPowerFlexAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderPowerFlexAvailabilityZone}, '']} - cinder::backend::dellemc_powerflex::backend_availability_zone: {get_param: CinderPowerFlexAvailabilityZone} diff --git a/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml index d33e5df826..eb4ffc1b57 100644 --- a/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml @@ -100,8 +100,6 @@ outputs: cinder::backend::dellemc_powermax::powermax_srp: {get_param: CinderPowermaxSrp} cinder::backend::dellemc_powermax::powermax_port_groups: {get_param: CinderPowermaxPortGroups} cinder::backend::dellemc_powermax::powermax_storage_protocol: {get_param: CinderPowermaxStorageProtocol} - - - if: - - {equals : [{get_param: CinderPowermaxAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderPowermaxAvailabilityZone}, '']} - cinder::backend::dellemc_powermax::backend_availability_zone: {get_param: CinderPowermaxAvailabilityZone} diff --git a/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml index 68e3004228..ed025128c3 100644 --- a/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml @@ -95,8 +95,6 @@ outputs: cinder::backend::dellemc_powerstore::powerstore_appliances: {get_param: CinderPowerStoreAppliances} cinder::backend::dellemc_powerstore::powerstore_ports: {get_param: CinderPowerStorePorts} cinder::backend::dellemc_powerstore::storage_protocol: {get_param: CinderPowerStoreStorageProtocol} - - - if: - - {equals : [{get_param: CinderPowerStoreAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderPowerStoreAvailabilityZone}, '']} - cinder::backend::dellemc_powerstore::backend_availability_zone: {get_param: CinderPowerStoreAvailabilityZone} diff --git a/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml index abad21ab6a..c2cd9cf216 100644 --- a/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml @@ -139,8 +139,6 @@ outputs: cinder::backend::dellemc_sc::excluded_domain_ips: {get_param: CinderScExcludedDomainIps} cinder::backend::dellemc_sc::use_multipath_for_image_xfer: {get_param: CinderScMultipathXfer} cinder::backend::dellemc_sc::sc_storage_protocol: {get_param: CinderScStorageProtocol} - - - if: - - {equals : [{get_param: CinderScAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderScAvailabilityZone}, '']} - cinder::backend::dellemc_sc::backend_availability_zone: {get_param: CinderScAvailabilityZone} diff --git a/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml index 2229550043..2edc559910 100644 --- a/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml @@ -85,8 +85,6 @@ outputs: cinder::backend::dellemc_unity::storage_protocol: {get_param: CinderDellEMCUnityStorageProtocol} cinder::backend::dellemc_unity::unity_io_ports: {get_param: CinderDellEMCUnityIoPorts} cinder::backend::dellemc_unity::unity_storage_pool_names: {get_param: CinderDellEMCUnityStoragePoolNames} - - - if: - - {equals : [{get_param: CinderDellEMCUnityAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderDellEMCUnityAvailabilityZone}, '']} - cinder::backend::dellemc_unity::backend_availability_zone: {get_param: CinderDellEMCUnityAvailabilityZone} diff --git a/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml index 305f73187b..5ec131ae95 100644 --- a/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml @@ -77,8 +77,6 @@ outputs: - tripleo::profile::base::cinder::volume::cinder_enable_dellemc_vmax_iscsi_backend: {get_param: CinderEnableDellEMCVMAXISCSIBackend} cinder::backend::dellemc_vmax_iscsi::volume_backend_name: {get_param: CinderDellEMCVMAXISCSIBackendName} cinder::backend::dellemc_vmax_iscsi::cinder_emc_config_file: {get_param: CinderDellEMCVMAXISCSIConfigFile} - - - if: - - {equals : [{get_param: CinderDellEMCVMAXISCSIAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderDellEMCVMAXISCSIAvailabilityZone}, '']} - cinder::backend::dellemc_vmax_iscsi::backend_availability_zone: {get_param: CinderDellEMCVMAXISCSIAvailabilityZone} diff --git a/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml index ea1d417dd6..b48eed1e8f 100644 --- a/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml @@ -106,8 +106,6 @@ outputs: cinder::backend::emc_vnx::storage_vnx_auth_type: {get_param: CinderDellEMCVNXAuthType} cinder::backend::emc_vnx::storage_vnx_security_file_dir: {get_param: CinderDellEMCVNXStorageSecurityFileDir} cinder::backend::emc_vnx::naviseccli_path: {get_param: CinderDellEMCVNXNaviSecCliPath} - - - if: - - {equals : [{get_param: CinderDellEMCVNXAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderDellEMCVNXAvailabilityZone}, '']} - cinder::backend::emc_vnx::backend_availability_zone: {get_param: CinderDellEMCVNXAvailabilityZone} diff --git a/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml index ff3c962ab7..08af025a66 100644 --- a/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml @@ -118,8 +118,6 @@ outputs: cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_interval: {get_param: CinderDellEMCXTREMIOIscsiArrayBusyRetryInterval} cinder::backend::dellemc_xtremio_iscsi::xtremio_volumes_per_glance_cache: {get_param: CinderDellEMCXTREMIOIscsiVolumesPerGlanceCache} cinder::backend::dellemc_xtremio_iscsi::xtremio_ports: {get_param: CinderDellEMCXTREMIOIscsiPorts} - - - if: - - {equals : [{get_param: CinderDellEMCXTREMIOIscsiAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderDellEMCXTREMIOIscsiAvailabilityZone}, '']} - cinder::backend::dellemc_xtremio_iscsi::backend_availability_zone: {get_param: CinderDellEMCXTREMIOIscsiAvailabilityZone} diff --git a/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml index 2aa53c6436..cf67906628 100644 --- a/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml @@ -115,8 +115,6 @@ outputs: cinder::backend::dellemc_xtremio::xtremio_volumes_per_glance_cache: {get_param: CinderXtremioVolumesPerGlanceCache} cinder::backend::dellemc_xtremio::xtremio_storage_protocol: {get_param: CinderXtremioStorageProtocol} cinder::backend::dellemc_xtremio::xtremio_ports: {get_param: CinderXtremioPorts} - - - if: - - {equals : [{get_param: CinderXtremioAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderXtremioAvailabilityZone}, '']} - cinder::backend::dellemc_xtremio::backend_availability_zone: {get_param: CinderXtremioAvailabilityZone} diff --git a/deployment/cinder/cinder-backend-dellsc-puppet.yaml b/deployment/cinder/cinder-backend-dellsc-puppet.yaml index 833fc3258d..a2a02acaaa 100644 --- a/deployment/cinder/cinder-backend-dellsc-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellsc-puppet.yaml @@ -149,8 +149,6 @@ outputs: cinder::backend::dellsc_iscsi::secondary_sc_api_port: {get_param: CinderDellScSecondaryScApiPort} cinder::backend::dellsc_iscsi::excluded_domain_ips: {get_param: CinderDellScExcludedDomainIps} cinder::backend::dellsc_iscsi::use_multipath_for_image_xfer: {get_param: CinderDellScMultipathXfer} - - - if: - - {equals : [{get_param: CinderDellScAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderDellScAvailabilityZone}, '']} - cinder::backend::dellsc_iscsi::backend_availability_zone: {get_param: CinderDellScAvailabilityZone} diff --git a/deployment/cinder/cinder-backend-netapp-puppet.yaml b/deployment/cinder/cinder-backend-netapp-puppet.yaml index 64d8609a6d..8cbbb9f2e0 100644 --- a/deployment/cinder/cinder-backend-netapp-puppet.yaml +++ b/deployment/cinder/cinder-backend-netapp-puppet.yaml @@ -165,8 +165,6 @@ outputs: cinder::backend::netapp::nas_secure_file_operations: {get_param: CinderNetappNasSecureFileOperations} cinder::backend::netapp::nas_secure_file_permissions: {get_param: CinderNetappNasSecureFilePermissions} cinder::backend::netapp::netapp_pool_name_search_pattern: {get_param: CinderNetappPoolNameSearchPattern} - - - if: - - {equals : [{get_param: CinderNetappAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderNetappAvailabilityZone}, '']} - cinder::backend::netapp::backend_availability_zone: {get_param: CinderNetappAvailabilityZone} diff --git a/deployment/cinder/cinder-backend-nvmeof-puppet.yaml b/deployment/cinder/cinder-backend-nvmeof-puppet.yaml index 527f01d2df..806b35e0a7 100644 --- a/deployment/cinder/cinder-backend-nvmeof-puppet.yaml +++ b/deployment/cinder/cinder-backend-nvmeof-puppet.yaml @@ -76,8 +76,6 @@ outputs: "%{hiera('$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]} - - - if: - - {equals : [{get_param: CinderNVMeOFAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderNVMeOFAvailabilityZone}, '']} - tripleo::profile::base::cinder::volume::nvmeof::backend_availability_zone: {get_param: CinderNVMeOFAvailabilityZone} diff --git a/deployment/cinder/cinder-backend-pure-puppet.yaml b/deployment/cinder/cinder-backend-pure-puppet.yaml index e83cca1f76..d5e66562ce 100644 --- a/deployment/cinder/cinder-backend-pure-puppet.yaml +++ b/deployment/cinder/cinder-backend-pure-puppet.yaml @@ -93,8 +93,6 @@ outputs: cinder::backend::pure::use_chap_auth: {get_param: CinderPureUseChap} cinder::backend::pure::use_multipath_for_image_xfer: {get_param: CinderPureMultipathXfer} cinder::backend::pure::image_volume_cache_enabled : {get_param: CinderPureImageCache} - - - if: - - {equals : [{get_param: CinderPureAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderPureAvailabilityZone}, '']} - cinder::backend::pure::backend_availability_zone: {get_param: CinderPureAvailabilityZone} diff --git a/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml b/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml index 0f85047cf6..5aab2bcfdb 100644 --- a/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml +++ b/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml @@ -56,8 +56,6 @@ outputs: config_settings: map_merge: - tripleo::profile::base::cinder::volume::cinder_enable_vrts_hs_backend: true - - - if: - - {equals : [{get_param: CinderVeritasHyperScaleAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderVeritasHyperScaleAvailabilityZone}, '']} - cinder::backend::veritas_hyperscale::backend_availability_zone: {get_param: CinderVeritasHyperScaleAvailabilityZone} diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml index 548ca78acb..021c3c8898 100644 --- a/deployment/cinder/cinder-backup-container-puppet.yaml +++ b/deployment/cinder/cinder-backup-container-puppet.yaml @@ -106,7 +106,6 @@ parameters: type: string resources: - ContainersCommon: type: ../containers-common.yaml @@ -134,8 +133,7 @@ outputs: config_settings: map_merge: - get_attr: [CinderBase, role_data, config_settings] - - - if: + - if: - {equals: [{get_param: CinderBackupBackend}, 'ceph']} - cinder::backup::ceph::backup_ceph_user: {get_param: CephClientUserName} cinder::backup::ceph::backup_ceph_pool: {get_param: CinderBackupRbdPoolName} @@ -145,35 +143,26 @@ outputs: - - '/etc/ceph/' - {get_param: CephClusterName} - '.conf' - - {} - - - if: + - if: - {equals: [{get_param: CinderBackupBackend}, 'swift']} - cinder::backup::swift::backup_swift_container: volumebackups cinder::backup::swift::swift_catalog_info: 'object-store:swift:internalURL' - - {} - - - if: + - if: - {equals: [{get_param: CinderBackupBackend}, 'nfs']} - cinder::backup::nfs::backup_share: {get_param: CinderBackupNfsShare} cinder::backup::nfs::backup_mount_options: {get_param: CinderBackupNfsMountOptions} - - {} - - - if: + - if: - {equals: [{get_param: CinderBackupBackend}, 'gcs']} - tripleo::profile::base::cinder::backup::gcs::credentials: {get_param: CinderBackupGcsCredentials} cinder::backup::google::backup_gcs_project_id: {get_param: CinderBackupGcsProjectId} cinder::backup::google::backup_gcs_bucket: {get_param: CinderBackupGcsBucket} cinder::backup::google::backup_gcs_bucket_location: {get_param: CinderBackupGcsBucketLocation} - - {} - - - if: + - if: - {equals: [{get_param: CinderBackupBackend}, 's3']} - cinder::backup::s3::backup_s3_endpoint_url: {get_param: CinderBackupS3EndpointUrl} cinder::backup::s3::backup_s3_store_access_key: {get_param: CinderBackupS3AccessKey} cinder::backup::s3::backup_s3_store_secret_key: {get_param: CinderBackupS3SecretKey} cinder::backup::s3::backup_s3_store_bucket: {get_param: CinderBackupS3Bucket} - - {} service_config_settings: rsyslog: tripleo_logging_sources_cinder_backup: @@ -186,8 +175,7 @@ outputs: list_join: - "\n" - - {get_attr: [CinderBase, role_data, step_config]} - - - str_replace: + - str_replace: template: "include tripleo::profile::base::cinder::backup::DRIVER" params: DRIVER: {get_param: CinderBackupBackend} diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 5d231dd7cb..ff90662b0b 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -86,13 +86,7 @@ parameters: description: | The path where the Ceph Cluster config files are stored on the host. -conditions: - docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']} - common_tag_enabled: {equals: [{get_param: ClusterCommonTag}, true]} - common_tag_full: {equals: [{get_param: ClusterFullTag}, true]} - resources: - ContainersCommon: type: ../containers-common.yaml @@ -125,12 +119,12 @@ outputs: - get_attr: [CinderBackupBase, role_data, config_settings] - tripleo::profile::pacemaker::cinder::backup_bundle::cinder_backup_docker_image: &cinder_backup_image_pcmklatest if: - - common_tag_full + - {get_param: ClusterFullTag} - "cluster.common.tag/cinder-backup:pcmklatest" - yaql: data: if: - - common_tag_enabled + - {get_param: ClusterCommonTag} - yaql: data: {get_param: ContainerCinderBackupImage} expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1]) diff --git a/deployment/cinder/cinder-base.yaml b/deployment/cinder/cinder-base.yaml index d6a7778b55..7ab8939bf4 100644 --- a/deployment/cinder/cinder-base.yaml +++ b/deployment/cinder/cinder-base.yaml @@ -106,9 +106,6 @@ parameters: description: The password for the nova service and db account hidden: true -conditions: - enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]} - outputs: role_data: description: Role data for the Cinder base service. @@ -124,17 +121,14 @@ outputs: path: /cinder query: if: - - enable_sqlalchemy_collectd - - - read_default_file: /etc/my.cnf.d/tripleo.cnf - read_default_group: tripleo - plugin: collectd - collectd_program_name: cinder - collectd_host: localhost - - - read_default_file: /etc/my.cnf.d/tripleo.cnf - read_default_group: tripleo - + - {get_param: EnableSQLAlchemyCollectd} + - read_default_file: /etc/my.cnf.d/tripleo.cnf + read_default_group: tripleo + plugin: collectd + collectd_program_name: cinder + collectd_host: localhost + - read_default_file: /etc/my.cnf.d/tripleo.cnf + read_default_group: tripleo cinder::logging::debug: if: - {get_param: CinderDebug} diff --git a/deployment/cinder/cinder-common-container-puppet.yaml b/deployment/cinder/cinder-common-container-puppet.yaml index 8831e369cd..18c164bf0f 100644 --- a/deployment/cinder/cinder-common-container-puppet.yaml +++ b/deployment/cinder/cinder-common-container-puppet.yaml @@ -89,17 +89,13 @@ parameters: letters and numbers. conditions: - - cinder_iscsi_backend_enabled: {equals: [{get_param: CinderEnableIscsiBackend}, true]} - multipathd_enabled: {equals: [{get_param: MultipathdEnable}, true]} cvol_active_active_tls_enabled: and: - not: {equals: [{get_param: CinderVolumeCluster}, '']} - - equals: [{get_param: EnableInternalTLS}, true] - - equals: [{get_param: EnableEtcdInternalTLS}, true] + - {get_param: EnableInternalTLS} + - {get_param: EnableEtcdInternalTLS} resources: - ContainersCommon: type: ../containers-common.yaml @@ -131,16 +127,12 @@ outputs: value: &cinder_common_volumes list_concat: - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro + - - /var/lib/config-data/puppet-generated/cinder:/var/lib/kolla/config_files/src:ro - /var/log/containers/cinder:/var/log/cinder:z - - - if: + - if: - cvol_active_active_tls_enabled - - - - /etc/pki/tls/certs/etcd.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/etcd.crt:ro + - - /etc/pki/tls/certs/etcd.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/etcd.crt:ro - /etc/pki/tls/private/etcd.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/etcd.key:ro - - [] cinder_common_kolla_config_files: description: Common kolla config_files for cinder-volume and cinder-backup services @@ -190,7 +182,7 @@ outputs: - - name: cinder_enable_iscsi_backend fact set_fact: - cinder_enable_iscsi_backend: {if: [cinder_iscsi_backend_enabled, true, false]} + cinder_enable_iscsi_backend: {get_param: CinderEnableIscsiBackend} - when: cinder_enable_iscsi_backend|bool block: - name: ensure LVM rpm dependencies are installed @@ -266,8 +258,7 @@ outputs: list_concat: - *cinder_common_volumes - {get_param: CinderVolumeOptVolumes} - - - - /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro + - - /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro - list_join: - ':' @@ -280,17 +271,13 @@ outputs: - /sys:/sys - /var/lib/cinder:/var/lib/cinder:z - /var/lib/iscsi:/var/lib/iscsi:z - - - if: - - cinder_iscsi_backend_enabled + - if: + - {get_param: CinderEnableIscsiBackend} - - /etc/target:/etc/target:z - - [] - - - if: - - multipathd_enabled + - if: + - {get_param: MultipathdEnable} - - /etc/multipath:/etc/multipath:z - /etc/multipath.conf:/etc/multipath.conf:ro - - [] cinder_volume_environment: description: Docker environment for the cinder-volume container (HA or non-HA) @@ -323,11 +310,9 @@ outputs: - /lib/modules:/lib/modules:ro - /var/lib/cinder:/var/lib/cinder:z - /var/lib/iscsi:/var/lib/iscsi:z - - - if: - - multipathd_enabled + - if: + - {get_param: MultipathdEnable} - - /etc/multipath:/etc/multipath:z - - [] cinder_backup_environment: description: Docker environment for the cinder-backup container (HA or non-HA) diff --git a/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml b/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml index d235b6cb6c..8d21847e87 100644 --- a/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml +++ b/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml @@ -68,8 +68,6 @@ outputs: cinder::backend::hpelefthand_iscsi::hpelefthand_iscsi_chap_enabled: {get_param: CinderHPELeftHandISCSIChapEnabled} cinder::backend::hpelefthand_iscsi::hpelefthand_clustername: {get_param: CinderHPELeftHandClusterName} cinder::backend::hpelefthand_iscsi::hpelefthand_debug: {get_param: CinderHPELeftHandDebug} - - - if: - - {equals : [{get_param: CinderHPELeftHandISCSIAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderHPELeftHandISCSIAvailabilityZone}, '']} - cinder::backend::hpelefthand_iscsi::backend_availability_zone: {get_param: CinderHPELeftHandISCSIAvailabilityZone} diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml index b5d6f29320..182eb8ad7c 100644 --- a/deployment/cinder/cinder-scheduler-container-puppet.yaml +++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml @@ -43,7 +43,6 @@ parameters: type: string resources: - ContainersCommon: type: ../containers-common.yaml diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml index e573dec142..f6f5d64a0a 100644 --- a/deployment/cinder/cinder-volume-container-puppet.yaml +++ b/deployment/cinder/cinder-volume-container-puppet.yaml @@ -180,15 +180,13 @@ parameters: The path where the Ceph Cluster config files are stored on the host. conditions: - cvol_active_active_tls_enabled: and: - not: {equals: [{get_param: CinderVolumeCluster}, '']} - - equals: [{get_param: EnableInternalTLS}, true] - - equals: [{get_param: EnableEtcdInternalTLS}, true] + - {get_param: EnableInternalTLS} + - {get_param: EnableEtcdInternalTLS} resources: - ContainersCommon: type: ../containers-common.yaml @@ -254,31 +252,23 @@ outputs: "%{hiera('$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]} - - - if: - - {equals : [{get_param: CinderISCSIAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderISCSIAvailabilityZone}, '']} - tripleo::profile::base::cinder::volume::iscsi::backend_availability_zone: {get_param: CinderISCSIAvailabilityZone} - - - if: - - {equals : [{get_param: CinderNfsAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderNfsAvailabilityZone}, '']} - tripleo::profile::base::cinder::volume::nfs::backend_availability_zone: {get_param: CinderNfsAvailabilityZone} - - - if: - - {equals : [{get_param: CinderRbdAvailabilityZone}, '']} - - {} + - if: + - not: {equals : [{get_param: CinderRbdAvailabilityZone}, '']} - tripleo::profile::base::cinder::volume::rbd::backend_availability_zone: {get_param: CinderRbdAvailabilityZone} - - - if: - - {equals : [{get_param: CinderEtcdLocalConnect}, true]} + - if: + - not: {equals : [{get_param: CinderEtcdLocalConnect}, true]} - tripleo::profile::base::cinder::volume::etcd_host: str_replace: template: "%{hiera('$NETWORK')}" params: $NETWORK: {get_param: [ServiceNetMap, EtcdNetwork]} - - {} service_config_settings: rsyslog: tripleo_logging_sources_cinder_volume: diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index 67a9d6ca7f..5cb1c78da0 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -74,13 +74,7 @@ parameters: description: | The path where the Ceph Cluster config files are stored on the host. -conditions: - docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']} - common_tag_enabled: {equals: [{get_param: ClusterCommonTag}, true]} - common_tag_full: {equals: [{get_param: ClusterFullTag}, true]} - resources: - ContainersCommon: type: ../containers-common.yaml @@ -112,12 +106,12 @@ outputs: - tripleo::profile::base::lvm::enable_udev: false tripleo::profile::pacemaker::cinder::volume_bundle::cinder_volume_docker_image: &cinder_volume_image_pcmklatest if: - - common_tag_full + - {get_param: ClusterFullTag} - "cluster.common.tag/cinder-volume:pcmklatest" - yaql: data: if: - - common_tag_enabled + - {get_param: ClusterCommonTag} - yaql: data: {get_param: ContainerCinderVolumeImage} expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])