Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 351ba4a

Browse files
committed
Reindent and reformat the main.yml
1 parent 1c12e2a commit 351ba4a

File tree

1 file changed

+38
-17
lines changed

1 file changed

+38
-17
lines changed

tasks/main.yml

Lines changed: 38 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,54 @@
1919
- PyYAML
2020

2121
- name: Install more packages for Fedora
22-
package: name={{ item }} state=present
22+
package:
23+
name: "{{ item }}"
24+
state: present
2325
with_items:
2426
- redhat-rpm-config
2527
when: ansible_distribution == 'Fedora' and ansible_distribution_major_version >= '23'
2628

27-
- set_fact: checkout_dir="/srv/builder/{{ name }}"
29+
- set_fact:
30+
checkout_dir: "/srv/builder/{{ name }}"
2831

2932
- name: Deploy the build script
30-
copy: dest=/usr/local/bin/build_deploy.py src=build_deploy.py mode=755 owner=root group=root
33+
copy:
34+
dest: /usr/local/bin/build_deploy.py
35+
src: build_deploy.py
36+
mode: 755
37+
owner: root
38+
group: root
3139

3240
- name: Create {{ builder_username }} to build
3341
user:
34-
name="{{ builder_username }}"
35-
comment="Middleman builder user"
36-
generate_ssh_key=yes
37-
home="/srv/builder"
38-
ssh_key_file="/srv/builder/.ssh/{{ name }}_id.rsa"
42+
name: "{{ builder_username }}"
43+
comment: "Middleman builder user"
44+
generate_ssh_key: yes
45+
home: "/srv/builder"
46+
ssh_key_file: "/srv/builder/.ssh/{{ name }}_id.rsa"
3947
register: result
4048

4149
# needed so NRPE can check log
4250
- name: Fix directory permission for NRPE
43-
file: path="/srv/builder" mode=755 state=directory
44-
51+
file:
52+
path: "/srv/builder"
53+
mode: 755
54+
state: directory
4555

4656
- name: Clone git repo {{ git_url }}
47-
git: repo="{{ git_url }}" dest="{{ checkout_dir }}" version="{{ git_version | default( "HEAD" ) }}" update="no"
57+
git:
58+
repo: "{{ git_url }}"
59+
dest: "{{ checkout_dir }}"
60+
version: "{{ git_version | default( 'HEAD' ) }}"
61+
update: "no"
4862
become: yes
4963
become_user: '{{ builder_username }}'
5064
become_method: 'su'
5165

5266
- name: Install gems required to build
53-
command: chdir="{{ checkout_dir }}" bundle install
67+
command: bundle install
68+
args:
69+
chdir: "{{ checkout_dir }}"
5470
become: yes
5571
become_user: '{{ builder_username }}'
5672
become_method: 'su'
@@ -64,17 +80,22 @@
6480
when: rsync_server is defined and rsync_location is defined and rsync_user is defined
6581

6682
- name: Deploy yaml config for {{ name }}
67-
template: dest=/srv/builder/{{ name }}.yml src=builder.yml
83+
template:
84+
dest: "/srv/builder/{{ name }}.yml"
85+
src: builder.yml
6886

6987
- name: Add cron to build {{ name }}
70-
cron: name="build and deploy {{ name }}" job="/usr/local/bin/build_deploy.py /srv/builder/{{ name }}.yml" user="{{ builder_username }}"
88+
cron:
89+
name: "build and deploy {{ name }}"
90+
job: "/usr/local/bin/build_deploy.py /srv/builder/{{ name }}.yml"
91+
user: "{{ builder_username }}"
7192

7293
# TODO add ip restriction
7394
- name: Copy the key on the other side
7495
authorized_key:
75-
key="{{ result.ssh_public_key }}"
76-
key_options="command=\"rsync --server -vlogDtprze.isf --delete-after . {{ rsync_location }}\",no-port-forwarding,no-agent-forwarding,no-X11-forwarding,no-pty"
77-
user="{{ rsync_user }}"
96+
key: "{{ result.ssh_public_key }}"
97+
key_options: "command=\"rsync --server -vlogDtprze.isf --delete-after . {{ rsync_location }}\",no-port-forwarding,no-agent-forwarding,no-X11-forwarding,no-pty"
98+
user: "{{ rsync_user }}"
7899
delegate_to: "{{ rsync_server }}"
79100
remote_user: "{{ rsync_user }}"
80101
when: rsync_server is defined and rsync_location is defined and rsync_user is defined

0 commit comments

Comments
 (0)