ansible 1.2 breaks $FILE and $PIPE - so I went and fixed it everywhere :(

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

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

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 }}
 
 

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
 

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
 

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