set base images

Change-Id: Ia3c978ce5de499982d1945378855f2bc672b3882
Issue-ID: SDC-1265
Signed-off-by: Michael Lando <ml636r@att.com>

diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile
index c1069c8..c19fe2a 100644 (file)
--- a/asdctool/sdc-cassandra-init/Dockerfile
+++ b/asdctool/sdc-cassandra-init/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-cqlsh:1.3.0-SNAPSHOT-latest
+FROM onap/base_sdc-cqlsh:1.3.0
 
 COPY chef-solo /root/chef-solo/
 

diff --git a/catalog-be/sdc-backend-init/Dockerfile b/catalog-be/sdc-backend-init/Dockerfile
index 33d3760..f4515ee 100644 (file)
--- a/catalog-be/sdc-backend-init/Dockerfile
+++ b/catalog-be/sdc-backend-init/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-python:1.3.0-SNAPSHOT-latest
+FROM onap/base_sdc-python:1.3.0
 
 COPY chef-solo /root/chef-solo/
 

diff --git a/catalog-be/sdc-backend/Dockerfile b/catalog-be/sdc-backend/Dockerfile
index ed54c8a..506f001 100644 (file)
--- a/catalog-be/sdc-backend/Dockerfile
+++ b/catalog-be/sdc-backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-jetty:1.3.0-SNAPSHOT-latest
+FROM onap/base_sdc-jetty:1.3.0
 
 COPY chef-solo /root/chef-solo/
 

diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
index a390a80..0d6d26d 100644 (file)
--- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
+++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
@@ -660,17 +660,17 @@ environmentContext:
        - General_Non-Revenue
 
 dmaapConsumerConfiguration:
-    hosts: olsd004.wnsnet.attws.com:3905
-    consumerGroup: asdc
+    hosts: localhost:3905
+    consumerGroup: sdc
     consumerId: mama
     timeoutMs: 15000
     limit: 1
     pollingInterval: 2
-    topic: com.att.sdc.23911-SDCforTestDev-v001
+    topic: topic
     latitude: 32.109333
     longitude: 34.855499
     version: 1.0
-    serviceName: dmaap-v1.dev.dmaap.dt.saat.acsi.att.com/events
+    serviceName: localhost/events
     environment: TEST
     partner: BOT_R
     routeOffer: MR1
@@ -684,8 +684,8 @@ dmaapConsumerConfiguration:
     dme2preferredRouterFilePath: DME2preferredRouter.txt
     timeLimitForNotificationHandleMs: 120000 
     credential:
-        username: m09875@sdc.att.com
-        password: hmXYcznAljMSisdy8zgcag==
+        username: user
+        password:
         
 dmeConfiguration:
     dme2Search: DME2SEARCH

diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile
index 75cbd8c..f276422 100644 (file)
--- a/catalog-fe/sdc-frontend/Dockerfile
+++ b/catalog-fe/sdc-frontend/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-jetty:1.3.0-SNAPSHOT-latest
+FROM onap/base_sdc-jetty:1.3.0
 
 COPY chef-solo /root/chef-solo/
 

diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
index a3e56fd..339c851 100644 (file)
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-jetty:1.3.0-SNAPSHOT-latest
+FROM onap/base_sdc-jetty:1.3.0
 
 COPY chef-solo /root/chef-solo/
 

diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
index 597c5d2..587baec 100644 (file)
--- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
+++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-cqlsh:1.2.0-SNAPSHOT-latest
+FROM onap/base_sdc-cqlsh:1.3.0
 
 COPY init_keyspaces.cql /root/
 

diff --git a/sdc-os-chef/sdc-cassandra/Dockerfile b/sdc-os-chef/sdc-cassandra/Dockerfile
index 2f8ecb7..f9ae641 100644 (file)
--- a/sdc-os-chef/sdc-cassandra/Dockerfile
+++ b/sdc-os-chef/sdc-cassandra/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-cassandra:1.3.0-SNAPSHOT-latest
+FROM onap/base_sdc-cassandra:1.3.0
 
 COPY chef-solo /root/chef-solo/
 

diff --git a/sdc-os-chef/sdc-elasticsearch/Dockerfile b/sdc-os-chef/sdc-elasticsearch/Dockerfile
index 9b9883e..fd8e2e9 100644 (file)
--- a/sdc-os-chef/sdc-elasticsearch/Dockerfile
+++ b/sdc-os-chef/sdc-elasticsearch/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-elasticsearch:1.3.0-SNAPSHOT-latest
+FROM onap/base_sdc-elasticsearch:1.3.0
 
 COPY chef-solo /root/chef-solo/
 

diff --git a/sdc-os-chef/sdc-init-elasticsearch/Dockerfile b/sdc-os-chef/sdc-init-elasticsearch/Dockerfile
index cfcf4b9..7d263ba 100644 (file)
--- a/sdc-os-chef/sdc-init-elasticsearch/Dockerfile
+++ b/sdc-os-chef/sdc-init-elasticsearch/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-sanity:1.3.0-SNAPSHOT-latest
+FROM onap/base_sdc-sanity:1.3.0
 
 COPY chef-solo /root/chef-solo/
 

diff --git a/sdc-os-chef/sdc-kibana/Dockerfile b/sdc-os-chef/sdc-kibana/Dockerfile
index c62f1db..8bbaab0 100644 (file)
--- a/sdc-os-chef/sdc-kibana/Dockerfile
+++ b/sdc-os-chef/sdc-kibana/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-kibana:1.3.0-SNAPSHOT-latest
+FROM onap/base_sdc-kibana:1.3.0
 
 COPY chef-solo /root/chef-solo/
 

diff --git a/test-apis-ci/sdc-api-tests/Dockerfile b/test-apis-ci/sdc-api-tests/Dockerfile
index d419224..23d7e58 100644 (file)
--- a/test-apis-ci/sdc-api-tests/Dockerfile
+++ b/test-apis-ci/sdc-api-tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-sanity:1.3.0-SNAPSHOT-latest
+FROM onap/base_sdc-sanity:1.3.0
 
 COPY chef-solo /root/chef-solo/
 

diff --git a/ui-ci/sdc-ui-tests/Dockerfile b/ui-ci/sdc-ui-tests/Dockerfile
index be1d3bf..5e04e85 100644 (file)
--- a/ui-ci/sdc-ui-tests/Dockerfile
+++ b/ui-ci/sdc-ui-tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-vnc:1.3.0-SNAPSHOT-latest
+FROM onap/base_sdc-vnc:1.3.0
 
 COPY chef-solo /root/chef-solo/
 

diff --git a/utils/webseal-simulator/sdc-simulator/Dockerfile b/utils/webseal-simulator/sdc-simulator/Dockerfile
index 079c282..957ce47 100644 (file)
--- a/utils/webseal-simulator/sdc-simulator/Dockerfile
+++ b/utils/webseal-simulator/sdc-simulator/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/base_sdc-jetty:1.3.0-SNAPSHOT-latest
+FROM onap/base_sdc-jetty:1.3.0
 
 COPY chef-solo /root/chef-solo/