diff --git a/playbooks/groups/jenkins-cloud.yml b/playbooks/groups/jenkins-cloud.yml index 86d0e59fa8..d4b4054ef3 100644 --- a/playbooks/groups/jenkins-cloud.yml +++ b/playbooks/groups/jenkins-cloud.yml @@ -284,7 +284,9 @@ - jenkinsuser - name: setup jenkins_slave ssh key - action: authorized_key user=jenkins_slave key='$FILE($private/files/jenkins/ssh/jenkins_master.pub)' + action: authorized_key user=jenkins_slave key="{{ item }}" + with_file: + - $private/files/jenkins/ssh/jenkins_master.pub - name: jenkins_slave to mock group action: user name=jenkins_slave groups=mock diff --git a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml index e3ad7a93e5..a1c7bd2324 100644 --- a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml @@ -97,7 +97,9 @@ action: copy src=$files/copr/copr_bashrc dest=/srv/copr-work/copr/.bashrc owner=copr group=copr mode=600 - name: auth_key so we can login to localhost as the copr user from the copr user - action: authorized_key user=copr key='$FILE(${files}/copr/provision/files/buildsys.pub)' + action: authorized_key user=copr key="{{ item }}" + with_file: + - ${files}/copr/provision/files/buildsys.pub - name: set dir ownership for copr-work and copr-repo action: file state=directory path=$item owner=copr group=copr diff --git a/playbooks/set_root_auth_keys.yml b/playbooks/set_root_auth_keys.yml index b6c409af77..555d150639 100644 --- a/playbooks/set_root_auth_keys.yml +++ b/playbooks/set_root_auth_keys.yml @@ -13,6 +13,8 @@ tasks: - name: add root keys for sysadmin-main and other allowed users - action: authorized_key user=root key='$PIPE(${auth_keys_from_fas} @sysadmin-main ${root_auth_users})' + action: authorized_key user=root key="{{ item }}" + with_pipe: + - {{ auth_keys_from_fas }} @sysadmin-main {{ root_auth_users }} diff --git a/tasks/base.yml b/tasks/base.yml index 321fcb2647..7d65b7f4ea 100644 --- a/tasks/base.yml +++ b/tasks/base.yml @@ -21,7 +21,9 @@ - rootpw - name: add ansible root key - action: authorized_key user=root key='$FILE(${files}/common/ansible-pub-key)' + action: authorized_key user=root key="{{ item }}" + with_file: + - ${files}/common/ansible-pub-key tags: - config diff --git a/tasks/cloud_setup_basic.yml b/tasks/cloud_setup_basic.yml index 78cc22076a..e7543cf319 100644 --- a/tasks/cloud_setup_basic.yml +++ b/tasks/cloud_setup_basic.yml @@ -26,12 +26,16 @@ - config - name: add ansible root key - action: authorized_key user=root key='$FILE(${files}/common/ansible-pub-key)' + action: authorized_key user=root key="{{ item }}" + with_file: + - ${files}/common/ansible-pub-key tags: - config - name: add root keys for sysadmin-main and other allowed users - action: authorized_key user=root key='$PIPE(${auth_keys_from_fas} @sysadmin-main ${root_auth_users})' + action: authorized_key user=root key="{{ item }}" + with_pipe: + - {{ auth_keys_from_fas }} @sysadmin-main {{ root_auth_users }} tags: - config diff --git a/tasks/mirrorlist.yml b/tasks/mirrorlist.yml index 3e231c092a..7bc26135fe 100644 --- a/tasks/mirrorlist.yml +++ b/tasks/mirrorlist.yml @@ -14,7 +14,9 @@ # mirrormanager user ssh key(s) - name: add authorized_keys for mirrormanager - authorized_key: key='$FILE($files/mirrorlist/mm-authorized_key)' user=mirrormanager state=present + authorized_key: key="{{ item }}" user=mirrormanager state=present + with_file: + - $files/mirrorlist/mm-authorized_key # install mirrorlist-server.conf apache config - name: mirrorlist-server apache conf