2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProvider.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProvider.java
index 5a8730bff..8da2f09ae 100755
--- a/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProvider.java
+++ b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProvider.java
@@ -45,6 +45,7 @@ import org.apache.commons.lang.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
+import org.onap.ccsdk.sli.core.utils.common.EnvProperties;
 import org.onap.ccsdk.sli.plugins.grtoolkit.connection.ConnectionManager;
 import org.onap.ccsdk.sli.plugins.grtoolkit.connection.ConnectionResponse;
 import org.onap.ccsdk.sli.plugins.grtoolkit.data.AdminHealth;
@@ -183,7 +184,7 @@ public class GrToolkitProvider implements AutoCloseable, GrToolkitService, DataT
      */
     private void setProperties() {
         log.info("Loading properties from {}", PROPERTIES_FILE);
-        properties = new Properties();
+        properties = new EnvProperties();
         File propertiesFile = new File(PROPERTIES_FILE);
         if(!propertiesFile.exists()) {
             log.warn("setProperties(): Properties file not found.");
diff --git a/plugins/grToolkit/provider/src/main/resources/gr-toolkit.properties b/plugins/grToolkit/provider/src/main/resources/gr-toolkit.properties
index e3463df08..bce40620e 100755
--- a/plugins/grToolkit/provider/src/main/resources/gr-toolkit.properties
+++ b/plugins/grToolkit/provider/src/main/resources/gr-toolkit.properties
@@ -24,7 +24,7 @@ adm.fqdn=
 adm.healthcheck=/healthcheck
 adm.port.http=8181
 adm.port.ssl=8443
-controller.credentials=admin:admin
+controller.credentials=${ODL_USER}:${ODL_PASSWORD}
 controller.useSsl=true
 controller.port.http=8181
 controller.port.ssl=8443