git plays: setup dependencies and other fixes

- update apt-cache and install rsyslog (fixes deploy from scratch)
- add dependencies to linaro-git-tools
- dont make {{ tools_checkout_dir }} owned by git:git - this is /srv on
  all of out systems
- symlinks don't have permissions so dont to try to set them

Change-Id: Ib7049303451d14acb2890325880cb719d7acf62e
Reviewed-on: https://review.linaro.org/28202
Reviewed-by: Kelley Spoon <kelley.spoon@linaro.org>
Reviewed-by: Benjamin Copeland <ben.copeland@linaro.org>

8 files changed, 14 insertions, 12 deletions

diff --git a/gerrit.yml b/gerrit.yml
index 49aecf23..0ee292c8 100644
--- a/gerrit.yml
+++ b/gerrit.yml
@@ -8,7 +8,6 @@
     - {role: apache-site, src: "apache/{{gerrit_host}}.conf", config: "{{gerrit_host}}", tags: [apache, website-conf] }
     - {role: apache-auth, host_name: "{{gerrit_host}}", when: server_access == "private", tags: [apache-auth, website-conf]}
     - {role: git-deps}
-    - {role: linaro-git-tools, tags: [linaro-git-tools]}
     - {role: postgres, tags: [gerrit]}
     - {role: dovecot-imapd, tags: [imapd]}
     - {role: gerrit, tags: [gerrit]}
diff --git a/git.yml b/git.yml
index df08643d..7134a10f 100644
--- a/git.yml
+++ b/git.yml
@@ -2,7 +2,6 @@
 - hosts:
     - git
   become: yes
-  gather_facts: no
   vars_files:
     - ["{{secrets_dir}}/host_vars/{{inventory_hostname}}", "vars/empty.yml"]
     - "{{secrets_dir}}/group_vars/all"
diff --git a/roles/cgit/meta/main.yml b/roles/cgit/meta/main.yml
new file mode 100644
index 00000000..ddc3faaf
--- /dev/null
+++ b/roles/cgit/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - {role: linaro-git-tools}
diff --git a/roles/gerrit/meta/main.yml b/roles/gerrit/meta/main.yml
new file mode 100644
index 00000000..ddc3faaf
--- /dev/null
+++ b/roles/gerrit/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - {role: linaro-git-tools}
diff --git a/roles/git-deps/tasks/pkgs.yml b/roles/git-deps/tasks/pkgs.yml
index 06c17670..dd71c3ca 100644
--- a/roles/git-deps/tasks/pkgs.yml
+++ b/roles/git-deps/tasks/pkgs.yml
@@ -7,7 +7,9 @@
 - name: Install common OS dependencies
   apt:
     name: "{{item}}"
+    update_cache: yes
   with_items:
+    - acl
     - apache2
     - git
     #- gitweb
@@ -15,7 +17,7 @@
     - libcache-cache-perl
     - ntp
     - python-requests
-    - acl
+    - rsyslog
 
 - name: Enable Apache modules
   apache2_module:
diff --git a/roles/gitolite/meta/main.yml b/roles/gitolite/meta/main.yml
new file mode 100644
index 00000000..ddc3faaf
--- /dev/null
+++ b/roles/gitolite/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - {role: linaro-git-tools}
diff --git a/roles/linaro-git-tools/tasks/main.yml b/roles/linaro-git-tools/tasks/main.yml
index bb537434..0915ee4b 100644
--- a/roles/linaro-git-tools/tasks/main.yml
+++ b/roles/linaro-git-tools/tasks/main.yml
@@ -2,13 +2,6 @@
 - name: Create linaro-git-tools user account
   user: name={{git_user}} state=present
 
-- name: Make sure the checkout destination directory exists
-  file: path={{ tools_checkout_dir }}
-        state=directory
-        owner={{git_user}}
-        group={{git_user}}
-        mode=0755
-
 - name: Clone linaro-git-tools repository
   git:  name=http://{{linaro_git_server}}/git/infrastructure/linaro-git-tools.git
         dest={{tools_checkout_dir}}/linaro-git-tools
diff --git a/roles/ssh-ldap/tasks/main.yml b/roles/ssh-ldap/tasks/main.yml
index a4268cbc..cabdf8e9 100644
--- a/roles/ssh-ldap/tasks/main.yml
+++ b/roles/ssh-ldap/tasks/main.yml
@@ -23,7 +23,7 @@
 # to make it easy to manage in one place
 - name: LDAP symlinks for Debian systems
   when: ansible_distribution == 'Debian'
-  file: src=/srv/linaro-git-tools/linaro_ldap.conf dest=/etc/{{item}} state=link force=yes mode=0400 owner=root
+  file: src=/srv/linaro-git-tools/linaro_ldap.conf dest=/etc/{{item}} state=link force=yes owner=root
   with_items:
     - pam_ldap.conf
     - libnss-ldap.conf
@@ -32,7 +32,7 @@
 
 - name: LDAP symlinks for Ubuntu systems
   when: ansible_distribution == 'Ubuntu'
-  file: src=/srv/linaro-git-tools/linaro_ldap.conf dest=/etc/{{item}} state=link force=yes mode=0400 owner=root
+  file: src=/srv/linaro-git-tools/linaro_ldap.conf dest=/etc/{{item}} state=link force=yes owner=root
   with_items:
     - ldap.conf
   notify: