From b0c469086d0774855c58ebb5e90cfa92b0af3118 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Thu, 19 Oct 2017 11:17:42 -0400 Subject: [PATCH] ansible: Readable formatting in playbooks Signed-off-by: David Galloway --- ansible/slave.yml | 78 +++++++++++++++++++++++++++++---------- ansible/slave_libvirt.yml | 66 +++++++++++++++++++++++++-------- 2 files changed, 109 insertions(+), 35 deletions(-) diff --git a/ansible/slave.yml b/ansible/slave.yml index f8357647..b9a09aa5 100644 --- a/ansible/slave.yml +++ b/ansible/slave.yml @@ -49,10 +49,12 @@ line: 'nameserver 8.8.8.8' state: present - - name: create a {{ jenkins_user }} user - user: name={{ jenkins_user }} comment="Jenkins Build Slave User" + - name: "create a {{ jenkins_user }} user" + user: + name: "{{ jenkins_user }}" + comment: "Jenkins Build Slave User" - - name: create a {{ jenkins_user }} home directory + - name: "create a {{ jenkins_user }} home directory" file: path: "/home/{{ jenkins_user }}/" state: directory @@ -65,9 +67,11 @@ owner: "{{ jenkins_user }}" - name: set the authorized keys - authorized_key: user={{ jenkins_user }} key="{{ lookup('file', 'playbook/files/ssh/keys/jenkins_build.pub') }}" + authorized_key: + user: "{{ jenkins_user }}" + key: "{{ lookup('file', 'playbook/files/ssh/keys/jenkins_build.pub') }}" - - name: ensure {{ jenkins_user }} can sudo without a prompt + - name: "ensure {{ jenkins_user }} can sudo without a prompt" sudo: yes lineinfile: dest: /etc/sudoers @@ -96,14 +100,24 @@ line: "export LANGUAGE=en_US.UTF-8" - name: ensure the build dir exists - file: path=/home/{{ jenkins_user }}/build state=directory owner={{ jenkins_user }} + file: + path: "/home/{{ jenkins_user }}/build" + state: directory + owner: "{{ jenkins_user }}" - name: ensure the home dir has the right owner permissions - file: path=/home/{{ jenkins_user }} state=directory owner={{ jenkins_user }} group={{ jenkins_user }} recurse=yes + file: + path: "/home/{{ jenkins_user }}" + state: directory + owner: "{{ jenkins_user }}" + group: "{{ jenkins_user }}" + recurse: yes - name: Install RPM requirements sudo: yes - yum: name={{ item }} state=present + yum: + name: "{{ item }}" + state: present with_items: - createrepo - epel-release @@ -135,12 +149,15 @@ when: ansible_pkg_mgr == "yum" # Run the equivalent of "apt-get update" as a separate step - - apt: update_cache=yes + - apt: + update_cache: yes when: ansible_pkg_mgr == "apt" - name: Install DEB requirements sudo: yes - apt: name={{ item }} state=present + apt: + name: "{{ item }}" + state: present with_items: - git - fakeroot @@ -170,26 +187,40 @@ - name: Add the Debian Jessie Key sudo: yes + apt_key: + id: 2B90D010 + url: https://ftp-master.debian.org/keys/archive-key-8.asc + keyring: /etc/apt/trusted.gpg + state: present when: ansible_pkg_mgr == "apt" - apt_key: id=2B90D010 url=https://ftp-master.debian.org/keys/archive-key-8.asc keyring=/etc/apt/trusted.gpg state=present - name: Add the Debian Security Jessie Key sudo: yes + apt_key: + id: C857C906 + url: https://ftp-master.debian.org/keys/archive-key-8-security.asc + keyring: /etc/apt/trusted.gpg + state: present when: ansible_pkg_mgr == "apt" - apt_key: id=C857C906 url=https://ftp-master.debian.org/keys/archive-key-8-security.asc keyring=/etc/apt/trusted.gpg state=present - name: Add the Debian Jessie Stable Key sudo: yes + apt_key: + keyserver: pgp.mit.edu + id: 518E17E1 when: ansible_pkg_mgr == "apt" - apt_key: keyserver=pgp.mit.edu id=518E17E1 - name: Install openjdk-7-jre - apt: name=openjdk-7-jre state=present + apt: + name: openjdk-7-jre + state: present when: ansible_distribution_release in ['precise', 'trusty', 'wheezy', 'jessie'] - name: Install default openjdk for Xenial only - apt: name={{ item }} state=present + apt: + name: "{{ item }}" + state: present with_items: - default-jdk - default-jre @@ -197,13 +228,18 @@ ansible_distribution_release == 'xenial' - name: correct java version selected - alternatives: name=java path=/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java + alternatives: + name: java + path: /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java when: (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'precise') or (ansible_distribution == 'Debian' and ansible_distribution_release == 'wheezy') - name: ensure the rpmmacros file exists to fix centos builds - file: path="/home/{{ jenkins_user }}/.rpmmacros" owner="{{ jenkins_user }}" state=touch + file: + path: "/home/{{ jenkins_user }}/.rpmmacros" + owner: "{{ jenkins_user }}" + state: touch - name: write the rpmmacros needed in centos lineinfile: @@ -249,12 +285,16 @@ - name: install six, latest one sudo: true - pip: name=six state=latest + pip: + name: six + state: latest - name: install python-jenkins sudo: true # https://review.openstack.org/460363 - pip: name=python-jenkins version=0.4.15 + pip: + name: python-jenkins + version: 0.4.15 - name: add github.com host key sudo: true diff --git a/ansible/slave_libvirt.yml b/ansible/slave_libvirt.yml index a8f64c55..7300566a 100644 --- a/ansible/slave_libvirt.yml +++ b/ansible/slave_libvirt.yml @@ -59,12 +59,15 @@ state: present # Run the equivalent of "apt-get update" as a separate step - - apt: update_cache=yes + - apt: + update_cache: yes when: ansible_pkg_mgr == "apt" - name: Install DEB requirements sudo: yes - apt: name={{ item }} state=present + apt: + name: "{{ item }}" + state: present with_items: - git - python-dev @@ -90,14 +93,14 @@ jenkins_group: 'libvirt' when: ansible_distribution_version == '17.04' - - name: create a {{ jenkins_user }} user + - name: "create a {{ jenkins_user }} user" user: name: "{{ jenkins_user }}" groups: "{{ jenkins_group }}" append: yes comment: "Jenkins Build Slave User" - - name: create a {{ jenkins_user }} home directory + - name: "create a {{ jenkins_user }} home directory" file: path: "/home/{{ jenkins_user }}/" state: directory @@ -115,9 +118,11 @@ become_user: "{{ jenkins_user }}" - name: set the authorized keys - authorized_key: user={{ jenkins_user }} key="{{ lookup('file', 'playbook/files/ssh/keys/jenkins_build.pub') }}" + authorized_key: + user: "{{ jenkins_user }}" + key: "{{ lookup('file', 'playbook/files/ssh/keys/jenkins_build.pub') }}" - - name: ensure {{ jenkins_user }} can sudo without a prompt + - name: "ensure {{ jenkins_user }} can sudo without a prompt" sudo: yes lineinfile: dest: /etc/sudoers @@ -146,33 +151,56 @@ line: "export LANGUAGE=en_US.UTF-8" - name: ensure the build dir exists - file: path=/home/{{ jenkins_user }}/build state=directory owner={{ jenkins_user }} + file: + path: "/home/{{ jenkins_user }}/build" + state: directory + owner: "{{ jenkins_user }}" - name: ensure the home dir has the right owner permissions - file: path=/home/{{ jenkins_user }} state=directory owner={{ jenkins_user }} group={{ jenkins_user }} recurse=yes + file: + path: "/home/{{ jenkins_user }}" + state: directory + owner: "{{ jenkins_user }}" + group: "{{ jenkins_user }}" + recurse: yes - name: Add the Debian Jessie Key sudo: yes + apt_key: + id: 2B90D010 + url: https://ftp-master.debian.org/keys/archive-key-8.asc + keyring: /etc/apt/trusted.gpg + state: present when: ansible_pkg_mgr == "apt" - apt_key: id=2B90D010 url=https://ftp-master.debian.org/keys/archive-key-8.asc keyring=/etc/apt/trusted.gpg state=present - name: Add the Debian Security Jessie Key sudo: yes + apt_key: + id: C857C906 + url: https://ftp-master.debian.org/keys/archive-key-8-security.asc + keyring: /etc/apt/trusted.gpg + state: present when: ansible_pkg_mgr == "apt" - apt_key: id=C857C906 url=https://ftp-master.debian.org/keys/archive-key-8-security.asc keyring=/etc/apt/trusted.gpg state=present - name: Add the Debian Jessie Stable Release Key sudo: yes + apt_key: + keyserver: pgp.mit.edu + id: 75DDC3C4A499F1A18CB5F3C8CBF8D6FD518E17E1 + state: present when: ansible_pkg_mgr == "apt" - apt_key: keyserver=pgp.mit.edu id=75DDC3C4A499F1A18CB5F3C8CBF8D6FD518E17E1 state=present - name: Install openjdk-7-jre - apt: name=openjdk-7-jre state=present + apt: + name: openjdk-7-jre + state: present when: ansible_distribution_release in ['precise', 'trusty', 'wheezy', 'jessie'] - name: Install default openjdk for Xenial or Zesty - apt: name={{ item }} state=present + apt: + name: "{{ item }}" + state: present with_items: - default-jdk - default-jre @@ -180,7 +208,9 @@ ansible_distribution_release in ['xenial', 'zesty'] - name: correct java version selected - alternatives: name=java path=/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java + alternatives: + name: java + path: /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java when: (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'precise') or (ansible_distribution == 'Debian' and ansible_distribution_release == 'wheezy') @@ -226,12 +256,16 @@ - name: install six, latest one sudo: true - pip: name=six state=latest + pip: + name: six + state: latest - name: install python-jenkins sudo: true # https://review.openstack.org/460363 - pip: name=python-jenkins version=0.4.15 + pip: + name: python-jenkins + version: 0.4.15 - name: add github.com host key sudo: true -- 2.39.5