[#33] Convert secret names to underscores

Currently, the image publish job is not functioning. This appears to be
due to an invalid secret name. Hyphens cause problems in Ansible
variable names [0]. This change converts the secrets in this repository
to use underscores.

[0] https://github.com/ansible/ansible/issues/3907

Closes #33

Change-Id: I2b1db9ba01a425788541afd8938afef92ef539d6
Signed-off-by: Drew Walters <andrew.walters@att.com>
This commit is contained in:
Drew Walters 2020-03-16 12:12:54 -05:00
parent fc4bf5f22a
commit 6aeeaaa1ec
3 changed files with 8 additions and 8 deletions

View File

@ -25,8 +25,8 @@
block:
- name: Login to Image Registry
docker_login:
username: "{{ image-repo-credentials.username }}"
password: "{{ image-repo-credentials.password }}"
username: "{{ image_repo_credentials.username }}"
password: "{{ image_repo_credentials.password }}"
registry_url: "{{ image_repo }}"
- name: Push Image with Latest Tag

View File

@ -36,7 +36,7 @@
nodeset: airship-airshipctl-single-node
secrets:
- name: github_credentials
secret: airship-airshipctl-airshipit-github-username-password
secret: airship_airshipctl_airshipit_github_username_password
- job:
name: airship-airshipctl-build-image
@ -60,7 +60,7 @@
git_mirror_repository: airshipit/airshipctl
secrets:
- name: git_mirror_credentials
secret: airship-airshipctl-airshipit-github-secret
secret: airship_airshipctl_airshipit_github_secret
pass-to-parent: true
- job:
@ -96,7 +96,7 @@
parent: airship-airshipctl-build-image
post-run: playbooks/airship-airshipctl-publish-images.yaml
secrets:
- airshipctl-image-repo-credentials
- airshipctl_image_repo_credentials
vars:
image: quay.io/airshipit/airshipctl
image_repo: https://quay.io/api/v1/

View File

@ -11,7 +11,7 @@
# limitations under the License.
- secret:
name: airship-airshipctl-airshipit-github-secret
name: airship_airshipctl_airshipit_github_secret
data:
user: git
host: github.com
@ -59,7 +59,7 @@
595F3m2UtgR6QKN5xbJJmWp7ipihdRvQ1eVl5GCjG7MBi27YvILp4cIWg+MO1I=
- secret:
name: airship-airshipctl-airshipit-github-username-password
name: airship_airshipctl_airshipit_github_username_password
data:
username: airshipbot
password: !encrypted/pkcs1-oaep
@ -75,7 +75,7 @@
zY8AzTMSMOKEzSaiiT2lvzBMFhSNRIBTM+m8I+DDBooy0nM4ijcHSP7MdOhGbs=
- secret:
name: airshipctl-image-repo-credentials
name: airshipctl_image_repo_credentials
data:
username: !encrypted/pkcs1-oaep
- IrKFuv6QJnGT7C/c6a4GCmDLJn0rZ82ivaAd3BjP3QyTegM95gVCOFC4l45NGRLLtzFun