From e0f84fbae7a561752d05a9363d3ef74b868ab3ee Mon Sep 17 00:00:00 2001 From: David Galloway Date: Mon, 13 May 2019 21:30:00 -0400 Subject: [PATCH] Configure chacra and shaman API keys using credentials binding plugin Signed-off-by: David Galloway --- .../config/definitions/calamari-clients-build.yml | 4 ++++ calamari/config/definitions/calamari.yml | 4 ++++ ceph-ansible-rpm/config/definitions/ceph-ansible-rpm.yml | 4 ++++ ceph-build/config/definitions/ceph-build.yml | 4 ++++ ceph-dev-build/config/definitions/ceph-dev-build.yml | 8 ++++++++ .../config/definitions/ceph-dev-new-build.yml | 8 ++++++++ ceph-iscsi-cli/config/definitions/ceph-iscsi-cli.yml | 8 ++++++++ .../config/definitions/ceph-iscsi-config.yml | 8 ++++++++ ceph-iscsi-tools/config/definitions/ceph-iscsi-tools.yml | 8 ++++++++ ceph-iscsi/config/definitions/ceph-iscsi.yml | 8 ++++++++ ceph-medic-rpm/config/definitions/ceph-medic-rpm.yml | 4 ++++ cephmetrics/config/definitions/cephmetrics.yml | 4 ++++ diamond-build/config/definitions/diamond-build.yml | 4 ++++ kernel/config/definitions/kernel.yml | 8 ++++++++ .../config/definitions/nfs-ganesha-stable.yml | 4 ++++ nfs-ganesha/config/definitions/nfs-ganesha.yml | 8 ++++++++ rtslib-fb/config/definitions/rtslib-fb.yml | 8 ++++++++ samba/config/definitions/samba.yml | 8 ++++++++ tcmu-runner/config/definitions/tcmu-runner.yml | 8 ++++++++ 19 files changed, 120 insertions(+) diff --git a/calamari-clients-build/config/definitions/calamari-clients-build.yml b/calamari-clients-build/config/definitions/calamari-clients-build.yml index be26bbb0..48df4a6b 100644 --- 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 5c8739cd..8dc009dd 100644 --- 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 8c1c479b..23368454 100644 --- 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 c8e6f952..22e7c45f 100644 --- 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 0b655e48..240aef55 100644 --- 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 6240e05c..7377a366 100644 --- 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 64a5a3f1..39d852a0 100644 --- 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 afac485b..fbbcdcf5 100644 --- 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 99688a18..a815ec56 100644 --- 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 286e44d7..7bacf14b 100644 --- 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 8a0c4c05..3b5111c2 100644 --- 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 5102c2a0..263abdc8 100644 --- 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 5ffb067f..b4c3b4fe 100644 --- 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 a0c84405..c9fc520e 100644 --- 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 28efa10b..7d55e60f 100644 --- 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 55282374..80910f83 100644 --- 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 41184122..8b21302b 100644 --- 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 70bb7a30..0ee301f6 100644 --- 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 0c0c53f3..bf0bc9f6 100644 --- 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 -- 2.39.5