diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index ea8ad61..d2dd682 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -1,7 +1,8 @@ --- dependency: - name: shell - command: ansible-galaxy collection install -r molecule/default/requirements.yml -p $HOME/.ansible/collections --force-with-deps + name: galaxy + options: + requirements-file: molecule/requirements.yml driver: name: docker lint: | @@ -16,14 +17,12 @@ platforms: port_bindings: - "8080/tcp" - "8443/tcp" - - "8009/tcp" + - "8009/tcp" provisioner: name: ansible config_options: defaults: interpreter_python: auto_silent - ssh_connection: - pipelining: false playbooks: prepare: prepare.yml converge: converge.yml @@ -33,7 +32,7 @@ provisioner: localhost: ansible_python_interpreter: "{{ ansible_playbook_python }}" env: - ANSIBLE_FORCE_COLOR: "true" + ANSIBLE_FORCE_COLOR: "true" verifier: name: ansible scenario: diff --git a/molecule/default/requirements.yml b/molecule/requirements.yml similarity index 100% rename from molecule/default/requirements.yml rename to molecule/requirements.yml diff --git a/roles/keycloak/defaults/main.yml b/roles/keycloak/defaults/main.yml index 4543f82..88ff001 100644 --- a/roles/keycloak/defaults/main.yml +++ b/roles/keycloak/defaults/main.yml @@ -2,7 +2,7 @@ ### Configuration specific to keycloak keycloak_version: 18.0.2 keycloak_archive: "keycloak-legacy-{{ keycloak_version }}.zip" -keycloak_download_url: "https://github.com/keycloak/keycloak/releases/download/{{ keycloak_version }}/{{ keycloak_archive }}" +keycloak_download_url: "https://github.com/keycloak/keycloak/releases/download/{{ keycloak_version }}/{{ keycloak_archive }}" keycloak_download_url_9x: "https://downloads.jboss.org/keycloak/{{ keycloak_version }}/{{ keycloak_archive }}" keycloak_installdir: "{{ keycloak_dest }}/keycloak-{{ keycloak_version }}" keycloak_offline_install: False @@ -21,6 +21,8 @@ keycloak_service_group: keycloak keycloak_service_pidfile: "/run/keycloak.pid" keycloak_service_name: keycloak keycloak_service_desc: Keycloak +keycloak_service_start_delay: 10 +keycloak_service_start_retries: 25 keycloak_configure_firewalld: False diff --git a/roles/keycloak/meta/argument_specs.yml b/roles/keycloak/meta/argument_specs.yml index 4d36f4c..f58b1d4 100644 --- a/roles/keycloak/meta/argument_specs.yml +++ b/roles/keycloak/meta/argument_specs.yml @@ -266,6 +266,14 @@ argument_specs: default: "Keycloak" description: "systemd description for keycloak" type: "str" + keycloak_service_start_delay: + default: "10" + description: "Expected delay in ms before the service is expected to be available after start." + type: "int" + keycloak_service_start_retries: + default: "25" + description: "How many time should Ansible retry to connect to the service after it was started, before failing." + type: "int" keycloak_no_log: default: true type: "bool" diff --git a/roles/keycloak/tasks/start_keycloak.yml b/roles/keycloak/tasks/start_keycloak.yml index bdf42f9..524df80 100644 --- a/roles/keycloak/tasks/start_keycloak.yml +++ b/roles/keycloak/tasks/start_keycloak.yml @@ -11,5 +11,5 @@ url: "{{ keycloak.health_url }}" register: keycloak_status until: keycloak_status.status == 200 - retries: 25 - delay: 10 \ No newline at end of file + retries: "{{ keycloak_service_start_retries }}" + delay: "{{ keycloak_service_start_delay }}"