fixup string default

Alfresco · Sep 29, 2023 · 803b563 · 803b563
1 parent 35bbeb0
commit 803b563
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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: ''