--- Class[Profile::Cassandra].orig
+++ Class[Profile::Cassandra]
@@
- cassandra_settings => {'dc': 'eqiad', 'cluster_name': 'Analytics Query Service Storage', 'tls_cluster_name': 'aqs', 'tls_use_pki_truststore': True, 'tls_use_pki': True, 'start_rpc': False, 'target_version': 'dev', 'default_instance_params': {'max_heap_size': '16g', 'heap_newsize': '2048m', 'compaction_throughput_mb_per_sec': 256, 'concurrent_compactors': 12, 'concurrent_writes': 64, 'concurrent_reads': 64, 'permissions_validity_in_ms': 600000, 'internode_encryption': 'all', 'client_encryption_enabled': True, 'client_encryption_optional': True}, 'users': ['aqsloader', 'image_suggestions', 'device_analytics', 'geo_analytics', 'media_analytics', 'page_analytics', 'edit_analytics', 'editor_analytics', 'data_gateway', 'commons_impact_analytics', 'revise_tone_task_generator']}
+ cassandra_settings => {'dc': 'eqiad', 'cluster_name': 'Analytics Query Service Storage', 'tls_cluster_name': 'aqs', 'tls_use_pki_truststore': True, 'tls_use_pki': True, 'start_rpc': False, 'target_version': '4.x', 'default_instance_params': {'max_heap_size': '16g', 'heap_newsize': '2048m', 'compaction_throughput_mb_per_sec': 256, 'concurrent_compactors': 12, 'concurrent_writes': 64, 'concurrent_reads': 64, 'permissions_validity_in_ms': 600000, 'internode_encryption': 'all', 'client_encryption_enabled': True, 'client_encryption_optional': True}, 'users': ['aqsloader', 'image_suggestions', 'device_analytics', 'geo_analytics', 'media_analytics', 'page_analytics', 'edit_analytics', 'editor_analytics', 'data_gateway', 'commons_impact_analytics', 'revise_tone_task_generator']}
Class[Cassandra]
- Parameters differences:
--- Class[Cassandra].orig
+++ Class[Cassandra]
@@
- target_version => dev
+ target_version => 4.x
- File[/etc/cassandra-a/prometheus_jmx_exporter.yaml]
- Parameters differences:
--- File[/etc/cassandra-a/prometheus_jmx_exporter.yaml].orig
+++ File[/etc/cassandra-a/prometheus_jmx_exporter.yaml]
@@
- source => puppet:///modules/cassandra/prometheus_jmx_exporter-dev.yaml
+ source => puppet:///modules/cassandra/prometheus_jmx_exporter-4.x.yaml
- File[/etc/cassandra-b/prometheus_jmx_exporter.yaml]
- Parameters differences:
--- File[/etc/cassandra-b/prometheus_jmx_exporter.yaml].orig
+++ File[/etc/cassandra-b/prometheus_jmx_exporter.yaml]
@@
- source => puppet:///modules/cassandra/prometheus_jmx_exporter-dev.yaml
+ source => puppet:///modules/cassandra/prometheus_jmx_exporter-4.x.yaml
- File[/etc/cassandra-b/commitlog_archiving.properties]
- Parameters differences:
--- File[/etc/cassandra-b/commitlog_archiving.properties].orig
+++ File[/etc/cassandra-b/commitlog_archiving.properties]
@@
- source => puppet:///modules/cassandra/commitlog_archiving.properties-dev
+ source => puppet:///modules/cassandra/commitlog_archiving.properties-4.x
- File[/etc/cassandra-b/logback-tools.xml]
- Parameters differences:
--- File[/etc/cassandra-b/logback-tools.xml].orig
+++ File[/etc/cassandra-b/logback-tools.xml]
@@
- source => puppet:///modules/cassandra/logback-tools.xml-dev
+ source => puppet:///modules/cassandra/logback-tools.xml-4.x
- File[/etc/cassandra-b/hotspot_compiler]
- Parameters differences:
--- File[/etc/cassandra-b/hotspot_compiler].orig
+++ File[/etc/cassandra-b/hotspot_compiler]
@@
- source => puppet:///modules/cassandra/hotspot_compiler-dev
+ source => puppet:///modules/cassandra/hotspot_compiler-4.x
- File[/etc/apt/sources.list]
- Parameters differences:
--- File[/etc/apt/sources.list].orig
+++ File[/etc/apt/sources.list]
@@
- before => ['Exec[apt_repository_wikimedia]', 'Exec[apt_repository_wikimedia-private]', 'Exec[apt_repository_debian-debug]', 'Exec[apt_repository_component-puppet7-apt.wikimedia.org-wikimedia-bullseye-wikimedia]', 'Exec[apt_repository_component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia]']
+ before => ['Exec[apt_repository_wikimedia]', 'Exec[apt_repository_wikimedia-private]', 'Exec[apt_repository_debian-debug]', 'Exec[apt_repository_component-puppet7-apt.wikimedia.org-wikimedia-bullseye-wikimedia]', 'Exec[apt_repository_component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia]']
- Cassandra::Instance[b]
- Parameters differences:
--- Cassandra::Instance[b].orig
+++ Cassandra::Instance[b]
@@
- target_version => dev
+ target_version => 4.x
- File[/etc/cassandra-a/commitlog_archiving.properties]
- Parameters differences:
--- File[/etc/cassandra-a/commitlog_archiving.properties].orig
+++ File[/etc/cassandra-a/commitlog_archiving.properties]
@@
- source => puppet:///modules/cassandra/commitlog_archiving.properties-dev
+ source => puppet:///modules/cassandra/commitlog_archiving.properties-4.x
- File[/etc/cassandra-a/logback-tools.xml]
- Parameters differences:
--- File[/etc/cassandra-a/logback-tools.xml].orig
+++ File[/etc/cassandra-a/logback-tools.xml]
@@
- source => puppet:///modules/cassandra/logback-tools.xml-dev
+ source => puppet:///modules/cassandra/logback-tools.xml-4.x