From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 30 Jun 2015 21:01:45 +0000 (-0400)
Subject: formatting for cli.yml
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F93%2Fhead;p=ceph-build.git

formatting for cli.yml

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ansible/master/ansible-jenkins/tasks/config.yml b/ansible/master/ansible-jenkins/tasks/config.yml
index 0461db78..597e14e2 100644
--- a/ansible/master/ansible-jenkins/tasks/config.yml
+++ b/ansible/master/ansible-jenkins/tasks/config.yml
@@ -1,24 +1,43 @@
 ---
 
 - name: Configure Jenkins Port
-  lineinfile: dest=/etc/sysconfig/jenkins regexp=^HTTP_PORT= line=HTTP_PORT={{port}}
+  lineinfile:
+    dest: /etc/sysconfig/jenkins
+    regexp: ^HTTP_PORT=
+    line: HTTP_PORT={{port}}
+    backrefs: yes
   register: config_changed
 
 - name: Restart jenkins now
-  service: name=jenkins state=restarted
+  service:
+    name: jenkins
+    state: restarted
   when: config_changed.changed
 
 - name: Configure Jenkins Prefix
   when: prefix is defined
-  lineinfile: dest=/etc/sysconfig/jenkins regexp=^PREFIX= line=PREFIX={{prefix}}
+  lineinfile:
+    dest: /etc/sysconfig/jenkins
+    regex: ^PREFIX=
+    line: PREFIX={{prefix}}
+    backrefs: yes
 
 - name: Set the amount of RAM
   when: xmx is defined
-  lineinfile: dest=/etc/sysconfig/jenkins regexp=^JENKINS_JAVA_OPTIONS line='JENKINS_JAVA_OPTIONS="-Xmx{{xmx}}m -Djava.awt.headless=true"'
+  lineinfile:
+    dest: /etc/sysconfig/jenkins
+    regexp: ^JENKINS_JAVA_OPTIONS
+    line: 'JENKINS_JAVA_OPTIONS="-Xmx{{xmx}}m -Djava.awt.headless=true"'
+    backrefs: yes
 
 - name: Configure Jenkins E-mail
   when: email is defined
-  template: src=hudson.tasks.Mailer.xml.j2 dest={{ jenkins_lib }}/hudson.tasks.Mailer.xml owner=jenkins group=jenkins mode=0644
+  template:
+    src: hudson.tasks.Mailer.xml.j2
+    dest: {{ jenkins_lib }}/hudson.tasks.Mailer.xml
+    owner: jenkins
+    group: jenkins
+    mode: 0644
 
 - name: Tell SELinux that we should allow Nginx to talk to Jenkins
   shell: setsebool -P httpd_can_network_connect 1
diff --git a/ansible/master/ansible-jenkins/tasks/dependencies_yum.yml b/ansible/master/ansible-jenkins/tasks/dependencies_yum.yml
index 9e4350c2..b3623a3d 100644
--- a/ansible/master/ansible-jenkins/tasks/dependencies_yum.yml
+++ b/ansible/master/ansible-jenkins/tasks/dependencies_yum.yml
@@ -8,4 +8,4 @@
   with_items: jenkins.yum.dependencies
 
 - name: Enable Nginx service
-  service: name=nginx enabled=yes state=started
+  service: name=nginx enabled=yes state=restarted