From 60144b8a0465900467dd4d488b66c5e22e2b8482 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 21 Dec 2018 14:27:21 -0500 Subject: [PATCH] Clean up punctuation Change-Id: I4dc54429850abfba854a56fbf634143e1e3eb9f2 Signed-off-by: Paul Belanger --- tasks/config.yaml | 24 +++++----- tasks/install.yaml | 6 +-- tasks/install/git.yaml | 4 +- tasks/install/pip.yaml | 2 +- tasks/main.yaml | 4 +- tasks/pre.yaml | 4 +- tasks/service.yaml | 100 ++++++++++++++++++++--------------------- 7 files changed, 72 insertions(+), 72 deletions(-) diff --git a/tasks/config.yaml b/tasks/config.yaml index c66af0e..db9b0c8 100644 --- a/tasks/config.yaml +++ b/tasks/config.yaml @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. --- -- name: Create required directories. +- name: Create required directories become: true file: group: "{{ zuul_user_group }}" @@ -24,7 +24,7 @@ - /etc/zuul/ssl - /var/log/zuul -- name: Install gearman logging file. +- name: Install gearman logging file become: true template: dest: "{{ zuul_file_gearman_logging_conf_dest }}" @@ -35,7 +35,7 @@ register: zuul_file_gearman_logging_conf notify: Reload zuul-scheduler -- name: Install executor logging file. +- name: Install executor logging file become: true template: dest: "{{ zuul_file_executor_logging_conf_dest }}" @@ -45,7 +45,7 @@ src: "{{ zuul_file_executor_logging_conf_src }}" register: zuul_file_executor_logging_conf -- name: Install fingergw logging file. +- name: Install fingergw logging file become: true template: dest: "{{ zuul_file_fingergw_logging_conf_dest }}" @@ -55,7 +55,7 @@ src: "{{ zuul_file_fingergw_logging_conf_src }}" register: zuul_file_fingergw_logging_conf -- name: Install merger logging file. +- name: Install merger logging file become: true template: dest: "{{ zuul_file_merger_logging_conf_dest }}" @@ -65,7 +65,7 @@ src: "{{ zuul_file_merger_logging_conf_src }}" register: zuul_file_merger_logging_conf -- name: Install scheduler logging file. +- name: Install scheduler logging file become: true template: dest: "{{ zuul_file_scheduler_logging_conf_dest }}" @@ -76,7 +76,7 @@ register: zuul_file_scheduler_logging_conf notify: Reload zuul-scheduler -- name: Install zuul gearman ssl ca configuration. +- name: Install zuul gearman ssl ca configuration become: true template: dest: "{{ zuul_file_gearman_ssl_ca_dest }}" @@ -86,7 +86,7 @@ src: "{{ zuul_file_gearman_ssl_ca_src }}" register: zuul_file_gearman_ssl_ca -- name: Install zuul gearman ssl cert configuration. +- name: Install zuul gearman ssl cert configuration become: true template: dest: "{{ zuul_file_gearman_ssl_cert_dest }}" @@ -96,7 +96,7 @@ src: "{{ zuul_file_gearman_ssl_cert_src }}" register: zuul_file_gearman_ssl_cert -- name: Install zuul gearman ssl key configuration. +- name: Install zuul gearman ssl key configuration become: true template: dest: "{{ zuul_file_gearman_ssl_key_dest }}" @@ -106,7 +106,7 @@ src: "{{ zuul_file_gearman_ssl_key_src }}" register: zuul_file_gearman_ssl_key -- name: Install web logging file. +- name: Install web logging file become: true template: dest: "{{ zuul_file_web_logging_conf_dest }}" @@ -116,7 +116,7 @@ src: "{{ zuul_file_web_logging_conf_src }}" register: zuul_file_web_logging_conf -- name: Install zuul main.yaml configuration. +- name: Install zuul main.yaml configuration become: true template: dest: "{{ zuul_file_main_yaml_dest }}" @@ -128,7 +128,7 @@ notify: - Reload zuul-scheduler -- name: Install zuul configuration. +- name: Install zuul configuration become: true template: dest: "{{ zuul_file_zuul_conf_dest }}" diff --git a/tasks/install.yaml b/tasks/install.yaml index 6d66896..f1268e3 100644 --- a/tasks/install.yaml +++ b/tasks/install.yaml @@ -12,19 +12,19 @@ # License for the specific language governing permissions and limitations # under the License. --- -- name: Define zuul_build_depends. +- name: Define zuul_build_depends set_fact: zuul_build_depends: "{{ __zuul_build_depends | list }}" when: zuul_build_depends is not defined -- name: Ensure build dependencies are installed. +- name: Ensure build dependencies are installed become: true package: name: "{{ zuul_build_depends }}" state: present when: zuul_install_method == 'git' or zuul_install_method == 'pip' -- name: Define zuul_pip_executable if needed. +- name: Define zuul_pip_executable if needed set_fact: zuul_pip_executable: pip3 when: diff --git a/tasks/install/git.yaml b/tasks/install/git.yaml index e333536..f821c91 100644 --- a/tasks/install/git.yaml +++ b/tasks/install/git.yaml @@ -12,14 +12,14 @@ # License for the specific language governing permissions and limitations # under the License. --- -- name: Git clone zuul. +- name: Git clone zuul git: dest: "{{ zuul_git_dest }}" repo: "{{ zuul_git_uri }}" update: "{{ zuul_git_update|default(omit) }}" version: "{{ zuul_git_version }}" -- name: Set zuul_pip_name to local git repo. +- name: Set zuul_pip_name to local git repo set_fact: zuul_pip_name: "file://{{ zuul_git_dest }}" diff --git a/tasks/install/pip.yaml b/tasks/install/pip.yaml index 0c5d7dc..07b9e72 100644 --- a/tasks/install/pip.yaml +++ b/tasks/install/pip.yaml @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. --- -- name: Install zuul using pip. +- name: Install zuul using pip become: true pip: executable: "{{ zuul_pip_executable|default(omit) }}" diff --git a/tasks/main.yaml b/tasks/main.yaml index 74401b4..0155eb9 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. --- -- name: Include OS-specific variables. +- name: Include OS-specific variables include_vars: "{{ ansible_distribution|lower }}.yaml" when: ansible_os_family == 'Debian' -- name: Include OS-specific variables. +- name: Include OS-specific variables include_vars: "{{ ansible_os_family|lower }}.yaml" when: ansible_os_family == 'RedHat' diff --git a/tasks/pre.yaml b/tasks/pre.yaml index 3718305..df17e7b 100644 --- a/tasks/pre.yaml +++ b/tasks/pre.yaml @@ -12,12 +12,12 @@ # License for the specific language governing permissions and limitations # under the License. --- -- name: Create group account. +- name: Create group account become: true group: name: "{{ zuul_user_group }}" -- name: Create user account. +- name: Create user account become: true user: createhome: true diff --git a/tasks/service.yaml b/tasks/service.yaml index 0b19be0..e51dae6 100644 --- a/tasks/service.yaml +++ b/tasks/service.yaml @@ -12,157 +12,157 @@ # License for the specific language governing permissions and limitations # under the License. --- -- name: Define zuul_file_zuul_executor_service_dest. +- name: Define zuul_file_zuul_executor_service_dest set_fact: zuul_file_zuul_executor_service_dest: "{{ __zuul_file_zuul_executor_service_dest }}" when: zuul_file_zuul_executor_service_dest is not defined -- name: Define zuul_file_zuul_executor_service_mode. +- name: Define zuul_file_zuul_executor_service_mode set_fact: zuul_file_zuul_executor_service_mode: "{{ __zuul_file_zuul_executor_service_mode }}" when: zuul_file_zuul_executor_service_mode is not defined -- name: Define zuul_file_zuul_executor_service_src. +- name: Define zuul_file_zuul_executor_service_src set_fact: zuul_file_zuul_executor_service_src: "{{ __zuul_file_zuul_executor_service_src }}" when: zuul_file_zuul_executor_service_src is not defined -- name: Define zuul_file_zuul_executor_service_config_dest. +- name: Define zuul_file_zuul_executor_service_config_dest set_fact: zuul_file_zuul_executor_service_config_dest: "{{ __zuul_file_zuul_executor_service_config_dest }}" when: zuul_file_zuul_executor_service_config_dest is not defined -- name: Define zuul_file_zuul_executor_service_config_mode. +- name: Define zuul_file_zuul_executor_service_config_mode set_fact: zuul_file_zuul_executor_service_config_mode: "{{ __zuul_file_zuul_executor_service_config_mode }}" when: zuul_file_zuul_executor_service_config_mode is not defined -- name: Define zuul_file_zuul_executor_service_config_src. +- name: Define zuul_file_zuul_executor_service_config_src set_fact: zuul_file_zuul_executor_service_config_src: "{{ __zuul_file_zuul_executor_service_config_src }}" when: zuul_file_zuul_executor_service_config_src is not defined -- name: Define zuul_file_zuul_fingergw_service_dest. +- name: Define zuul_file_zuul_fingergw_service_dest set_fact: zuul_file_zuul_fingergw_service_dest: "{{ __zuul_file_zuul_fingergw_service_dest }}" when: zuul_file_zuul_fingergw_service_dest is not defined -- name: Define zuul_file_zuul_fingergw_service_mode. +- name: Define zuul_file_zuul_fingergw_service_mode set_fact: zuul_file_zuul_fingergw_service_mode: "{{ __zuul_file_zuul_fingergw_service_mode }}" when: zuul_file_zuul_fingergw_service_mode is not defined -- name: Define zuul_file_zuul_fingergw_service_src. +- name: Define zuul_file_zuul_fingergw_service_src set_fact: zuul_file_zuul_fingergw_service_src: "{{ __zuul_file_zuul_fingergw_service_src }}" when: zuul_file_zuul_fingergw_service_src is not defined -- name: Define zuul_file_zuul_fingergw_service_config_dest. +- name: Define zuul_file_zuul_fingergw_service_config_dest set_fact: zuul_file_zuul_fingergw_service_config_dest: "{{ __zuul_file_zuul_fingergw_service_config_dest }}" when: zuul_file_zuul_fingergw_service_config_dest is not defined -- name: Define zuul_file_zuul_fingergw_service_config_mode. +- name: Define zuul_file_zuul_fingergw_service_config_mode set_fact: zuul_file_zuul_fingergw_service_config_mode: "{{ __zuul_file_zuul_fingergw_service_config_mode }}" when: zuul_file_zuul_fingergw_service_config_mode is not defined -- name: Define zuul_file_zuul_fingergw_service_config_src. +- name: Define zuul_file_zuul_fingergw_service_config_src set_fact: zuul_file_zuul_fingergw_service_config_src: "{{ __zuul_file_zuul_fingergw_service_config_src }}" when: zuul_file_zuul_fingergw_service_config_src is not defined -- name: Define zuul_file_zuul_merger_service_dest. +- name: Define zuul_file_zuul_merger_service_dest set_fact: zuul_file_zuul_merger_service_dest: "{{ __zuul_file_zuul_merger_service_dest }}" when: zuul_file_zuul_merger_service_dest is not defined -- name: Define zuul_file_zuul_merger_service_mode. +- name: Define zuul_file_zuul_merger_service_mode set_fact: zuul_file_zuul_merger_service_mode: "{{ __zuul_file_zuul_merger_service_mode }}" when: zuul_file_zuul_merger_service_mode is not defined -- name: Define zuul_file_zuul_merger_service_src. +- name: Define zuul_file_zuul_merger_service_src set_fact: zuul_file_zuul_merger_service_src: "{{ __zuul_file_zuul_merger_service_src }}" when: zuul_file_zuul_merger_service_src is not defined -- name: Define zuul_file_zuul_merger_service_config_dest. +- name: Define zuul_file_zuul_merger_service_config_dest set_fact: zuul_file_zuul_merger_service_config_dest: "{{ __zuul_file_zuul_merger_service_config_dest }}" when: zuul_file_zuul_merger_service_config_dest is not defined -- name: Define zuul_file_zuul_merger_service_config_mode. +- name: Define zuul_file_zuul_merger_service_config_mode set_fact: zuul_file_zuul_merger_service_config_mode: "{{ __zuul_file_zuul_merger_service_config_mode }}" when: zuul_file_zuul_merger_service_config_mode is not defined -- name: Define zuul_file_zuul_merger_service_config_src. +- name: Define zuul_file_zuul_merger_service_config_src set_fact: zuul_file_zuul_merger_service_config_src: "{{ __zuul_file_zuul_merger_service_config_src }}" when: zuul_file_zuul_merger_service_config_src is not defined -- name: Define zuul_file_zuul_scheduler_service_dest. +- name: Define zuul_file_zuul_scheduler_service_dest set_fact: zuul_file_zuul_scheduler_service_dest: "{{ __zuul_file_zuul_scheduler_service_dest }}" when: zuul_file_zuul_scheduler_service_dest is not defined -- name: Define zuul_file_zuul_scheduler_service_mode. +- name: Define zuul_file_zuul_scheduler_service_mode set_fact: zuul_file_zuul_scheduler_service_mode: "{{ __zuul_file_zuul_scheduler_service_mode }}" when: zuul_file_zuul_scheduler_service_mode is not defined -- name: Define zuul_file_zuul_scheduler_service_src. +- name: Define zuul_file_zuul_scheduler_service_src set_fact: zuul_file_zuul_scheduler_service_src: "{{ __zuul_file_zuul_scheduler_service_src }}" when: zuul_file_zuul_scheduler_service_src is not defined -- name: Define zuul_file_zuul_scheduler_service_config_dest. +- name: Define zuul_file_zuul_scheduler_service_config_dest set_fact: zuul_file_zuul_scheduler_service_config_dest: "{{ __zuul_file_zuul_scheduler_service_config_dest }}" when: zuul_file_zuul_scheduler_service_config_dest is not defined -- name: Define zuul_file_zuul_scheduler_service_config_mode. +- name: Define zuul_file_zuul_scheduler_service_config_mode set_fact: zuul_file_zuul_scheduler_service_config_mode: "{{ __zuul_file_zuul_scheduler_service_config_mode }}" when: zuul_file_zuul_scheduler_service_config_mode is not defined -- name: Define zuul_file_zuul_scheduler_service_config_src. +- name: Define zuul_file_zuul_scheduler_service_config_src set_fact: zuul_file_zuul_scheduler_service_config_src: "{{ __zuul_file_zuul_scheduler_service_config_src }}" when: zuul_file_zuul_scheduler_service_config_src is not defined -- name: Define zuul_file_zuul_web_service_dest. +- name: Define zuul_file_zuul_web_service_dest set_fact: zuul_file_zuul_web_service_dest: "{{ __zuul_file_zuul_web_service_dest }}" when: zuul_file_zuul_web_service_dest is not defined -- name: Define zuul_file_zuul_web_service_mode. +- name: Define zuul_file_zuul_web_service_mode set_fact: zuul_file_zuul_web_service_mode: "{{ __zuul_file_zuul_web_service_mode }}" when: zuul_file_zuul_web_service_mode is not defined -- name: Define zuul_file_zuul_web_service_src. +- name: Define zuul_file_zuul_web_service_src set_fact: zuul_file_zuul_web_service_src: "{{ __zuul_file_zuul_web_service_src }}" when: zuul_file_zuul_web_service_src is not defined -- name: Define zuul_file_zuul_web_service_config_dest. +- name: Define zuul_file_zuul_web_service_config_dest set_fact: zuul_file_zuul_web_service_config_dest: "{{ __zuul_file_zuul_web_service_config_dest }}" when: zuul_file_zuul_web_service_config_dest is not defined -- name: Define zuul_file_zuul_web_service_config_mode. +- name: Define zuul_file_zuul_web_service_config_mode set_fact: zuul_file_zuul_web_service_config_mode: "{{ __zuul_file_zuul_web_service_config_mode }}" when: zuul_file_zuul_web_service_config_mode is not defined -- name: Define zuul_file_zuul_web_service_config_src. +- name: Define zuul_file_zuul_web_service_config_src set_fact: zuul_file_zuul_web_service_config_src: "{{ __zuul_file_zuul_web_service_config_src }}" when: zuul_file_zuul_web_service_config_src is not defined -- name: Install zuul-executor service into place. +- name: Install zuul-executor service into place become: true template: dest: "{{ zuul_file_zuul_executor_service_dest }}" @@ -173,7 +173,7 @@ register: zuul_file_zuul_executor_service when: zuul_file_zuul_executor_service_manage -- name: Create zuul-executor service config directory. +- name: Create zuul-executor service config directory become: true file: group: "{{ zuul_file_zuul_executor_service_config_group }}" @@ -182,7 +182,7 @@ state: directory when: zuul_file_zuul_executor_service_config_manage -- name: Install zuul-executor service config into place. +- name: Install zuul-executor service config into place become: true template: dest: "{{ zuul_file_zuul_executor_service_config_dest }}" @@ -193,7 +193,7 @@ register: zuul_file_zuul_executor_service_config when: zuul_file_zuul_executor_service_config_manage -- name: Install zuul-fingergw service into place. +- name: Install zuul-fingergw service into place become: true template: dest: "{{ zuul_file_zuul_fingergw_service_dest }}" @@ -204,7 +204,7 @@ register: zuul_file_zuul_fingergw_service when: zuul_file_zuul_fingergw_service_manage -- name: Create zuul-fingergw service config directory. +- name: Create zuul-fingergw service config directory become: true file: group: "{{ zuul_file_zuul_fingergw_service_config_group }}" @@ -213,7 +213,7 @@ state: directory when: zuul_file_zuul_fingergw_service_config_manage -- name: Install zuul-fingergw service config into place. +- name: Install zuul-fingergw service config into place become: true template: dest: "{{ zuul_file_zuul_fingergw_service_config_dest }}" @@ -224,7 +224,7 @@ register: zuul_file_zuul_fingergw_service_config when: zuul_file_zuul_fingergw_service_config_manage -- name: Install zuul-merger service into place. +- name: Install zuul-merger service into place become: true template: dest: "{{ zuul_file_zuul_merger_service_dest }}" @@ -235,7 +235,7 @@ register: zuul_file_zuul_merger_service when: zuul_file_zuul_merger_service_manage -- name: Create zuul-merger service config directory. +- name: Create zuul-merger service config directory become: true file: group: "{{ zuul_file_zuul_merger_service_config_group }}" @@ -244,7 +244,7 @@ state: directory when: zuul_file_zuul_merger_service_config_manage -- name: Install zuul-merger service config into place. +- name: Install zuul-merger service config into place become: true template: dest: "{{ zuul_file_zuul_merger_service_config_dest }}" @@ -255,7 +255,7 @@ register: zuul_file_zuul_merger_service_config when: zuul_file_zuul_merger_service_config_manage -- name: Install zuul-scheduler service into place. +- name: Install zuul-scheduler service into place become: true template: dest: "{{ zuul_file_zuul_scheduler_service_dest }}" @@ -266,7 +266,7 @@ register: zuul_file_zuul_scheduler_service when: zuul_file_zuul_scheduler_service_manage -- name: Create zuul-scheduler service config directory. +- name: Create zuul-scheduler service config directory become: true file: group: "{{ zuul_file_zuul_scheduler_service_config_group }}" @@ -275,7 +275,7 @@ state: directory when: zuul_file_zuul_scheduler_service_config_manage -- name: Install zuul-scheduler service config into place. +- name: Install zuul-scheduler service config into place become: true template: dest: "{{ zuul_file_zuul_scheduler_service_config_dest }}" @@ -286,7 +286,7 @@ register: zuul_file_zuul_scheduler_service_config when: zuul_file_zuul_scheduler_service_config_manage -- name: Install zuul-web service into place. +- name: Install zuul-web service into place become: true template: dest: "{{ zuul_file_zuul_web_service_dest }}" @@ -297,7 +297,7 @@ register: zuul_file_zuul_web_service when: zuul_file_zuul_web_service_manage -- name: Create zuul-web service config directory. +- name: Create zuul-web service config directory become: true file: group: "{{ zuul_file_zuul_web_service_config_group }}" @@ -306,7 +306,7 @@ state: directory when: zuul_file_zuul_web_service_config_manage -- name: Install zuul-web service config into place. +- name: Install zuul-web service config into place become: true template: dest: "{{ zuul_file_zuul_web_service_config_dest }}" @@ -317,7 +317,7 @@ register: zuul_file_zuul_web_service_config when: zuul_file_zuul_web_service_config_manage -- name: Enable zuul-executor service. +- name: Enable zuul-executor service become: true systemd: daemon_reload: "{{ zuul_service_zuul_executor_daemon_reload }}" @@ -327,7 +327,7 @@ register: zuul_service_zuul_executor when: zuul_service_zuul_executor_manage -- name: Enable zuul-fingergw service. +- name: Enable zuul-fingergw service become: true systemd: daemon_reload: "{{ zuul_service_zuul_fingergw_daemon_reload }}" @@ -337,7 +337,7 @@ register: zuul_service_zuul_fingergw when: zuul_service_zuul_fingergw_manage -- name: Enable zuul-merger service. +- name: Enable zuul-merger service become: true systemd: daemon_reload: "{{ zuul_service_zuul_merger_daemon_reload }}" @@ -347,7 +347,7 @@ register: zuul_service_zuul_merger when: zuul_service_zuul_merger_manage -- name: Enable zuul-scheduler service. +- name: Enable zuul-scheduler service become: true systemd: daemon_reload: "{{ zuul_service_zuul_scheduler_daemon_reload }}" @@ -357,7 +357,7 @@ register: zuul_service_zuul_scheduler when: zuul_service_zuul_scheduler_manage -- name: Enable zuul-web service. +- name: Enable zuul-web service become: true systemd: daemon_reload: "{{ zuul_service_zuul_web_daemon_reload }}"