Merge pull request #106 from Shm013/103-New_style_lint

Clean up ansible-lint and yamllint issues

Author: lae

.flake8

@@ -0,0 +1,7 @@
+[flake8]
+# Recommend matching the black line length (default 88),
+# rather than using the flake8 default of 79:
+max-line-length = 88
+extend-ignore =
+    # See https://github.com/PyCQA/pycodestyle/issues/373
+    E203,

.github/FUNDING.yml

@@ -1,3 +1,4 @@
+---
 ko_fi: sleepingkyoto
 custom:
   - "https://monappy.jp/u/lae"

.gitignore

@@ -2,4 +2,5 @@
 .vscode/
 .history
 *.retry
-*.code-workspace
+*.code-workspace
+*.sw?

.travis.yml

@@ -37,6 +37,7 @@ before_script:
 - cd tests/
 script:
 - ansible-lint ../ || true
+- yamllint ../ || true
 - ansible-playbook -i inventory deploy.yml --syntax-check
 - ansible-playbook -i inventory deploy.yml
 - 'ANSIBLE_STDOUT_CALLBACK=debug ANSIBLE_DISPLAY_SKIPPED_HOSTS=no ANSIBLE_DISPLAY_OK_HOSTS=no

.yamllint

@@ -1,3 +1,4 @@
+---
 extends: default
 
 rules:
@@ -11,3 +12,5 @@ rules:
   # NOTE(retr0h): Templates no longer fail this lint rule.
   #               Uncomment if running old Molecule templates.
   # truthy: disable
+
+ignore: .travis.yml

defaults/main.yml

@@ -11,15 +11,15 @@ netbox_git_uri: "https://github.com/netbox-community/netbox.git"
 netbox_install_epel: true
 
 netbox_superuser_username: admin
-#netbox_superuser_password: changeme
+# netbox_superuser_password: changeme
 netbox_superuser_email: admin@localhost
 
 netbox_database: netbox
 netbox_database_user: netbox
-#netbox_database_password: changeme
-#netbox_database_host: localhost
+# netbox_database_password: changeme
+# netbox_database_host: localhost
 netbox_database_port: 5432
-#netbox_database_socket: /var/run/postgresql
+# netbox_database_socket: /var/run/postgresql
 netbox_database_conn_age: 0
 
 netbox_redis_host: 127.0.0.1
@@ -41,12 +41,12 @@ netbox_metrics_dir: netbox_metrics
 netbox_metrics_path: "/run/{{ netbox_metrics_dir }}"
 
 netbox_config:
-  #SECRET_KEY:
+  # SECRET_KEY:
   ALLOWED_HOSTS:
     - localhost
     - 127.0.0.1
-  #NAPALM_USERNAME:
-  #NAPALM_PASSWORD:
+  # NAPALM_USERNAME:
+  # NAPALM_PASSWORD:
   MEDIA_ROOT: "{{ netbox_shared_path }}/media"
   REPORTS_ROOT: "{{ netbox_shared_path }}/reports"
   SCRIPTS_ROOT: "{{ netbox_shared_path }}/scripts"

examples/netbox_config.yml

@@ -1,6 +1,6 @@
 ---
 netbox_config:
-  #SECRET_KEY: "hLk3ED%o#P0teb&UjKN)Quvr=SW$HcM^Z(Rzy_sBXFfpY+5TVC" # let this be generated by the role so you don't have to store it
+  # SECRET_KEY: "hLk3ED%o#P0teb&UjKN)Quvr=SW$HcM^Z(Rzy_sBXFfpY+5TVC" # let this be generated by the role so you don't have to store it
   ALLOWED_HOSTS:
     - 127.0.0.1
     - localhost
@@ -24,16 +24,16 @@ netbox_config:
   BASE_PATH: netbox/
   CACHE_TIMEOUT: 900
   CHANGELOG_RETENTION: 90
-  CORS_ORIGIN_ALLOW_ALL: False
-  #CORS_ORIGIN_REGEX_WHITELIST:
+  CORS_ORIGIN_ALLOW_ALL: false
+  # CORS_ORIGIN_REGEX_WHITELIST:
   CORS_ORIGIN_WHITELIST:
     - hostname.domain.example
   DATE_FORMAT: N j, Y
   DATETIME_FORMAT: 'N j, Y g:i a'
-  DEBUG: yes
+  DEBUG: true
   # yes, no, false, true, False, True are all valid booleans in Ansible - they will be inserted correctly in configuration.py
   DOCS_ROOT: docs/
-  ENFORCE_GLOBAL_UNIQUE: False
+  ENFORCE_GLOBAL_UNIQUE: false
   EMAIL:
     SERVER: localhost
     PORT: 25
@@ -51,7 +51,7 @@ netbox_config:
     - ::1
   LOGGING:
     version: 1
-    disable_existing_loggers: False
+    disable_existing_loggers: false
     handlers:
       console:
         class: logging.StreamHandler
@@ -60,19 +60,19 @@ netbox_config:
         handlers:
           - console
         level: INFO
-  LOGIN_REQUIRED: yes
+  LOGIN_REQUIRED: true
   LOGIN_TIMEOUT: 1209600
-  MAINTENANCE_MODE: False
+  MAINTENANCE_MODE: false
   MAX_PAGE_SIZE: 500
   MEDIA_ROOT: /srv/netbox_media
-  METRICS_ENABLED: True
+  METRICS_ENABLED: true
   NAPALM_USERNAME: netbox
   NAPALM_PASSWORD: NetBox42
   NAPALM_TIMEOUT: 30
   NAPALM_ARGS:
     keepalive: 60
   PAGINATE_COUNT: 100
-  PREFER_IPV4: False
+  PREFER_IPV4: false
   RACK_ELEVATION_DEFAULT_UNIT_HEIGHT: 22
   RACK_ELEVATION_DEFAULT_UNIT_WIDTH: 220
   REPORTS_ROOT: /srv/netbox_reports
@@ -83,4 +83,4 @@ netbox_config:
   SHORT_TIME_FORMAT: 'H:i:s'
   TIME_FORMAT: 'g:i a'
   TIME_ZONE: UTC
-  WEBHOOKS_ENABLED: False
+  WEBHOOKS_ENABLED: false

examples/playbook_single_host_deploy.yml

@@ -1,6 +1,6 @@
 ---
 - hosts: all
-  become: yes
+  become: true
   roles:
     - geerlingguy.postgresql
     - davidwittman.redis
@@ -33,24 +33,24 @@
         - rhel-*-extras-rpms
       when: "ansible_distribution == 'Red Hat Enterprise Linux'"
     - block:
-      - name: Set PostgreSQL facts to use PG10 for RedHat distributions
-        set_fact:
-          postgresql_version: 10
-          postgresql_packages:
-            - postgresql10
-            - postgresql10-server
-            - postgresql10-contrib
-            - postgresql10-libs
-          postgresql_data_dir: /var/lib/pgsql/10/data
-          postgresql_bin_path: /usr/pgsql-10/bin
-          postgresql_config_path: /var/lib/pgsql/10/data
-          postgresql_daemon: postgresql-10
-      - name: Install the EPEL yum repository
-        yum:
-          name: epel-release
-      - name: Install the PostgreSQL yum repository
-        yum:
-          name: "https://download.postgresql.org/pub/repos/yum/reporpms/EL-{{ ansible_distribution_major_version }}-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
+        - name: Set PostgreSQL facts to use PG10 for RedHat distributions
+          set_fact:
+            postgresql_version: 10
+            postgresql_packages:
+              - postgresql10
+              - postgresql10-server
+              - postgresql10-contrib
+              - postgresql10-libs
+            postgresql_data_dir: /var/lib/pgsql/10/data
+            postgresql_bin_path: /usr/pgsql-10/bin
+            postgresql_config_path: /var/lib/pgsql/10/data
+            postgresql_daemon: postgresql-10
+        - name: Install the EPEL yum repository
+          yum:
+            name: epel-release
+        - name: Install the PostgreSQL yum repository
+          yum:
+            name: "https://download.postgresql.org/pub/repos/yum/reporpms/EL-{{ ansible_distribution_major_version }}-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
       when: "ansible_os_family == 'RedHat' and ansible_distribution_major_version =='7'"
 
 # You can use this playbook as-is to setup a full NetBox server, just change

handlers/main.yml

@@ -4,13 +4,13 @@
   systemd:
     name: netbox.socket
     state: restarted
-    daemon_reload: yes
+    daemon_reload: true
 
 - name: restart netbox.service
   systemd:
     name: netbox.service
     state: restarted
-    daemon_reload: yes
+    daemon_reload: true
 
 - name: reload netbox.service
   systemd:
@@ -21,4 +21,4 @@
   systemd:
     name: netbox-rqworker.service
     state: restarted
-    daemon_reload: yes
+    daemon_reload: true

meta/main.yml

@@ -1,3 +1,4 @@
+---
 galaxy_info:
   author: Musee Ullah
   description: Installs and configures NetBox, a DCIM suite, in a production setting.