Merge branch 'master' of /git/ansible

playbooks/jenkins_master.yml

@@ -10,6 +10,7 @@
 
   tasks:
   - include: $tasks/cloud_setup_basic.yml
+  - include: $tasks/postfix_basic.yml
   - name: install pkgs for jenkins
     action: yum state=installed pkg=$item
     with_items:
@@ -66,7 +67,7 @@
     tags:
     - config
 
-  - name: add jenkins-admin-keys for ssh'ing as root
+  - name: add jenkins-admin-keys for ssh as root
     action: copy src=$files/jenkins/jenkins-admin-keys dest=/root/.ssh/authorized_keys mode=600 backup=true
     tags:
     - config
@@ -77,10 +78,10 @@
 #        - the IP of the slaves
 #        - the number of projects
 #        - the admins
-# Configuration of postfix
 # Configuration of the ssh key to jenkins to access the slaves
 # Does it need the : lokkit -p 80:tcp ?
 
+
   - name: start jenkins itself
     action: service name=jenkins state=running