(common) deep merge s3daemon::instances

lsst-it · Nov 5, 2024 · e6e3a38 · e6e3a38
1 parent a9c8eaa
commit e6e3a38
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
@@ -104,6 +104,9 @@ lookup_options:
   rke2::config:
     merge:
       strategy: "deep"
+  s3daemon::instances:
+    merge:
+      strategy: "deep"
 
 timezone::timezone: "UTC"
 chrony::cmdport: 0

diff --git a/spec/fixtures/hiera.yaml b/spec/fixtures/hiera.yaml
@@ -6,8 +6,41 @@ hierarchy:
   - name: "private hiera"
     datadir: "./hieradata"
     paths:
-      - "role-only.yaml"
+      - "node/%{fqdn}.yaml"
+      - "site/%{site}/cluster/%{cluster}/variant/%{variant}/subvariant/%{subvariant}/%{facts.os.family}/major/%{facts.os.release.major}.yaml"
+      - "site/%{site}/cluster/%{cluster}/variant/%{variant}/subvariant/%{subvariant}.yaml"
+      - "site/%{site}/cluster/%{cluster}/variant/%{variant}/%{facts.os.family}/major/%{facts.os.release.major}.yaml"
+      - "site/%{site}/cluster/%{cluster}/variant/%{variant}.yaml"
+      - "site/%{site}/cluster/%{cluster}/role/%{role}/osfamily/%{facts.os.family}/major/%{facts.os.release.major}.yaml"
+      - "site/%{site}/cluster/%{cluster}/role/%{role}/osfamily.yaml"
+      - "site/%{site}/cluster/%{cluster}/role/%{role}.yaml"
+      - "site/%{site}/cluster/%{cluster}.yaml"
+      - "cluster/%{cluster}/variant/%{variant}/subvariant/%{subvariant}/%{facts.os.family}/major/%{facts.os.release.major}.yaml"
+      - "cluster/%{cluster}/variant/%{variant}/subvariant/%{subvariant}.yaml"
+      - "cluster/%{cluster}/variant/%{variant}/%{facts.os.family}/major/%{facts.os.release.major}.yaml"
+      - "cluster/%{cluster}/variant/%{variant}.yaml"
+      - "cluster/%{cluster}/role/%{role}.yaml"
+      - "cluster/%{cluster}/osfamily/%{facts.os.family}/major/%{facts.os.release.major}.yaml"
+      - "cluster/%{cluster}/osfamily/%{facts.os.family}.yaml"
+      - "cluster/%{cluster}.yaml"
+      - "site/%{site}/variant/%{variant}/subvariant/%{subvariant}/%{facts.os.family}/major/%{facts.os.release.major}.yaml"
+      - "site/%{site}/variant/%{variant}/subvariant/%{subvariant}.yaml"
+      - "site/%{site}/variant/%{variant}/%{facts.os.family}/major/%{facts.os.release.major}.yaml"
+      - "site/%{site}/variant/%{variant}.yaml"
+      - "site/%{site}/role/%{role}/osfamily/%{facts.os.family}/major/%{facts.os.release.major}.yaml"
+      - "site/%{site}/role/%{role}/osfamily/%{facts.os.family}.yaml"
+      - "site/%{site}/role/%{role}.yaml"
+      - "site/%{site}.yaml"
+      - "role/%{role}/osfamily/%{facts.os.family}/major/%{facts.os.release.major}.yaml"
+      - "role/%{role}/osfamily/%{facts.os.family}.yaml"
+      - "role/%{role}.yaml"
+      - "common/architecture/%{facts.os.architecture}/osfamily/%{facts.os.family}/major/%{facts.os.release.major}.yaml"
+      - "common/architecture/%{facts.os.architecture}/osfamily/%{facts.os.family}.yaml"
+      - "common/osfamily/%{facts.os.family}/major/%{facts.os.release.major}.yaml"
+      - "common/osfamily/%{facts.os.family}.yaml"
+      - "common/virtual/%{virtual}.yaml"
       - "common.yaml"
+      - "role-only.yaml"
   - name: "public hiera"
     datadir: "../../hieradata"
     paths:

diff --git a/spec/fixtures/hieradata/common.yaml b/spec/fixtures/hieradata/common.yaml
@@ -26,6 +26,8 @@ lookup_options:
     convert_to: "Sensitive"
   '^profile::core::puppetdb::ldap_bind_(user|pass)$':
     convert_to: "Sensitive"
+  '^s3daemon_.+::aws_.+$':
+    convert_to: "Sensitive"
 ccs_database::database: "comcamdbprod"
 ccs_database::password: "foo"
 foreman_proxy::plugin::dns::route53::aws_access_key: "foo"
@@ -50,4 +52,6 @@ profile::core::puppetdb::ldap_bind_user: "foo"
 restic::id: "foo"
 restic::key: "foo"
 restic::password: "foo"
+s3daemon_test::aws_access_key_id: "foo"
+s3daemon_test::aws_secret_access_key: "foo"
 tailscale::auth_key: "foo"