chore: update dep on jcliff -> wildfly

main
Guido Grazioli 2022-02-08 15:15:27 +01:00
parent cbb8ed4993
commit a800517422
No known key found for this signature in database
GPG Key ID: 22C8C31EF2BC093B
6 changed files with 29 additions and 13 deletions

View File

@ -27,6 +27,7 @@ jobs:
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install yamllint 'molecule[docker]~=3.5.2' ansible-core flake8 ansible-lint voluptuous pip install yamllint 'molecule[docker]~=3.5.2' ansible-core flake8 ansible-lint voluptuous
pip install -r requirements.txt
- name: Create default collection path - name: Create default collection path
run: | run: |

14
CONTRIBUTING.md 100644
View File

@ -0,0 +1,14 @@
## Contributor's Guidelines
- All YAML files named with '.yml' extension
- Use spaces around jinja variables. `{{ var }}` over `{{var}}`
- Variables that are internal to the role should be lowercase and start with the role name
- Keep roles self contained - Roles should avoid including tasks from other roles when possible
- Plays should do nothing more than include a list of roles except where `pre_tasks` and `post_tasks` are required when possible
- Separators - Use valid name, ie. underscores (e.g. `my_role` `my_playbook`) not dashes (`my-role`)
- Paths - When defining paths, do not include trailing slashes (e.g. `my_path: /foo` not `my_path: /foo/`). When concatenating paths, follow the same convention (e.g. `{{ my_path }}/bar` not `{{ my_path }}bar`)
- Indentation - Use 2 spaces for each indent
- `vars/` vs `defaults/` - internal or interpolated variables that don't need to change or be overridden by user go in `vars/`, those that a user would likely override, go under `defaults/` directory
- All arguments have a specification in `meta/argument_specs.yml`
- All playbooks/roles should be focused on compatibility with Ansible Tower

View File

@ -2,8 +2,8 @@
collections: collections:
- name: middleware_automation.redhat_csp_download - name: middleware_automation.redhat_csp_download
version: ">=1.2.1" version: ">=1.2.1"
- name: middleware_automation.jcliff - name: middleware_automation.wildfly
version: ">=0.0.19" version: ">=0.0.5"
- name: community.general - name: community.general
- name: community.docker - name: community.docker
version: ">=1.9.1" version: ">=1.9.1"

View File

@ -2,6 +2,6 @@
collections: collections:
- name: middleware_automation.redhat_csp_download - name: middleware_automation.redhat_csp_download
version: ">=1.2.1" version: ">=1.2.1"
- name: middleware_automation.jcliff - name: middleware_automation.wildfly
version: ">=0.0.19" version: ">=0.0.5"
- name: community.general - name: community.general

View File

@ -160,7 +160,6 @@
- name: "Install {{ keycloak_jdbc_engine }} driver" - name: "Install {{ keycloak_jdbc_engine }} driver"
include_role: include_role:
name: wildfly_driver name: wildfly_driver
tasks_from: jdbc_driver.yml
vars: vars:
wildfly_user: "{{ keycloak_service_user }}" wildfly_user: "{{ keycloak_service_user }}"
jdbc_driver_module_dir: "{{ keycloak_jdbc[keycloak_jdbc_engine].driver_module_dir }}" jdbc_driver_module_dir: "{{ keycloak_jdbc[keycloak_jdbc_engine].driver_module_dir }}"

View File

@ -12,23 +12,25 @@ keycloak_auth_client: admin-cli
### List of Keycloak User Federation ### List of Keycloak User Federation
keycloak_user_federation: [] keycloak_user_federation: []
### Keycloak realm client defaults ### Keycloak realms, clients, roles
# list of clients to create in the realm # list of clients to create in the realm
# #
# Refer to the playbook for a comprehensive example. # Refer to the playbook for a comprehensive example.
# Also refer to meta/argument_specs.yml for specifications.
# #
# Each client has the form: # Each client has the form:
# { name: '', roles: [], realm: '', public_client: bool, web_origins: '', users: [] } # { name: '', roles: [], realm: '', public_client: bool, web_origins: '', users: [] }
# where roles is a list of default role names for the client # where roles is a list of default role names for the client
# and users is a list of account, see below for the format definition # and users is a list of account, see below for the format definition
# an empty name will skip the creation of the client # an empty name will skip the creation of the client
keycloak_clients: #
- name: '' #keycloak_clients:
roles: "{{ keycloak_client_default_roles }}" # - name: ''
realm: "{{ keycloak_realm }}" # roles: "{{ keycloak_client_default_roles }}"
public_client: "{{ keycloak_client_public }}" # realm: "{{ keycloak_realm }}"
web_origins: "{{ keycloak_client_web_origins }}" # public_client: "{{ keycloak_client_public }}"
users: "{{ keycloak_client_users }}" # web_origins: "{{ keycloak_client_web_origins }}"
# users: "{{ keycloak_client_users }}"
# list of roles to create in the client # list of roles to create in the client
keycloak_client_default_roles: [] keycloak_client_default_roles: []