update

jboss-openshift · Aug 1, 2017 · ffc1483 · ffc1483
1 parent 9e95bd9
commit ffc1483
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/os-jdg7-launch/added/launch/infinispan-config.sh b/os-jdg7-launch/added/launch/infinispan-config.sh
@@ -590,7 +590,12 @@ function configure_infinispan_endpoint() {
           fi
 
           if [ -n "${HTTPS_NAME}" -a -n "${HTTPS_PASSWORD}" -a -n "${HTTPS_KEYSTORE_DIR}" -a -n "${HTTPS_KEYSTORE}" ] ; then
-            encryption="<encryption security-realm=\"ApplicationRealm\" />"
+            if [ -n "$REST_SECURITY_DOMAIN" ]; then
+              encryption="<encryption security-realm=\"$REST_SECURITY_DOMAIN\" />"      
+            else
+              encryption="<encryption security-realm=\"ApplicationRealm\" />"
+            fi
+
             rest="\
                 <rest-connector name=\"rest-ssl\" socket-binding=\"rest-ssl\" cache-container=\"clustered\"> \
                    $rest_authentication \

diff --git a/tests/features/datagrid/datagrid_rest.feature b/tests/features/datagrid/datagrid_rest.feature
@@ -51,7 +51,7 @@ Feature: Openshift JDG REST tests
       | HTTPS_KEYSTORE_DIR                           | /etc/datagrid-secret-volume            | 
       | HTTPS_KEYSTORE                               | keystore.jks                           |
       | REST_SECURITY_DOMAIN                         | ManagementRealm                        |
-Then XML file /opt/datagrid/standalone/configuration/clustered-openshift.xml should contain value ApplicationRealm on XPath //*[local-name()='rest-connector']/*[local-name()='encryption']/@security-realm
+Then XML file /opt/datagrid/standalone/configuration/clustered-openshift.xml should contain value ManagementRealm on XPath //*[local-name()='rest-connector']/*[local-name()='encryption']/@security-realm
 
   @jboss-datagrid-7/datagrid71-openshift
   Scenario: Should create security realm that maps to security domain
@@ -67,3 +67,5 @@ Then XML file /opt/datagrid/standalone/configuration/clustered-openshift.xml sho
     Then XML file /opt/datagrid/standalone/configuration/clustered-openshift.xml should contain value jdg-openshift on XPath //*[local-name()='security-realms']/*[local-name()='security-realm']/@name
     Then XML file /opt/datagrid/standalone/configuration/clustered-openshift.xml should contain value jdg-openshift on XPath //*[local-name()='security-realms']/*[local-name()='security-realm'][@name='jdg-openshift']/*[local-name()='authentication']/*[local-name()='jaas']/@name
     Then XML file /opt/datagrid/standalone/configuration/clustered-openshift.xml should contain value mykeystorepass on XPath //*[local-name()='security-realms']/*[local-name()='security-realm'][@name='jdg-openshift']/*[local-name()='server-identities']/*[local-name()='ssl']/*[local-name()='keystore']/@keystore-password
+    Then XML file /opt/datagrid/standalone/configuration/clustered-openshift.xml should contain value jdg-openshift on XPath //*[local-name()='rest-connector']/*[local-name()='encryption']/@security-realm
+