From 952af903dc21275a07ac7362448d3c8da74ce827 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 10 Jun 2019 12:51:51 +0200
Subject: [PATCH] ansible-playbooks/general#85 Linting
---
defaults/main.yml | 18 +++---
handlers/main.yml | 16 ++---
tasks/configure.yml | 66 +++++++++----------
tasks/main.yml | 24 +++----
tasks/prepare.yml | 150 ++++++++++++++++++++++----------------------
5 files changed, 138 insertions(+), 136 deletions(-)
diff --git a/defaults/main.yml b/defaults/main.yml
index ec4d3ba..1647a7c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,14 +1,14 @@
# General
-oracle_version: '11.2.0'
-oracle_schema: 'ver_{{inventory_hostname}}'
-oracle_password: 'b331cAFx4d58505'
+oracle_version: 11.2.0
+oracle_schema: ver_{{inventory_hostname}}
+oracle_password: b331cAFx4d58505
oracle_svn_installs: []
# Cronjobs
cronjobs_group:
- - name: 'backup databases'
- job: '/bin/bash /var/backups/oracle/backupall.sh'
- month: '*'
- day: '*'
- hour: '01'
- minute: '01'
+ - name: backup databases
+ job: /bin/bash /var/backups/oracle/backupall.sh
+ month: *
+ day: *
+ hour: 01
+ minute: 01
diff --git a/handlers/main.yml b/handlers/main.yml
index 3c55d94..a7178f6 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,15 +1,15 @@
---
# file: roles/common/handlers/main.yml
-- name: "Restart oracle"
+- name: Restart oracle
service:
- name: 'oracle-xe'
- state: 'restarted'
+ name: oracle-xe
+ state: restarted
-- name: "Remove old logs and traces"
+- name: Remove old logs and traces
file:
- name: '/u01/app/oracle/diag/tnslsnr/{{inventory_hostname}}/listener/{{item}}/*'
- state: 'absent'
+ name: /u01/app/oracle/diag/tnslsnr/{{inventory_hostname}}/listener/{{item}}/*
+ state: absent
with_items:
- - 'alert'
- - 'trace'
+ - alert
+ - trace
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 798214b..61826d7 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -1,60 +1,60 @@
---
# file: roles/common/tasks/configure.yml
-- name: "Copy script files"
+- name: Copy script files
copy:
src: '{{ item }}'
- dest: '/opt/{{ item }}'
- owner: 'root'
- group: 'root'
- mode: '755'
+ dest: /opt/{{ item }}
+ owner: root
+ group: root
+ mode: 755
with_items:
- - 'sqlplus.sh'
- - 'ora_get_sizes.sh'
- - 'ora_get_sizes.sql'
+ - sqlplus.sh
+ - ora_get_sizes.sh
+ - ora_get_sizes.sql
-- name: "Create Directory"
+- name: Create Directory
file:
- dest: '/var/backups/oracle'
- state: 'directory'
- mode: '755'
+ dest: /var/backups/oracle
+ state: directory
+ mode: 755
-- name: "Copy files"
+- name: Copy files
copy:
src: '{{ item }}'
- dest: '/var/backups/oracle/{{ item }}'
- owner: 'root'
- group: 'root'
- mode: '755'
+ dest: /var/backups/oracle/{{ item }}
+ owner: root
+ group: root
+ mode: 755
with_items:
- - 'backup.sh'
+ - backup.sh
-- name: "Copy templates"
+- name: Copy templates
template:
src: '{{ item }}'
- dest: '/var/backups/oracle/{{ item }}'
- owner: 'root'
- group: 'root'
- mode: '755'
+ dest: /var/backups/oracle/{{ item }}
+ owner: root
+ group: root
+ mode: 755
with_items:
- - 'backupall.sh'
+ - backupall.sh
-- name: "Turn off logging and tracing"
+- name: Turn off logging and tracing
lineinfile:
- dest: '/u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora'
+ dest: /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora
regexp: "^{{ item }}"
line: '{{ item }}'
with_items:
- - 'LOGGING_listener=off'
- - 'TRACE_LEVEL_listener=off'
+ - LOGGING_listener=off
+ - TRACE_LEVEL_listener=off
notify:
- - 'Restart oracle'
- - 'Remove old logs and traces'
+ - Restart oracle
+ - Remove old logs and traces
-- name: "Install PIP packages"
+- name: Install PIP packages
pip:
name: '{{ packages }}'
- state: 'present'
+ state: present
vars:
packages:
- - 'cx_Oracle'
+ - cx_Oracle
diff --git a/tasks/main.yml b/tasks/main.yml
index e88336a..ad2592d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,25 +1,27 @@
---
# file: roles/oracle/tasks/main.yml
-- name: "Oracle Role"
- set_fact: role_oracle_started=true
- tags: 'always'
+- name: Oracle Role
+ set_fact:
+ role_oracle_started: yes
+ tags:
+ - always
- block:
- - name: "Install essential packages"
+ - name: Install essential packages
apt:
pkg: '{{ packages }}'
- state: 'present'
+ state: present
update_cache: yes
vars:
packages:
- - 'alien'
- - 'libaio1'
- - 'bc'
+ - alien
+ - libaio1
+ - bc
- - name: "Check current status"
- shell: 'ls /u01/app/oracle/product'
+ - name: Check current status
+ shell: ls /u01/app/oracle/product
register: last_result
ignore_errors: yes
@@ -28,4 +30,4 @@
- import_tasks: configure.yml
- when: '"oracle" not in excluded_roles'
+ when: not excluded_roles or "oracle" not in excluded_roles
diff --git a/tasks/prepare.yml b/tasks/prepare.yml
index b398f3c..252887e 100644
--- a/tasks/prepare.yml
+++ b/tasks/prepare.yml
@@ -10,116 +10,116 @@
#
# sqlplus sys as sysdba
-- name: "Copy oracle debian package to the server"
- command: 'scp {{repository}}oracle-xe_11.2.0-2_amd64.deb /tmp/oracle-xe_11.2.0-2_amd64.deb'
+- name: Copy oracle debian package to the server
+ command: scp {{repository}}oracle-xe_11.2.0-2_amd64.deb /tmp/oracle-xe_11.2.0-2_amd64.deb
become: no
-- name: "Move oracle debian package to /opt"
- command: 'mv /tmp/oracle-xe_11.2.0-2_amd64.deb /opt/oracle-xe_11.2.0-2_amd64.deb'
+- name: Move oracle debian package to /opt
+ command: mv /tmp/oracle-xe_11.2.0-2_amd64.deb /opt/oracle-xe_11.2.0-2_amd64.deb
-- name: "Copy chkconfig file"
+- name: Copy chkconfig file
copy:
- src: 'sbin_chkconfig'
- dest: '/sbin/chkconfig'
- owner: 'root'
- group: 'root'
- mode: '755'
+ src: sbin_chkconfig
+ dest: /sbin/chkconfig
+ owner: root
+ group: root
+ mode: 755
-- name: "Copy oracle.conf file"
+- name: Copy oracle.conf file
copy:
- src: 'etc_sysctl_d_60_oracle_conf'
- dest: '/etc/sysctl.d/60-oracle.conf'
- owner: 'root'
- group: 'root'
- mode: '644'
+ src: etc_sysctl_d_60_oracle_conf
+ dest: /etc/sysctl.d/60-oracle.conf
+ owner: root
+ group: root
+ mode: 644
-- name: "Load the new kernel parameters"
- command: 'service procps start'
+- name: Load the new kernel parameters
+ command: service procps start
-- name: "Remove symbolic link"
- command: 'rm -f /bin/awk'
+- name: Remove symbolic link
+ command: rm -f /bin/awk
-- name: "Create symbolic link"
- command: 'ln -s /usr/bin/awk /bin/awk'
+- name: Create symbolic link
+ command: ln -s /usr/bin/awk /bin/awk
-- name: "Remove directory"
- command: 'rm -rf /var/lock/subsys'
+- name: Remove directory
+ command: rm -rf /var/lock/subsys
-- name: "Create directory"
+- name: Create directory
file:
- dest: '/var/lock/subsys'
- state: 'directory'
- mode: '755'
+ dest: /var/lock/subsys
+ state: directory
+ mode: 755
-- name: "Create listener file"
- command: 'touch /var/lock/subsys/listener'
+- name: Create listener file
+ command: touch /var/lock/subsys/listener
-- name: "Remove directory"
- command: 'rm -rf /dev/shm'
+- name: Remove directory
+ command: rm -rf /dev/shm
-- name: "Create directory"
+- name: Create directory
file:
- dest: '/dev/shm'
- state: 'directory'
- mode: '755'
+ dest: /dev/shm
+ state: directory
+ mode: 755
-- name: "Mount tmpfs"
- command: 'mount -t tmpfs shmfs -o size=2048m /dev/shm'
+- name: Mount tmpfs
+ command: mount -t tmpfs shmfs -o size=2048m /dev/shm
-- name: "Copy shm load file"
+- name: Copy shm load file
copy:
- src: 'etc_init_d_shm_load'
- dest: '/etc/init.d/shm_load'
- owner: 'root'
- group: 'root'
- mode: '755'
+ src: etc_init_d_shm_load
+ dest: /etc/init.d/shm_load
+ owner: root
+ group: root
+ mode: 755
-- name: "Add shm load file to bootlist"
- command: 'update-rc.d shm_load defaults'
+- name: Add shm load file to bootlist
+ command: update-rc.d shm_load defaults
-- name: "Unpack oracle"
- command: 'dpkg --install /opt/oracle-xe_11.2.0-2_amd64.deb'
+- name: Unpack oracle
+ command: dpkg --install /opt/oracle-xe_11.2.0-2_amd64.deb
-- name: "Copy configuration script"
+- name: Copy configuration script
copy:
- src: 'opt_oracle_config_sh'
- dest: '/opt/oracle_config.sh'
- owner: 'root'
- group: 'root'
- mode: '755'
+ src: opt_oracle_config_sh
+ dest: /opt/oracle_config.sh
+ owner: root
+ group: root
+ mode: 755
-- name: "Copy configuration script answers"
+- name: Copy configuration script answers
copy:
- src: 'opt_oracle_config_answers'
- dest: '/opt/oracle_config_answers'
- owner: 'root'
- group: 'root'
- mode: '644'
+ src: opt_oracle_config_answers
+ dest: /opt/oracle_config_answers
+ owner: root
+ group: root
+ mode: 644
-- name: "Configure Oracle"
- shell: '/opt/oracle_config.sh </opt/oracle_config_answers'
+- name: Configure Oracle
+ shell: /opt/oracle_config.sh </opt/oracle_config_answers
-- name: "Checkout install files"
+- name: Checkout install files
subversion:
repo: '{{item.svn}}'
- dest: '/tmp/{{item.pathname}}'
+ dest: /tmp/{{item.pathname}}
become: no
with_items: '{{ oracle_svn_installs }}'
-- name: "Concatenate install files"
- shell: 'cat /tmp/{{item.pathname}}/*.sql > /opt/{{item.pathname}}.sql'
+- name: Concatenate install files
+ shell: cat /tmp/{{item.pathname}}/*.sql > /opt/{{item.pathname}}.sql
with_items: '{{ oracle_svn_installs }}'
-- name: "Copy basic setup files"
+- name: Copy basic setup files
template:
src: '{{item}}'
- dest: '/opt/{{item}}'
- owner: 'root'
- group: 'root'
- mode: '755'
+ dest: /opt/{{item}}
+ owner: root
+ group: root
+ mode: 755
with_items:
- - 'setup.sh'
- - 'setup.sql'
+ - setup.sh
+ - setup.sql
-- name: "Execute basic setup"
- shell: '/opt/setup.sh'
+- name: Execute basic setup
+ shell: /opt/setup.sh
--
GitLab