3 files changed, 10 insertions, 3 deletions

diff --git a/deployment/zip/src/main/release/conf/oclip-grpc-server.properties b/deployment/zip/src/main/release/conf/oclip-grpc-server.properties
index 972fdebb..c7454394 100644
--- a/deployment/zip/src/main/release/conf/oclip-grpc-server.properties
+++ b/deployment/zip/src/main/release/conf/oclip-grpc-server.properties
@@ -12,4 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-oclip.grpc_server_port=50051
\ No newline at end of file
+oclip.grpc_server_port=50051
+oclip.grpc_server_host=localhost
\ No newline at end of file
diff --git a/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java b/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
index afbd7682..0c2f00b5 100644
--- a/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
+++ b/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
@@ -55,6 +55,7 @@ public class OpenInterfaceGrpcServer {
 
       private static final String CONF_FILE = "oclip-grpc-server.properties";
       private static final String CONF_SERVER_PORT = "oclip.grpc_server_port";
+      private static final String CONF_SERVER_HOST = "oclip.grpc_server_host";
 
       static {
           OnapCommandConfig.addProperties(CONF_FILE);
@@ -64,6 +65,10 @@ public class OpenInterfaceGrpcServer {
       private void start(String portArg) throws IOException {
         /* The port on which the server should run */
         int port = Integer.parseInt(portArg == null ? OnapCommandConfig.getPropertyValue(CONF_SERVER_PORT) : portArg);
+        String host = OnapCommandConfig.getPropertyValue(CONF_SERVER_HOST);
+        if (host == null) {
+            host = InetAddress.getLocalHost().getHostAddress().trim();
+        }
         server = ServerBuilder.forPort(port)
             .addService(new OpenInterfaceGrpcImpl())
             .build()
@@ -71,7 +76,7 @@ public class OpenInterfaceGrpcServer {
         logger.info("Server started, listening on " + port);
 
         try {
-            OnapCommandRegistrar.getRegistrar().setHost(InetAddress.getLocalHost().getHostAddress().trim());
+            OnapCommandRegistrar.getRegistrar().setHost(host);
             OnapCommandRegistrar.getRegistrar().setPort(port);
         } catch (OnapCommandException e) {
             //Never Occurs
diff --git a/grpc/grpc-server/src/main/resources/oclip-grpc-server.properties b/grpc/grpc-server/src/main/resources/oclip-grpc-server.properties
index 972fdebb..c7454394 100644
--- a/grpc/grpc-server/src/main/resources/oclip-grpc-server.properties
+++ b/grpc/grpc-server/src/main/resources/oclip-grpc-server.properties
@@ -12,4 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-oclip.grpc_server_port=50051
\ No newline at end of file
+oclip.grpc_server_port=50051
+oclip.grpc_server_host=localhost
\ No newline at end of file