--- Class[Profile::Cassandra].orig
+++ Class[Profile::Cassandra]
@@
- cassandra_settings => {'start_rpc': False, 'tls_use_pki_truststore': True, 'tls_cluster_name': 'cassandra-dev', 'tls_use_pki': True, 'dc': 'codfw', 'cluster_name': 'cassandra-dev', 'super_username': 'cassandra', 'super_password': 'fake_super_password', 'target_version': 'dev', 'default_instance_params': {'max_heap_size': '12g', 'heap_newsize': '2048m', 'compaction_throughput_mb_per_sec': 20, 'concurrent_compactors': 10, 'concurrent_writes': 18, 'concurrent_reads': 18, 'permissions_validity_in_ms': 600000, 'trickle_fsync': False, 'client_encryption_enabled': True, 'client_encryption_optional': True, 'internode_encryption': 'all'}, 'users': ['restbase_dev', 'mediawiki_services_mobileapps', 'cassandra_devel', 'data_gateway', 'aqsloader', 'commons_impact_analytics', 'revise_tone_task_generator', 'linked_artifacts', 'media_analytics']}
+ cassandra_settings => {'start_rpc': False, 'tls_use_pki_truststore': True, 'tls_cluster_name': 'cassandra-dev', 'tls_use_pki': True, 'dc': 'codfw', 'cluster_name': 'cassandra-dev', 'super_username': 'cassandra', 'super_password': 'fake_super_password', 'target_version': '4.x', 'default_instance_params': {'max_heap_size': '12g', 'heap_newsize': '2048m', 'compaction_throughput_mb_per_sec': 20, 'concurrent_compactors': 10, 'concurrent_writes': 18, 'concurrent_reads': 18, 'permissions_validity_in_ms': 600000, 'trickle_fsync': False, 'client_encryption_enabled': True, 'client_encryption_optional': True, 'internode_encryption': 'all'}, 'users': ['restbase_dev', 'mediawiki_services_mobileapps', 'cassandra_devel', 'data_gateway', 'aqsloader', 'commons_impact_analytics', 'revise_tone_task_generator', 'linked_artifacts', 'media_analytics']}
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
- Apt::Repository[component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia]
- Parameters differences:
--- Apt::Repository[component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia].orig
+++ Apt::Repository[component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia]
+ trust_repo => False
+ uri => http://apt.wikimedia.org/wikimedia
+ components => component/cassandra41
+ source => True
+ ensure => present
+ bin => True
+ allow_releaseinfo_change => False
+ dist => bullseye-wikimedia
- Exec[apt_package_from_component_cassandra]
- Parameters differences:
--- Exec[apt_package_from_component_cassandra].orig
+++ Exec[apt_package_from_component_cassandra]
@@
- subscribe => Apt::Repository[component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia]
+ subscribe => Apt::Repository[component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia]
- File[/etc/apt/sources.list.d/component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia.list]
- Parameters differences:
--- File[/etc/apt/sources.list.d/component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia.list].orig
+++ File[/etc/apt/sources.list.d/component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia.list]
- owner => root
- ensure => file
- notify => Exec[apt_repository_component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia]
- group => root
- mode => 0444
- Content differences:
--- /etc/apt/sources.list.d/component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia.list.orig
+++ /etc/apt/sources.list.d/component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia.list
@@ -1,2 +0,0 @@
-deb http://apt.wikimedia.org/wikimedia bullseye-wikimedia component/cassandradev
-deb-src http://apt.wikimedia.org/wikimedia bullseye-wikimedia component/cassandradev
- 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/apt/sources.list.d/component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia.list]
- Parameters differences:
--- File[/etc/apt/sources.list.d/component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia.list].orig
+++ File[/etc/apt/sources.list.d/component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia.list]
+ owner => root
+ ensure => file
+ notify => Exec[apt_repository_component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia]
+ group => root
+ mode => 0444
- Content differences:
--- /etc/apt/sources.list.d/component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia.list.orig
+++ /etc/apt/sources.list.d/component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia.list
@@ -0,0 +1,2 @@
+deb http://apt.wikimedia.org/wikimedia bullseye-wikimedia component/cassandra41
+deb-src http://apt.wikimedia.org/wikimedia bullseye-wikimedia component/cassandra41
- 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
- Apt::Repository[component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia]
- Parameters differences:
--- Apt::Repository[component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia].orig
+++ Apt::Repository[component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia]
- trust_repo => False
- uri => http://apt.wikimedia.org/wikimedia
- components => component/cassandradev
- source => True
- ensure => present
- bin => True
- allow_releaseinfo_change => False
- dist => bullseye-wikimedia
- Exec[apt_repository_component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia]
- Parameters differences:
--- Exec[apt_repository_component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia].orig
+++ Exec[apt_repository_component-cassandra41-apt.wikimedia.org-wikimedia-bullseye-wikimedia]
+ refreshonly => True
+ command => /usr/bin/apt-get update
- Exec[apt_repository_component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia]
- Parameters differences:
--- Exec[apt_repository_component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia].orig
+++ Exec[apt_repository_component-cassandradev-apt.wikimedia.org-wikimedia-bullseye-wikimedia]
- refreshonly => True
- command => /usr/bin/apt-get update
- 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