diff --git a/changelogs/fragments/dispatcher_eda_roles.yml b/changelogs/fragments/dispatcher_eda_roles.yml index 905c8c23a..27858c3a0 100644 --- a/changelogs/fragments/dispatcher_eda_roles.yml +++ b/changelogs/fragments/dispatcher_eda_roles.yml @@ -1,3 +1,4 @@ --- bugfixes: - added missing references to eda_credential_types and eda_event_streams in dispatcher defaults + - some module arguments or it's values weren't recognized diff --git a/roles/eda_controller_tokens/tasks/main.yml b/roles/eda_controller_tokens/tasks/main.yml index 2cfa1a23e..1b61acc6a 100644 --- a/roles/eda_controller_tokens/tasks/main.yml +++ b/roles/eda_controller_tokens/tasks/main.yml @@ -5,7 +5,7 @@ name: "{{ __token_item.name }}" description: "{{ __token_item.description | default(omit) }}" token: "{{ __token_item.token | default(omit) }}" - controller_host: "{{ aap_hostname | default(omit, true) }}" + controller_host: "https://{{ aap_hostname | default(omit, true) }}" controller_username: "{{ aap_username | default(omit, true) }}" controller_password: "{{ aap_password | default(omit, true) }}" request_timeout: "{{ aap_request_timeout | default(omit, true) }}" diff --git a/roles/eda_credential_types/tasks/main.yml b/roles/eda_credential_types/tasks/main.yml index 2d10df0a8..c1964c34c 100644 --- a/roles/eda_credential_types/tasks/main.yml +++ b/roles/eda_credential_types/tasks/main.yml @@ -8,7 +8,7 @@ inputs: "{{ __credential_type_item.inputs | default(omit) }}" injectors: "{{ __credential_type_item.injectors | default(omit) }}" state: "{{ __credential_type_item.state | default(eda_state | default('present')) }}" - controller_host: "{{ aap_hostname | default(omit, true) }}" + controller_host: "https://{{ aap_hostname | default(omit, true) }}" controller_username: "{{ aap_username | default(omit, true) }}" controller_password: "{{ aap_password | default(omit, true) }}" request_timeout: "{{ aap_request_timeout | default(omit, true) }}" diff --git a/roles/eda_credentials/tasks/main.yml b/roles/eda_credentials/tasks/main.yml index 54368d5b6..4340fd2c9 100644 --- a/roles/eda_credentials/tasks/main.yml +++ b/roles/eda_credentials/tasks/main.yml @@ -9,7 +9,7 @@ credential_type_name: "{{ __credential_item.credential_type | mandatory }}" inputs: "{{ __credential_item.inputs | default(omit) }}" state: "{{ __credential_item.state | default(eda_state | default('present')) }}" - controller_host: "{{ aap_hostname | default(omit, true) }}" + controller_host: "https://{{ aap_hostname | default(omit, true) }}" controller_username: "{{ aap_username | default(omit, true) }}" controller_password: "{{ aap_password | default(omit, true) }}" request_timeout: "{{ aap_request_timeout | default(omit, true) }}" diff --git a/roles/eda_decision_environments/tasks/main.yml b/roles/eda_decision_environments/tasks/main.yml index 22f43e4d0..ecbb78a0a 100644 --- a/roles/eda_decision_environments/tasks/main.yml +++ b/roles/eda_decision_environments/tasks/main.yml @@ -9,7 +9,7 @@ credential: "{{ __de_item.credential | default(omit) }}" organization_name: "{{ __de_item.organization | default(omit) }}" state: "{{ __de_item.state | default(eda_state | default('present')) }}" - controller_host: "{{ aap_hostname | default(omit, true) }}" + controller_host: "https://{{ aap_hostname | default(omit, true) }}" controller_username: "{{ aap_username | default(omit, true) }}" controller_password: "{{ aap_password | default(omit, true) }}" request_timeout: "{{ aap_request_timeout | default(omit, true) }}" diff --git a/roles/eda_event_streams/tasks/main.yml b/roles/eda_event_streams/tasks/main.yml index ac43816bd..7bcbc40cb 100644 --- a/roles/eda_event_streams/tasks/main.yml +++ b/roles/eda_event_streams/tasks/main.yml @@ -9,7 +9,7 @@ headers: "{{ __event_stream_item.headers | default(omit) }}" forward_events: "{{ __event_stream_item.forward_events | default(omit) }}" state: "{{ __event_stream_item.state | default(eda_state | default('present')) }}" - controller_host: "{{ aap_hostname | default(omit, true) }}" + controller_host: "https://{{ aap_hostname | default(omit, true) }}" controller_username: "{{ aap_username | default(omit, true) }}" controller_password: "{{ aap_password | default(omit, true) }}" request_timeout: "{{ aap_request_timeout | default(omit, true) }}" diff --git a/roles/eda_projects/tasks/main.yml b/roles/eda_projects/tasks/main.yml index ec117f950..807b1f602 100644 --- a/roles/eda_projects/tasks/main.yml +++ b/roles/eda_projects/tasks/main.yml @@ -9,7 +9,7 @@ credential: "{{ __project_item.credential | default(omit) }}" organization_name: "{{ __project_item.organization | default(omit) }}" state: "{{ __project_item.state | default(eda_state | default('present')) }}" - controller_host: "{{ aap_hostname | default(omit, true) }}" + controller_host: "https://{{ aap_hostname | default(omit, true) }}" controller_username: "{{ aap_username | default(omit, true) }}" controller_password: "{{ aap_password | default(omit, true) }}" request_timeout: "{{ aap_request_timeout | default(omit, true) }}" diff --git a/roles/eda_rulebook_activations/tasks/main.yml b/roles/eda_rulebook_activations/tasks/main.yml index a76087675..769757da1 100644 --- a/roles/eda_rulebook_activations/tasks/main.yml +++ b/roles/eda_rulebook_activations/tasks/main.yml @@ -4,21 +4,21 @@ ansible.eda.rulebook_activation: name: "{{ __ra_item.name }}" description: "{{ __ra_item.description | default(omit) }}" - project: "{{ __ra_item.project | default(omit) }}" - rulebook: "{{ __ra_item.rulebook | default(omit) }}" + project_name: "{{ __ra_item.project_name | default(omit) }}" + rulebook_name: "{{ __ra_item.rulebook_name | default(omit) }}" decision_environment: "{{ __ra_item.decision_environment | default(omit) }}" awx_token: "{{ __ra_item.awx_token | default(omit) }}" restart_policy: "{{ __ra_item.restart_policy | default(omit) }}" extra_vars: "{{ __ra_item.extra_vars | default(omit) }}" enabled: "{{ __ra_item.enabled | default(omit) }}" - organization: "{{ __ra_item.organization | default(omit) }}" + organization_name: "{{ __ra_item.organization_name | default(omit) }}" eda_credentials: "{{ __ra_item.eda_credentials | default(omit) }}" k8s_service_name: "{{ __ra_item.k8s_service_name | default(omit) }}" swap_single_source: "{{ __ra_item.swap_single_source | default(omit) }}" event_streams: "{{ __ra_item.event_streams | default(omit) }}" log_level: "{{ __ra_item.log_level | default(omit) }}" state: "{{ __ra_item.state | default(eda_state | default('present')) }}" - controller_host: "{{ aap_hostname | default(omit, true) }}" + controller_host: "https://{{ aap_hostname | default(omit, true) }}" controller_username: "{{ aap_username | default(omit, true) }}" controller_password: "{{ aap_password | default(omit, true) }}" request_timeout: "{{ aap_request_timeout | default(omit, true) }}" diff --git a/roles/eda_users/tasks/main.yml b/roles/eda_users/tasks/main.yml index 9b8bc5a3d..d8949b59e 100644 --- a/roles/eda_users/tasks/main.yml +++ b/roles/eda_users/tasks/main.yml @@ -12,7 +12,7 @@ is_superuser: "{{ __user_item.is_superuser | default(omit) }}" roles: "{{ __user_item.roles | default(omit) }}" state: "{{ __user_item.state | default(eda_state | default('present')) }}" - controller_host: "{{ aap_hostname | default(omit, true) }}" + controller_host: "https://{{ aap_hostname | default(omit, true) }}" controller_username: "{{ aap_username | default(omit, true) }}" controller_password: "{{ aap_password | default(omit, true) }}" request_timeout: "{{ aap_request_timeout | default(omit, true) }}"