From: Dan Timoney <dtimoney@att.com>
Date: Tue, 19 Feb 2019 15:38:43 +0000 (+0000)
Subject: Merge "make ansible container backward compatible"
X-Git-Tag: 0.4.1~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=a794b4f8e543361e237f70aeae6bca2347f8dfee;hp=9bec848ff9fc2c421f25bd0f998f67685f8b53aa

Merge "make ansible container backward compatible"
---

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 58f71a9d..5cf26178 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -109,6 +109,13 @@
 			<classifier>repo</classifier>
 			<type>zip</type>
 		</dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>grpc-client-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.adaptors</groupId>
 			<artifactId>mdsal-resource-installer</artifactId>
diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
index 8b26b490..af6674ad 100644
--- a/odlsli/odlsli-ubuntu/pom.xml
+++ b/odlsli/odlsli-ubuntu/pom.xml
@@ -109,6 +109,13 @@
 			<classifier>repo</classifier>
 			<type>zip</type>
 		</dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>grpc-client-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
 		<dependency>
 			<groupId>org.onap.ccsdk.sli.adaptors</groupId>
 			<artifactId>mdsal-resource-installer</artifactId>
diff --git a/saltstack-server/src/main/docker/Dockerfile b/saltstack-server/src/main/docker/Dockerfile
index f2e486eb..eeebef4c 100644
--- a/saltstack-server/src/main/docker/Dockerfile
+++ b/saltstack-server/src/main/docker/Dockerfile
@@ -3,11 +3,11 @@ FROM centos:7
 
 RUN yum clean all && \
       yum install -y yum install epel-release && \
-      yum install -y https://repo.saltstack.com/yum/redhat/salt-repo-latest-1.el7.noarch.rpm && \
+      yum install -y https://repo.saltstack.com/yum/redhat/salt-repo-latest-2.el7.noarch.rpm && \
       yum update -y && \
       yum install -y sudo git tmux vim salt-master salt-minion && \
       yum clean all
 
 EXPOSE 4505 4506
 
-CMD /usr/bin/salt-master -d; /bin/bash
\ No newline at end of file
+CMD /usr/bin/salt-master -d; /bin/bash