Make a secret conform to the other secrets
Change-Id: I0023340dfa66ad97693159fe84f34a5adf19f7df
diff --git a/playbooks/setup-juju-client/pre.yaml b/playbooks/setup-juju-client/pre.yaml
index 2dafc60..fdcd76b 100644
--- a/playbooks/setup-juju-client/pre.yaml
+++ b/playbooks/setup-juju-client/pre.yaml
@@ -17,12 +17,12 @@
- name: Log in
ansible.builtin.shell: juju login 10.4.2.241:17070 --controller maas-controller --user zuul-nodepool-zaza
args:
- stdin: "y\n{{ juju_secret['the_secret'] }}\n"
+ stdin: "y\n{{ JUJU_SECRET['v'] }}\n"
- name: Enter our password a second time
ansible.builtin.shell: juju clouds
args:
- stdin: "{{ juju_secret['the_secret'] }}\n"
+ stdin: "{{ JUJU_SECRET['v'] }}\n"
- name: Prepare Juju credentials file
ansible.builtin.shell: umask 177 && echo "credentials:" > ~/.local/share/juju/credentials.yaml
diff --git a/zuul.d/setup-juju-client.yaml b/zuul.d/setup-juju-client.yaml
index b79ff56..ce17495 100644
--- a/zuul.d/setup-juju-client.yaml
+++ b/zuul.d/setup-juju-client.yaml
@@ -1,6 +1,6 @@
---
- secret:
- name: juju-secret
+ name: JUJU_SECRET
data:
v: !encrypted/pkcs1-oaep
- Drm+IMqt9zTh1RUAaLpEJ4jY7OSMFRG+ZzyQ85MEki2y1CvDbUaKTV8g5JXENllk+p4RB
@@ -23,5 +23,5 @@
timeout: 1800
attempts: 3
secrets:
- - name: juju_secret
- secret: juju-secret
+ - name: JUJU_SECRET
+ secret: JUJU_SECRET