From 803b563cf9f278ad2e6225ceb11e8077df65e369 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 28 Sep 2023 18:05:00 +0200 Subject: [PATCH] fixup string default --- molecule/identity/verify.yml | 6 +++--- roles/repository/defaults/main.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/molecule/identity/verify.yml b/molecule/identity/verify.yml index c1bca107e..0433175cb 100644 --- a/molecule/identity/verify.yml +++ b/molecule/identity/verify.yml @@ -18,19 +18,19 @@ src: /etc/opt/alfresco/content-services/classpath/alfresco-global.properties register: slurp_global_properties - - name: Check reindex service contains the expected ExecStart line + - name: Check alfresco-global.properties contains expected identity properties vars: global_properties_content: "{{ slurp_global_properties['content'] | b64decode }}" expected_auth_chain: "authentication.chain=identity-service1:identity-service,alfrescoNtlm1:alfrescoNtlm" expected_service_resource: "identity-service.resource=alfresco" expected_service_credentials: "identity-service.credentials.secret=" - expected_auth_url: "identity-service.auth-server-url=http://172.17.0.2:8082/" + expected_auth_url_regex: 'identity-service\.auth-server-url=http:\/\/.*\/' ansible.builtin.assert: that: - "expected_auth_chain in global_properties_content" - "expected_service_resource in global_properties_content" - "expected_service_credentials in global_properties_content" - - "expected_auth_url in global_properties_content" + - "global_properties_content | regex_search(expected_auth_url_regex)" msg: "{{ global_properties_content }}" - name: Fetch realm diff --git a/roles/repository/defaults/main.yml b/roles/repository/defaults/main.yml index 4dfed60ad..d25a82952 100644 --- a/roles/repository/defaults/main.yml +++ b/roles/repository/defaults/main.yml @@ -88,4 +88,4 @@ repository_monitored_startup_timeout_seconds: 300 # Identity service arguments repository_identity_url: '' repository_identity_client_id: alfresco -repository_identity_client_secret: null +repository_identity_client_secret: ''