summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDusan Rozman <dusan.rozman@amdocs.com>2017-08-21 14:11:40 -0400
committerDusan Rozman <dusan.rozman@amdocs.com>2017-08-21 14:55:07 -0400
commit13c7907b9795549d4199accc574d65ffdd630a71 (patch)
tree4f4b7420312f601954a869194356774a5edb228d
parente94258e3be0da3a15680de53b1817490c4173759 (diff)
Updated deployment yamls and config to SDC v1.1
Changed the yamls to pull the v1.1 image and updated config files for dockerdata Issue-ID: OOM-67 Change-Id: I2c51486a610f3187e200e5e08c59b132a5d7ffb5 Signed-off-by: Dusan Rozman <dusan.rozman@amdocs.com>
-rwxr-xr-xkubernetes/config/docker/init/src/config/sdc/jetty/keystorebin3697 -> 1416 bytes
-rwxr-xr-xkubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb16
-rw-r--r--kubernetes/sdc/sdc-be.yaml2
-rw-r--r--kubernetes/sdc/sdc-cs.yaml2
-rw-r--r--kubernetes/sdc/sdc-es.yaml2
-rw-r--r--kubernetes/sdc/sdc-fe.yaml2
-rw-r--r--kubernetes/sdc/sdc-kb.yaml2
7 files changed, 20 insertions, 6 deletions
diff --git a/kubernetes/config/docker/init/src/config/sdc/jetty/keystore b/kubernetes/config/docker/init/src/config/sdc/jetty/keystore
index d6592f95ee..08f6cda8a7 100755
--- a/kubernetes/config/docker/init/src/config/sdc/jetty/keystore
+++ b/kubernetes/config/docker/init/src/config/sdc/jetty/keystore
Binary files differ
diff --git a/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb b/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb
index 89f94fbf1e..9fc662ee0a 100755
--- a/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb
+++ b/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb
@@ -1,5 +1,6 @@
+jetty_base="/var/lib/jetty"
template "catalog-fe-config" do
- path "/var/lib/jetty/config/catalog-fe/configuration.yaml"
+ path "#{jetty_base}/config/catalog-fe/configuration.yaml"
source "FE-configuration.yaml.erb"
owner "jetty"
group "jetty"
@@ -11,3 +12,16 @@ template "catalog-fe-config" do
:ssl_port => node['BE'][:https_port]
})
end
+
+template "onboarding-fe-config" do
+ path "#{jetty_base}/config/onboarding-fe/onboarding_configuration.yaml"
+ source "FE-onboarding-configuration.yaml.erb"
+ owner "jetty"
+ group "jetty"
+ mode "0755"
+ variables({
+ :catalog_ip => node['HOST_IP'],
+ :catalog_port => node['BE'][:http_port],
+ :ssl_port => node['BE'][:https_port]
+})
+end
diff --git a/kubernetes/sdc/sdc-be.yaml b/kubernetes/sdc/sdc-be.yaml
index f23db779ab..ac2378cb60 100644
--- a/kubernetes/sdc/sdc-be.yaml
+++ b/kubernetes/sdc/sdc-be.yaml
@@ -70,7 +70,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
- image: nexus3.onap.org:10001/openecomp/sdc-backend:1.0-STAGING-latest
+ image: nexus3.onap.org:10001/openecomp/sdc-backend:1.1-STAGING-latest
name: sdc-be
volumeMounts:
- mountPath: /usr/share/elasticsearch/data/
diff --git a/kubernetes/sdc/sdc-cs.yaml b/kubernetes/sdc/sdc-cs.yaml
index 74874f9c35..081bae459d 100644
--- a/kubernetes/sdc/sdc-cs.yaml
+++ b/kubernetes/sdc/sdc-cs.yaml
@@ -50,7 +50,7 @@ spec:
fieldPath: status.podIP
- name: ES_HEAP_SIZE
value: "1024M"
- image: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.0-STAGING-latest
+ image: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.1-STAGING-latest
name: sdc-cs
volumeMounts:
- mountPath: /var/lib/cassandra/
diff --git a/kubernetes/sdc/sdc-es.yaml b/kubernetes/sdc/sdc-es.yaml
index 5176b93d21..cfb5242141 100644
--- a/kubernetes/sdc/sdc-es.yaml
+++ b/kubernetes/sdc/sdc-es.yaml
@@ -15,7 +15,7 @@ spec:
name: sdc-es
spec:
containers:
- - image: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.0-STAGING-latest
+ - image: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.1-STAGING-latest
name: sdc-es
env:
- name: ENVNAME
diff --git a/kubernetes/sdc/sdc-fe.yaml b/kubernetes/sdc/sdc-fe.yaml
index d984bbedb8..0711aa9dfd 100644
--- a/kubernetes/sdc/sdc-fe.yaml
+++ b/kubernetes/sdc/sdc-fe.yaml
@@ -55,7 +55,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
- image: nexus3.onap.org:10001/openecomp/sdc-frontend:1.0-STAGING-latest
+ image: nexus3.onap.org:10001/openecomp/sdc-frontend:1.1-STAGING-latest
volumeMounts:
- mountPath: /usr/share/elasticsearch/data/
name: sdc-sdc-es-es
diff --git a/kubernetes/sdc/sdc-kb.yaml b/kubernetes/sdc/sdc-kb.yaml
index b79f4ca17b..83483f7af3 100644
--- a/kubernetes/sdc/sdc-kb.yaml
+++ b/kubernetes/sdc/sdc-kb.yaml
@@ -48,7 +48,7 @@ spec:
value: AUTO
- name: ELASTICSEARCH_URL
value: http://sdc-es:9200
- image: nexus3.onap.org:10001/openecomp/sdc-kibana:1.0-STAGING-latest
+ image: nexus3.onap.org:10001/openecomp/sdc-kibana:1.1-STAGING-latest
name: sdc-kb
volumeMounts:
- mountPath: /root/chef-solo/environments/