diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2018-05-24 22:38:52 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2018-05-24 22:38:52 +0200 |
| commit | a65eff44b52d4e531a3cd8a335be6c9cff066e35 (patch) | |
| tree | 08c772741b3d66a3ae0ccf36dc60d902a129857e | |
| parent | fix dkms role for scaleway boxes with 'custom' kernel (diff) | |
some cleanups
| -rwxr-xr-x | apply-role.sh | 2 | ||||
| -rw-r--r-- | generic.yaml | 4 | ||||
| -rwxr-xr-x | gpg/gpg2.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apply-role.sh b/apply-role.sh index a4b49b04..3d39f345 100755 --- a/apply-role.sh +++ b/apply-role.sh @@ -10,4 +10,4 @@ role="$1" shift echo "######## applying the role '$role' to host(s) '$hosts' ########" -exec ansible-playbook -e "myname=$hosts" -e "myrole=$role" $@ generic.yaml +exec ansible-playbook -e "myhosts=$hosts" -e "myrole=$role" $@ generic.yaml diff --git a/generic.yaml b/generic.yaml index c21d5225..d3b8de82 100644 --- a/generic.yaml +++ b/generic.yaml @@ -1,5 +1,5 @@ --- -- name: Apply role {{ myrole }} to servers {{ myname }} - hosts: "{{ myname }}" +- name: "Apply role {{ myrole }} to hosts: {{ myhosts }}" + hosts: "{{ myhosts }}" roles: - role: "{{ myrole }}" diff --git a/gpg/gpg2.sh b/gpg/gpg2.sh index 60473dde..27435ab5 100755 --- a/gpg/gpg2.sh +++ b/gpg/gpg2.sh @@ -1,2 +1,2 @@ #!/bin/bash -exec gpg2 --keyring "${BASH_SOURCE%/*}/vault-keyring.gpg" --secret-keyring /dev/null --no-default-keyring --trust-model always $@ +exec gpg2 --keyring "${BASH_SOURCE%/*}/vault-keyring.gpg" --secret-keyring /dev/null --no-options --no-default-keyring --trust-model always $@ |