cr comments

playbooks/roles/analytics-server/defaults/main.yml

@@ -50,6 +50,8 @@ as_source_repo: "git@github.com:edx/analytics-server.git"
 as_code_dir: "{{ as_home }}/src"
 as_version: "master"
 as_git_identity_path: "{{ secure_dir }}/files/git-identity"
+as_git_identity_dest: "/etc/{{ as_role_name }}.git-identity"
+as_git_ssh: "/tmp/{{ as_role_name }}.git_ssh.sh"
 as_requirements_file: "{{ as_code_dir }}/requirements.txt"
 as_rsyslog_enabled: "yes"
 as_web_user: "www-data"

playbooks/roles/analytics-server/tasks/deploy.yml

@@ -2,8 +2,8 @@
 # TODO: Needed while this repo is private
 #
 - name: analytics-server | upload ssh script
-  copy: 
-    src=git_ssh.sh dest={{ as_git_ssh }}
+  template: 
+    src=tmp/{{ as_role_name }}.git_ssh.sh.j2 dest={{ as_git_ssh }}
     force=yes owner=root group=adm mode=750
   tags:
   - analytics-server
@@ -29,7 +29,7 @@
     dest={{ as_code_dir }} repo={{ as_source_repo }} 
     version={{ as_version }} force=true
   environment:
-    GIT_SSH: /tmp/git_ssh.sh
+    GIT_SSH: $as_git_ssh
     notify: analytics-server | restart the analytics service
   notify: analytics-server | start the analytics service
   tags:
@@ -55,7 +55,7 @@
 # TODO: Needed while this repo is private
 #
 - name: analytics-server | remove read-only ssh key for the content repo
-  file: {{ as_git_identity_dest }} state=absent
+  file: path={{ as_git_identity_dest }} state=absent
   tags:
   - analytics-server
   - deploy

playbooks/roles/analytics-server/tasks/main.yml

@@ -70,9 +70,18 @@
     owner={{ as_user }} 
     group={{ as_user }}
 
+# Awaiting next ansible release.
+#- name: analytics-server | ensure .bashrc exists
+# file: path={{ as_home }}/.bashrc state=touch
+# sudo: true  
+# sudo_user: "{{ as_user }}"
+# tags:
+# - analytics-server
+# - install
+# - update
 
 - name: analytics-server | ensure .bashrc exists
-  file: path={{ as_home }}/.bashrc state=touch
+  shell: touch {{ as_home }}/.bashrc
   sudo: true  
   sudo_user: "{{ as_user }}"
   tags: