Configure chacra and shaman API keys using credentials binding plugin

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/calamari-clients-build/config/definitions/calamari-clients-build.yml b/calamari-clients-build/config/definitions/calamari-clients-build.yml
index be26bbb0e105f890eaa204a353617fffafb36278..48df4a6b3e8c9c375bb05b553aadc6071443dd20 100644 (file)
--- a/calamari-clients-build/config/definitions/calamari-clients-build.yml
+++ b/calamari-clients-build/config/definitions/calamari-clients-build.yml
@@ -70,3 +70,7 @@
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/calamari/config/definitions/calamari.yml b/calamari/config/definitions/calamari.yml
index 5c8739cd1163918c9950c67691fe4b96b160013b..8dc009dd1701cc8552035943a37da3239b65b2c5 100644 (file)
--- a/calamari/config/definitions/calamari.yml
+++ b/calamari/config/definitions/calamari.yml
@@ -99,3 +99,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml b/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml
index 8c1c479bc47279c5978155101c5530ea87ccaa2e..2336845466e34a027227065aab768b2e49ef9a4b 100644 (file)
--- a/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml
+++ b/ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml
@@ -42,3 +42,7 @@
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index c8e6f95292ecdc42bde7f61c87e72d91cedc4577..22e7c45f2791116571eb1fa18d57829e31d4b6aa 100644 (file)
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -113,3 +113,7 @@
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: chacractl-key
+              variable: CHACRACTL_KEY

diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml
index 0b655e48d6242a112d34bb15ff82b2fc88d98bb4..240aef55a616a2055ca1894f97a0ebc52c77bf97 100644 (file)
--- a/ceph-dev-build/config/definitions/ceph-dev-build.yml
+++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml
@@ -106,3 +106,11 @@
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: chacractl-key
+              variable: CHACRACTL_KEY
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
index 6240e05cdd0968d4c104bcc68fb502d6a11d41e5..7377a366722779448a12b69d5c741fc6ead0f8f6 100644 (file)
--- a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
+++ b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
@@ -106,3 +106,11 @@
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: chacractl-key
+              variable: CHACRACTL_KEY
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml b/ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml
index 64a5a3f184909e87275fffea962a0eab72985eba..39d852a072989a5e4280e13e48d7dc184dc81ac3 100644 (file)
--- a/ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml
+++ b/ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml
@@ -103,3 +103,11 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: chacractl-key
+              variable: CHACRACTL_KEY
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/ceph-iscsi-config/config/definitions/ceph-iscsi-config.yml b/ceph-iscsi-config/config/definitions/ceph-iscsi-config.yml
index afac485b067d465bf26884c5223ec444a2b91fbf..fbbcdcf5df496904922051679f0058bb0e47f8d4 100644 (file)
--- a/ceph-iscsi-config/config/definitions/ceph-iscsi-config.yml
+++ b/ceph-iscsi-config/config/definitions/ceph-iscsi-config.yml
@@ -103,3 +103,11 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: chacractl-key
+              variable: CHACRACTL_KEY
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml b/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml
index 99688a1812578217999ac8da364c06b8e70976f6..a815ec560e31bbfa06fe4a4c6700297205eea487 100644 (file)
--- a/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml
+++ b/ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml
@@ -102,3 +102,11 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: chacractl-key
+              variable: CHACRACTL_KEY
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/ceph-iscsi/config/definitions/ceph-iscsi.yml b/ceph-iscsi/config/definitions/ceph-iscsi.yml
index 286e44d7523e37e4ed742b2da38c620576a5cf14..7bacf14b2602f2df824b904c233864960b97b1b1 100644 (file)
--- a/ceph-iscsi/config/definitions/ceph-iscsi.yml
+++ b/ceph-iscsi/config/definitions/ceph-iscsi.yml
@@ -94,3 +94,11 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: chacractl-key
+              variable: CHACRACTL_KEY
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/ceph-medic-rpm/config/definitions/ceph-medic-rpm.yml b/ceph-medic-rpm/config/definitions/ceph-medic-rpm.yml
index 8a0c4c0582dec81b6624b8e4386a0a3b84ccc2f2..3b5111c262246959329406722ca20dcd4d1059f2 100644 (file)
--- a/ceph-medic-rpm/config/definitions/ceph-medic-rpm.yml
+++ b/ceph-medic-rpm/config/definitions/ceph-medic-rpm.yml
@@ -42,3 +42,7 @@
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/cephmetrics/config/definitions/cephmetrics.yml b/cephmetrics/config/definitions/cephmetrics.yml
index 5102c2a069ec71724d575554eb4aa9e648c118cf..263abdc8a6afeb08bb882f37abce8d889f547f47 100644 (file)
--- a/cephmetrics/config/definitions/cephmetrics.yml
+++ b/cephmetrics/config/definitions/cephmetrics.yml
@@ -96,3 +96,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/diamond-build/config/definitions/diamond-build.yml b/diamond-build/config/definitions/diamond-build.yml
index 5ffb067fdffc83910a958d175105eb5e2c178fcb..b4c3b4feefb8eb15f083c38c69c39b0ed2ca4aa2 100644 (file)
--- a/diamond-build/config/definitions/diamond-build.yml
+++ b/diamond-build/config/definitions/diamond-build.yml
@@ -86,3 +86,7 @@
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/kernel/config/definitions/kernel.yml b/kernel/config/definitions/kernel.yml
index a0c84405d1bd227624b44f5414eac7643c3f41cd..c9fc520eb605d983c9df4b525ae6e87542e5932d 100644 (file)
--- a/kernel/config/definitions/kernel.yml
+++ b/kernel/config/definitions/kernel.yml
@@ -150,3 +150,11 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: chacractl-key
+              variable: CHACRACTL_KEY
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml b/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml
index 28efa10b364efe0edb5268137dea083801fde92b..7d55e60f14896fb989937f0f382ecd20ceac992f 100644 (file)
--- a/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml
+++ b/nfs-ganesha-stable/config/definitions/nfs-ganesha-stable.yml
@@ -186,3 +186,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: chacractl-key
+              variable: CHACRACTL_KEY

diff --git a/nfs-ganesha/config/definitions/nfs-ganesha.yml b/nfs-ganesha/config/definitions/nfs-ganesha.yml
index 55282374005a91688f0d1ba16ea11129ae5f3efc..80910f83dec3d0fa0f2d0c0e6e7df4d21ca5da5f 100644 (file)
--- a/nfs-ganesha/config/definitions/nfs-ganesha.yml
+++ b/nfs-ganesha/config/definitions/nfs-ganesha.yml
@@ -163,3 +163,11 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: chacractl-key
+              variable: CHACRACTL_KEY
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/rtslib-fb/config/definitions/rtslib-fb.yml b/rtslib-fb/config/definitions/rtslib-fb.yml
index 4118412255a99af9cfd7aecc1e68634363e4f8ba..8b21302b8ba5d3f0b765574febd23132cb7139a8 100644 (file)
--- a/rtslib-fb/config/definitions/rtslib-fb.yml
+++ b/rtslib-fb/config/definitions/rtslib-fb.yml
@@ -93,3 +93,11 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: chacractl-key
+              variable: CHACRACTL_KEY
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY

diff --git a/samba/config/definitions/samba.yml b/samba/config/definitions/samba.yml
index 70bb7a303d6e1014a96fc4d1fe7c8813e3034808..0ee301f6d8243eb2f2505e47a21605eaa0221800 100644 (file)
--- a/samba/config/definitions/samba.yml
+++ b/samba/config/definitions/samba.yml
@@ -110,6 +110,14 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: chacractl-key
+              variable: CHACRACTL_KEY
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY
 
     publishers:
       - postbuildscript:

diff --git a/tcmu-runner/config/definitions/tcmu-runner.yml b/tcmu-runner/config/definitions/tcmu-runner.yml
index 0c0c53f3a16c617514c3adf53cd26731fe1bc679..bf0bc9f69fc096f0b258a01e1174da7fd340bab6 100644 (file)
--- a/tcmu-runner/config/definitions/tcmu-runner.yml
+++ b/tcmu-runner/config/definitions/tcmu-runner.yml
@@ -100,3 +100,11 @@ If this is checked, then the binaries will be built and pushed to chacra even if
       - inject-passwords:
           global: true
           mask-password-params: true
+      - credentials-binding:
+          - text:
+              credential-id: chacractl-key
+              variable: CHACRACTL_KEY
+      - credentials-binding:
+          - text:
+              credential-id: shaman-api-key
+              variable: SHAMAN_API_KEY