summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-04-28 07:24:43 +0300
committerMichael Lando <ml636r@att.com>2018-04-28 07:24:43 +0300
commit921360ae4a0168b0bc24654530f324b2bc2fdb32 (patch)
treee20dad7193aa76fdee2e77626800dba3077c3555
parente4669311978a91e4af8f079fb10e5aaaff4fef14 (diff)
set base images
Change-Id: Ia3c978ce5de499982d1945378855f2bc672b3882 Issue-ID: SDC-1265 Signed-off-by: Michael Lando <ml636r@att.com>
-rw-r--r--asdctool/sdc-cassandra-init/Dockerfile2
-rw-r--r--catalog-be/sdc-backend-init/Dockerfile2
-rw-r--r--catalog-be/sdc-backend/Dockerfile2
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb12
-rw-r--r--catalog-fe/sdc-frontend/Dockerfile2
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/Dockerfile2
-rw-r--r--openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-cassandra/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-elasticsearch/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-init-elasticsearch/Dockerfile2
-rw-r--r--sdc-os-chef/sdc-kibana/Dockerfile2
-rw-r--r--test-apis-ci/sdc-api-tests/Dockerfile2
-rw-r--r--ui-ci/sdc-ui-tests/Dockerfile2
-rw-r--r--utils/webseal-simulator/sdc-simulator/Dockerfile2
14 files changed, 19 insertions, 19 deletions
diff --git a/asdctool/sdc-cassandra-init/Dockerfile b/asdctool/sdc-cassandra-init/Dockerfile
index c1069c8b99..c19fe2a6f6 100644
--- 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 33d3760cdf..f4515ee09a 100644
--- 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 ed54c8a443..506f001375 100644
--- 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 a390a80441..0d6d26d68b 100644
--- 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 75cbd8c44c..f2764227e5 100644
--- 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 a3e56fde23..339c851826 100644
--- 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 597c5d281b..587baec46e 100644
--- 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 2f8ecb7785..f9ae64127a 100644
--- 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 9b9883e454..fd8e2e9deb 100644
--- 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 cfcf4b9f2b..7d263ba86f 100644
--- 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 c62f1db69d..8bbaab03b9 100644
--- 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 d419224251..23d7e58a2d 100644
--- 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 be1d3bf8dd..5e04e85847 100644
--- 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 079c282093..957ce47651 100644
--- 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/