Skip to content
This repository has been archived by the owner on Oct 8, 2024. It is now read-only.

Commit

Permalink
ansible-lint [204] Lines should be no longer than 160 chars.
Browse files Browse the repository at this point in the history
  • Loading branch information
bbaassssiiee committed Oct 8, 2019
1 parent f81e7c2 commit 27101b7
Show file tree
Hide file tree
Showing 22 changed files with 113 additions and 30 deletions.
7 changes: 6 additions & 1 deletion add_federation/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@
role: "{{ add_federation_role }}"
configuration: "{{ add_federation_configuration }}"
templateName: "{{ add_federation_templateName }}"
when: add_federation_name is defined and add_federation_protocol is defined and add_federation_role is defined and add_federation_configuration is defined and add_federation_templateName is defined
when:
- add_federation_name is defined
- add_federation_protocol is defined
- add_federation_role is defined
- add_federation_configuration is defined
- add_federation_templateName is defined
notify:
- Commit Changes
- Reload Liberty Runtime
7 changes: 6 additions & 1 deletion add_junction/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,9 @@
http2_junction: "{{ add_junction_http2_junction }}"
http2_proxy: "{{ add_junction_http2_proxy }}"
sni_name: "{{ add_junction_sni_name }}"
when: add_junction_junction_point is defined and add_junction_junction_type is defined and add_junction_reverseproxy_id is defined and add_junction_server_hostname is defined and add_junction_server_port is defined
when:
- add_junction_junction_point is defined
- add_junction_junction_type is defined
- add_junction_reverseproxy_id is defined
- add_junction_server_hostname is defined
- add_junction_server_port is defined
6 changes: 5 additions & 1 deletion add_junction_servers/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,8 @@
sms_environment: "{{ add_junction_servers_sms_environment }}"
vhost_label: "{{ add_junction_servers_vhost_label }}"
with_items: "{{ add_junction_servers }}"
when: add_junction_servers_junction_point is defined and add_junction_servers_reverseproxy_id is defined and add_junction_servers_junction_type is defined and add_junction_servers is defined
when:
- add_junction_servers_junction_point is defined
- add_junction_servers_reverseproxy_id is defined
- add_junction_servers_junction_type is defined
- add_junction_servers is defined
8 changes: 7 additions & 1 deletion add_partner/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@
role: "{{ add_partner_role }}"
configuration: "{{ add_partner_configuration }}"
templateName: "{{ add_partner_templateName }}"
when: add_partner_federation_name is defined and add_partner_partner_name is defined and add_partner_enabled is defined and add_partner_role is defined and add_partner_configuration is defined and add_partner_templateName is defined
when:
- add_partner_federation_name is defined
- add_partner_partner_name is defined
- add_partner_enabled is defined
- add_partner_role is defined
- add_partner_configuration is defined
- add_partner_templateName is defined
notify:
- Commit Changes
- Reload Liberty Runtime
7 changes: 6 additions & 1 deletion add_server_connection_ldap/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
description: "{{ ldap_server_connection_description }}"
locked: "{{ ldap_server_connection_locked }}"
connectionManager: "{{ ldap_server_connection_manager }}"
when: ldap_server_connection_name is defined and ldap_server_connection_connection is defined and ldap_server_connection_description is defined and ldap_server_connection_locked is defined and ldap_server_connection_manager is defined
when:
- ldap_server_connection_name is defined
- ldap_server_connection_connection is defined
- ldap_server_connection_description is defined
- ldap_server_connection_locked is defined
- ldap_server_connection_manager is defined
notify: Commit Changes

6 changes: 5 additions & 1 deletion add_server_connection_ws/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
connection: "{{ ws_server_connection_connection }}"
description: "{{ ws_server_connection_description }}"
locked: "{{ ws_server_connection_locked }}"
when: ws_server_connection_name is defined and ws_server_connection_connection is defined and ws_server_connection_description is defined and ws_server_connection_locked is defined
when:
- ws_server_connection_name is defined
- ws_server_connection_connection is defined
- ws_server_connection_description is defined
- ws_server_connection_locked is defined
notify: Commit Changes

12 changes: 10 additions & 2 deletions archive_logs/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@
instance_id: "{{ archive_logs_instance_id }}"
file_id: "{{ item['id'] }}"
filename: "{{ archive_logs_directory }}/{{ inventory_hostname }}_{{ item['id'] }}"
when: archive_logs_export and archive_logs_instance_id is defined and item['id'].startswith(archive_logs_filter) and item['id'][dt_start|int:dt_end|int] < past_dt.stdout
when:
- archive_logs_export
- archive_logs_instance_id is defined
- item['id'].startswith(archive_logs_filter)
- item['id'][dt_start|int:dt_end|int] < past_dt.stdout
with_items: "{{ ret_obj['data'] }}"
vars:
dt_start: "{{ archive_logs_filter | length }}"
Expand All @@ -48,7 +52,11 @@
isamapi:
instance_id: "{{ archive_logs_instance_id }}"
file_id: "{{ item['id'] }}"
when: archive_logs_delete and archive_logs_instance_id is defined and item['id'].startswith(archive_logs_filter) and item['id'][dt_start|int:dt_end|int] < past_dt.stdout
when:
- archive_logs_delete | bool
- archive_logs_instance_id is defined
- item['id'].startswith(archive_logs_filter)
- item['id'][dt_start|int:dt_end|int] < past_dt.stdout
with_items: "{{ ret_obj['data'] }}"
vars:
dt_start: "{{ archive_logs_filter | length }}"
Expand Down
6 changes: 3 additions & 3 deletions bootstrap_local/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
ignore_errors: true
- debug: var=shell_out

-name: set fact about target vm running
set_fact:
vm_running: true
- name: set fact about target vm running
set_fact:
vm_running: true
when: "shell_out.rc == 0"
- debug: var=vm_running

Expand Down
7 changes: 6 additions & 1 deletion config_fed_dir/tasks/cert_db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@
label : "{{ config_fed_dir_client_cert_label }}"
server : "{{ config_fed_dir_hostname }}"
port : "{{ config_fed_dir_port }}"
when: not ansible_check_mode and config_fed_dir_kdb_name is defined and config_fed_dir_hostname is defined and config_fed_dir_port is defined and config_fed_dir_client_cert_label is defined
when:
- not ansible_check_mode
- config_fed_dir_kdb_name is defined
- config_fed_dir_hostname is defined
- config_fed_dir_port is defined
- config_fed_dir_client_cert_label is defined
notify:
- Commit Changes

Expand Down
6 changes: 5 additions & 1 deletion create_mgmt_root_file/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
id : "{{ create_mgmt_root_file_id }}"
name : "{{ create_mgmt_root_file_name }}"
contents : "{{ create_mgmt_root_file_contents }}"
when: create_mgmt_root_file_contents is defined and create_mgmt_root_file_name is defined and create_mgmt_root_file_instance_id is defined and create_mgmt_root_file_id is defined
when:
- create_mgmt_root_file_contents is defined
- create_mgmt_root_file_name is defined
- create_mgmt_root_file_instance_id is defined
- create_mgmt_root_file_id is defined
notify:
- Commit Changes
2 changes: 2 additions & 0 deletions execute_compare/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
- include: compare_base.yml
with_items: "{{ execute_compare_mga_or_fed_features }}"
when: (execute_compare_fed and ('federation' in master_web_runtime['ansible_facts']['activations'])) or (execute_compare_mga and ('mga' in master_web_runtime['ansible_facts']['activations']))
tags:
- skip_ansible_lint

# Compare runtime configuration files of an appliance
- include: compare_runtime_config.yml
Expand Down
5 changes: 4 additions & 1 deletion execute_isamcfg/tasks/junction.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@
scripting_support: "{{ execute_isamcfg_scripting_support }}"
junction_cookie_javascript_block: "{{ execute_isamcfg_junction_cookie_javascript_block }}"
query_contents: "{{ execute_isamcfg_query_contents }}"
when: execute_isamcfg_reverseproxy_id is defined and execute_isamcfg_server is defined and execute_isamcfg_port is defined and execute_isamcfg_reverseproxy_id in execute_isamcfg_reverseproxy_list
when:
- execute_isamcfg_reverseproxy_id is defined
- execute_isamcfg_server is defined
- execute_isamcfg_port is defined and execute_isamcfg_reverseproxy_id in execute_isamcfg_reverseproxy_list
10 changes: 7 additions & 3 deletions execute_isamcfg/tasks/rp_config_adds.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Add new entries / Stanzas to reverse proxy config file

- name: Configure Reverse Proxy for AAC (Adds)
isam:
appliance: "{{ inventory_hostname }}"
Expand Down Expand Up @@ -181,7 +180,12 @@
- stanza: "session-http-headers"
entries:
- ['Authorization', 'https']
when: common_web_root is defined and execute_isamcfg_basic_auth_user is defined and execute_isamcfg_basic_auth_passwd is defined and execute_isamcfg_reverseproxy_id is defined and execute_isamcfg_reverseproxy_id in execute_isamcfg_reverseproxy_list
when:
- common_web_root is defined
- execute_isamcfg_basic_auth_user is defined
- execute_isamcfg_basic_auth_passwd is defined
- execute_isamcfg_reverseproxy_id is defined
- execute_isamcfg_reverseproxy_id in execute_isamcfg_reverseproxy_list
notify:
- Commit Changes
- Restart Reverse Proxy
- Restart Reverse Proxy
4 changes: 3 additions & 1 deletion export_application_logs/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
galaxy_info:
author: IBM
description: Role to export application log files. A downloads folder has to exist in the inventory folder. Inside the downloads folder a folder for each appliance hostname is necessary.
description: >
Role to export application log files. A downloads folder has to exist in the inventory folder.
Inside the downloads folder a folder for each appliance hostname is necessary.
company: IBM

license: Apache
Expand Down
6 changes: 5 additions & 1 deletion import_personal_cert/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
label : "{{ import_personal_cert_label }}"
cert : "{{ import_personal_cert_cert }}"
password : "{{ import_personal_cert_password }}"
when: import_personal_cert_kdb_id is defined and import_personal_cert_label is defined and import_personal_cert_cert is defined and import_personal_cert_password is defined
when:
- import_personal_cert_kdb_id is defined
- import_personal_cert_label is defined
- import_personal_cert_cert is defined
- import_personal_cert_password is defined
notify:
- Commit Changes
5 changes: 4 additions & 1 deletion set_access_control_policy/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@
dialect: "{{ set_access_control_policy_dialect }}"
predefined: "{{ set_access_control_policy_predefined }}"
new_name: "{{ set_access_control_policy_new_name }}"
when: set_access_control_policy_name is defined and set_access_control_policy_policy_file is defined and set_access_control_policy_attributesrequired is defined
when:
- set_access_control_policy_name is defined
- set_access_control_policy_policy_file is defined
- set_access_control_policy_attributesrequired is defined
notify: Commit Changes
7 changes: 6 additions & 1 deletion set_federation/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@
configuration: "{{ set_federation_configuration }}"
templateName: "{{ set_federation_templateName }}"
new_name: "{{ set_federation_new_name }}"
when: set_federation_name is defined and set_federation_protocol is defined and set_federation_role is defined and set_federation_configuration is defined and set_federation_templateName is defined
when:
- set_federation_name is defined
- set_federation_protocol is defined
- set_federation_role is defined
- set_federation_configuration is defined
- set_federation_templateName is defined
notify:
- Commit Changes
- Reload Liberty Runtime
7 changes: 6 additions & 1 deletion set_junction/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,9 @@
http2_junction: "{{ set_junction_http2_junction }}"
http2_proxy: "{{ set_junction_http2_proxy }}"
sni_name: "{{ set_junction_sni_name }}"
when: set_junction_junction_point is defined and set_junction_junction_type is defined and set_junction_reverseproxy_id is defined and set_junction_server_hostname is defined and set_junction_server_port is defined
when:
- set_junction_junction_point is defined
- set_junction_junction_type is defined
- set_junction_reverseproxy_id is defined
- set_junction_server_hostname is defined
- set_junction_server_port is defined
8 changes: 4 additions & 4 deletions set_ldap_user_attr/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set_ldap_user_attr
=========

Set LDAP user attribute
Set LDAP user attribute

Requirements
------------
Expand All @@ -26,7 +26,7 @@ Required variables are:
```
present: all given values will be added if they are missing
absent: all given values will be removed if present.
exact: the set of values will be forced to exactly those provided and no others.
exact: the set of values will be forced to exactly those provided and no others.
```

**ldap_user_attributes**: This is a JSON object which contains 'dn' string and a JSON array 'attributes'. For example:
Expand All @@ -41,14 +41,14 @@ Required variables are:
Dependencies
------------

This role depends on the Ansible module ldap-attr which will be part of Ansible 2.3, not official released yet. We have included it under the /library directory. Once it is officially released by Ansible we will remove it from this role.
This role depends on the Ansible module ldap-attr which will be part of Ansible 2.3, not official released yet. We have included it under the /library directory. Once it is officially released by Ansible we will remove it from this role.

https://docs.ansible.com/ansible/ldap_attr_module.html

Example Playbook
----------------

A sample playbook *test.yml* has been placed under *tests/* subdirectory.
A sample playbook *test.yml* has been placed under *tests/* subdirectory.

```
---
Expand Down
4 changes: 2 additions & 2 deletions set_ldap_user_attr/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ ldap_bind_dn: "cn=root,secAuthority=default"
ldap_bind_pw: "passw0rd"
ldap_server_uri: "ldaps://192.168.42.101:636/"

# ldap_state:
# ldap_state:
# present: all given values will be added if they are missing
# absent: all given values will be removed if present.
# exact: the set of values will be forced to exactly those provided and no others.
# exact: the set of values will be forced to exactly those provided and no others.
ldap_state: "present"

ldap_user_attributes:
Expand Down
8 changes: 7 additions & 1 deletion set_partner/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@
role: "{{ set_partner_role }}"
configuration: "{{ set_partner_configuration }}"
templateName: "{{ set_partner_templateName }}"
when: set_partner_federation_name is defined and set_partner_partner_name is defined and set_partner_enabled is defined and set_partner_role is defined and set_partner_configuration is defined and set_partner_templateName is defined
when:
- set_partner_federation_name is defined
- set_partner_partner_name is defined
- set_partner_enabled is defined
- set_partner_role is defined
- set_partner_configuration is defined
- set_partner_templateName is defined
notify:
- Commit Changes
- Reload Liberty Runtime
5 changes: 4 additions & 1 deletion update_management_ssl_cert/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
galaxy_info:
author: IFC
description: Role to update the management SSL certificate key store. The certificate container file must be PKCS12 format (.p12 file) and can contain only a single certificate.
description: >
Role to update the management SSL certificate key store.
The certificate container file must be PKCS12 format (.p12 file) and can contain only
a single certificate.
company: IFC

license: Apache
Expand Down

0 comments on commit 27101b7

Please sign in to comment.