Merge "vnfsdk - readiness image update"

diff --git a/TOSCA/Helm/helmdelete.sh b/TOSCA/Helm/helmdelete.sh
index d3f342a..e098fbb 100644 (file)
--- a/TOSCA/Helm/helmdelete.sh
+++ b/TOSCA/Helm/helmdelete.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # ============LICENSE_START==========================================
 # ===================================================================
-# Copyright © 2017 AT&T
+# Copyright (c) 2017 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/TOSCA/Helm/helminstall.sh b/TOSCA/Helm/helminstall.sh
index 96f38da..a6e09c8 100644 (file)
--- a/TOSCA/Helm/helminstall.sh
+++ b/TOSCA/Helm/helminstall.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # ============LICENSE_START==========================================
 # ===================================================================
-# Copyright © 2017 AT&T
+# Copyright (c) 2017 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/TOSCA/Helm/onap-blueprint.yaml b/TOSCA/Helm/onap-blueprint.yaml
index 092f743..73a0390 100644 (file)
--- a/TOSCA/Helm/onap-blueprint.yaml
+++ b/TOSCA/Helm/onap-blueprint.yaml
@@ -1,6 +1,6 @@
 # ============LICENSE_START==========================================
 # ===================================================================
-# Copyright © 2017 AT&T
+# Copyright (c) 2017 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml b/TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml
index 1376816..16b4b9a 100644 (file)
--- a/TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml
+++ b/TOSCA/kubernetes-cluster-TOSCA/imports/cloud-config.yaml
@@ -1,6 +1,6 @@
 # ============LICENSE_START==========================================
 # ===================================================================
-# Copyright © 2017 AT&T
+# Copyright (c) 2017 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/TOSCA/kubernetes-cluster-TOSCA/imports/kubernetes.yaml b/TOSCA/kubernetes-cluster-TOSCA/imports/kubernetes.yaml
index 4467fc4..7b02573 100644 (file)
--- a/TOSCA/kubernetes-cluster-TOSCA/imports/kubernetes.yaml
+++ b/TOSCA/kubernetes-cluster-TOSCA/imports/kubernetes.yaml
@@ -1,6 +1,6 @@
 # ============LICENSE_START==========================================
 # ===================================================================
-# Copyright © 2017 AT&T
+# Copyright (c) 2017 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml b/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml
index 5c348e9..9ff0d58 100644 (file)
--- a/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml
+++ b/TOSCA/kubernetes-cluster-TOSCA/openstack-blueprint.yaml
@@ -1,6 +1,6 @@
 # ============LICENSE_START==========================================
 # ===================================================================
-# Copyright © 2017 AT&T
+# Copyright (c) 2017 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/TOSCA/kubernetes-cluster-TOSCA/policies/scale.clj b/TOSCA/kubernetes-cluster-TOSCA/policies/scale.clj
index 369239a..a77d2d2 100644 (file)
--- a/TOSCA/kubernetes-cluster-TOSCA/policies/scale.clj
+++ b/TOSCA/kubernetes-cluster-TOSCA/policies/scale.clj
@@ -1,6 +1,6 @@
 ;;;; ============LICENSE_START==========================================
 ;;;; ===================================================================
-;;;; Copyright © 2017 AT&T
+;;;; Copyright (c) 2017 AT&T
 ;;;;
 ;;;; Licensed under the Apache License, Version 2.0 (the "License");
 ;;;; you may not use this file except in compliance with the License.

diff --git a/TOSCA/kubernetes-cluster-TOSCA/scripts/create.py b/TOSCA/kubernetes-cluster-TOSCA/scripts/create.py
index 4bb3710..e481539 100644 (file)
--- a/TOSCA/kubernetes-cluster-TOSCA/scripts/create.py
+++ b/TOSCA/kubernetes-cluster-TOSCA/scripts/create.py
@@ -2,7 +2,7 @@
 
 # ============LICENSE_START==========================================
 # ===================================================================
-# Copyright © 2017 AT&T
+# Copyright (c) 2017 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/TOSCA/kubernetes-cluster-TOSCA/scripts/kubernetes_master/configure.py b/TOSCA/kubernetes-cluster-TOSCA/scripts/kubernetes_master/configure.py
index 7d5dffc..0ec2cb2 100644 (file)
--- a/TOSCA/kubernetes-cluster-TOSCA/scripts/kubernetes_master/configure.py
+++ b/TOSCA/kubernetes-cluster-TOSCA/scripts/kubernetes_master/configure.py
@@ -2,7 +2,7 @@
 
 # ============LICENSE_START==========================================
 # ===================================================================
-# Copyright © 2017 AT&T
+# Copyright (c) 2017 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/TOSCA/kubernetes-cluster-TOSCA/scripts/kubernetes_master/start.py b/TOSCA/kubernetes-cluster-TOSCA/scripts/kubernetes_master/start.py
index bbc166b..9a9fd8f 100644 (file)
--- a/TOSCA/kubernetes-cluster-TOSCA/scripts/kubernetes_master/start.py
+++ b/TOSCA/kubernetes-cluster-TOSCA/scripts/kubernetes_master/start.py
@@ -2,7 +2,7 @@
 
 # ============LICENSE_START==========================================
 # ===================================================================
-# Copyright © 2017 AT&T
+# Copyright (c) 2017 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/TOSCA/kubernetes-cluster-TOSCA/scripts/kubernetes_node/configure.py b/TOSCA/kubernetes-cluster-TOSCA/scripts/kubernetes_node/configure.py
index 69faaa8..c08fa70 100644 (file)
--- a/TOSCA/kubernetes-cluster-TOSCA/scripts/kubernetes_node/configure.py
+++ b/TOSCA/kubernetes-cluster-TOSCA/scripts/kubernetes_node/configure.py
@@ -2,7 +2,7 @@
 
 # ============LICENSE_START==========================================
 # ===================================================================
-# Copyright © 2017 AT&T
+# Copyright (c) 2017 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/TOSCA/kubernetes-cluster-TOSCA/scripts/nfs.sh b/TOSCA/kubernetes-cluster-TOSCA/scripts/nfs.sh
index 2d59acd..c4ea358 100644 (file)
--- a/TOSCA/kubernetes-cluster-TOSCA/scripts/nfs.sh
+++ b/TOSCA/kubernetes-cluster-TOSCA/scripts/nfs.sh
@@ -2,7 +2,7 @@
 
 # ============LICENSE_START==========================================
 # ===================================================================
-# Copyright © 2017 AT&T
+# Copyright (c) 2017 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/TOSCA/kubernetes-cluster-TOSCA/scripts/tasks.py b/TOSCA/kubernetes-cluster-TOSCA/scripts/tasks.py
index 7680fac..cb2b3a0 100644 (file)
--- a/TOSCA/kubernetes-cluster-TOSCA/scripts/tasks.py
+++ b/TOSCA/kubernetes-cluster-TOSCA/scripts/tasks.py
@@ -2,7 +2,7 @@
 
 # ============LICENSE_START==========================================
 # ===================================================================
-# Copyright © 2017 AT&T
+# Copyright (c) 2017 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index a8589a3..7a3f6c6 100644 (file)
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -2,7 +2,7 @@ nsPrefix: onap
 pullPolicy: Always
 nodePortPrefix: 302
 image:
-  readiness: oomk8s/readiness-check:1.0.0
+  readiness: oomk8s/readiness-check:1.1.0
   aafImage: nexus3.onap.org:10001/onap/aaf/authz-service
   aafVersion: latest
   csImage: nexus3.onap.org:10001/library/cassandra

diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index b058597..4cbd327 100644 (file)
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -15,7 +15,7 @@ modelLoaderReplicas: 1
 searchDataServiceReplicas: 1
 sparkyReplicas: 1
 image:
-  readiness: oomk8s/readiness-check:1.0.0
+  readiness: oomk8s/readiness-check:1.1.0
   aaiProxy: aaionap/haproxy
   aaiProxyVersion: 1.1.0
   aaiHbaseImage: aaionap/hbase

diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 0bf4da9..9106e6b 100644 (file)
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -5,7 +5,7 @@ appcReplicas: 1
 dbReplicas: 1
 dgbuilderReplicas: 1
 image:
-  readiness: oomk8s/readiness-check:1.0.0
+  readiness: oomk8s/readiness-check:1.1.0
   appc: nexus3.onap.org:10001/openecomp/appc-image:v1.2.0
   mysqlServer: mysql/mysql-server:5.6
   dgbuilderSdnc: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:v0.1.0

diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index c522be0..077d43b 100644 (file)
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -3,7 +3,7 @@ pullPolicy: Always
 nodePortPrefix: 302
 mysqlPassword: strong_pitchou
 image:
-  readiness: oomk8s/readiness-check:1.0.0
+  readiness: oomk8s/readiness-check:1.1.0
   clampImage: nexus3.onap.org:10001/onap/clamp
   clampVersion: v1.1.0
   mariadbImage: nexus3.onap.org:10001/mariadb

diff --git a/kubernetes/log/values.yaml b/kubernetes/log/values.yaml
index 3ee3529..c70055b 100644 (file)
--- a/kubernetes/log/values.yaml
+++ b/kubernetes/log/values.yaml
@@ -2,7 +2,7 @@ nsPrefix: onap
 pullPolicy: Always
 nodePortPrefix: 302
 image:
-  readiness: oomk8s/readiness-check:1.0.0
+  readiness: oomk8s/readiness-check:1.1.0
   logstash: docker.elastic.co/logstash/logstash:5.4.3
   kibana: docker.elastic.co/kibana/kibana:5.5.0
   elasticsearch: docker.elastic.co/elasticsearch/elasticsearch:5.5.0

diff --git a/kubernetes/message-router/values.yaml b/kubernetes/message-router/values.yaml
index 6782b71..9a592f4 100644 (file)
--- a/kubernetes/message-router/values.yaml
+++ b/kubernetes/message-router/values.yaml
@@ -5,7 +5,7 @@ dmaapReplicas: 1
 kafkaReplicas: 1
 zookeeperReplicas: 1
 image:
-  readiness: oomk8s/readiness-check:1.0.0
+  readiness: oomk8s/readiness-check:1.1.0
   dmaap: attos/dmaap:latest
   kafka: wurstmeister/kafka:latest
   zookeeper: wurstmeister/zookeeper:latest

diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml
index 9bbdb92..42b375f 100644 (file)
--- a/kubernetes/msb/values.yaml
+++ b/kubernetes/msb/values.yaml
@@ -1,7 +1,7 @@
 nsPrefix: onap
 pullPolicy: IfNotPresent
 image:
-  readiness: oomk8s/readiness-check:1.0.0
+  readiness: oomk8s/readiness-check:1.1.0
   consul: consul:0.9.3
   discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:1.0.0
   apigateway: nexus3.onap.org:10001/onap/msb/msb_apigateway:1.0.0

diff --git a/kubernetes/mso/values.yaml b/kubernetes/mso/values.yaml
index 77d3d60..b45f810 100644 (file)
--- a/kubernetes/mso/values.yaml
+++ b/kubernetes/mso/values.yaml
@@ -10,7 +10,7 @@ openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
 msoReplicas: 1
 dbReplicas: 1
 image:
-  readiness: oomk8s/readiness-check:1.0.0
+  readiness: oomk8s/readiness-check:1.1.0
   mso: nexus3.onap.org:10001/openecomp/mso:v1.1.1
   mariadb: nexus3.onap.org:10001/mariadb:10.1.11
   filebeat: docker.elastic.co/beats/filebeat:5.5.0

diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 2431d0a..0379ea1 100644 (file)
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -2,7 +2,7 @@ nsPrefix: onap
 pullPolicy: Always
 nodePortPrefix: 302
 image:
-  readiness: oomk8s/readiness-check:1.0.0
+  readiness: oomk8s/readiness-check:1.1.0
   framework: nexus3.onap.org:10001/onap/multicloud/framework:v1.0.0
   vio: nexus3.onap.org:10001/onap/multicloud/vio:v1.0.0
   ocata: nexus3.onap.org:10001/onap/multicloud/openstack-ocata:v1.0.0
@@ -10,4 +10,4 @@ image:
 
 # domain name of msb gateway
 msbgateway: msb-iag.onap-msb
-msbPort: 80
\ No newline at end of file
+msbPort: 80

diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 79b59cf..3af4af8 100644 (file)
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -13,7 +13,7 @@ papReplicas: 1
 pdpReplicas: 1
 image:
   readiness: oomk8s/readiness-check
-  readinessVersion: 1.0.0
+  readinessVersion: 1.1.0
   policyPe: nexus3.onap.org:10001/onap/policy/policy-pe
   policyPeVersion: v1.1.1
   policyDrools: nexus3.onap.org:10001/onap/policy/policy-drools

diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index f34e6a0..2596d5e 100644 (file)
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -6,7 +6,7 @@ portalDbReplicas: 1
 vncPortalReplicas: 1
 portalWidgetsReplicas: 1
 image:
-  readiness: oomk8s/readiness-check:1.0.0
+  readiness: oomk8s/readiness-check:1.1.0
   portalapps: nexus3.onap.org:10001/onap/portal-apps:v1.3.0
   portaldb: nexus3.onap.org:10001/onap/portal-db:v1.3.0
   mariadbClient: oomk8s/mariadb-client-init:1.0.0

diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml
index 1cc5dd0..0ed7626 100644 (file)
--- a/kubernetes/sdc/values.yaml
+++ b/kubernetes/sdc/values.yaml
@@ -2,7 +2,7 @@ nsPrefix: onap
 pullPolicy: Always
 nodePortPrefix: 302
 image:
-  readiness: oomk8s/readiness-check:1.0.0
+  readiness: oomk8s/readiness-check:1.1.0
   sdcKibana: nexus3.onap.org:10001/openecomp/sdc-kibana:v1.1.0
   sdcFrontend: nexus3.onap.org:10001/openecomp/sdc-frontend:v1.1.0
   sdcElasticsearch: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:v1.1.0

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index e91dc2a..cdeb66a 100644 (file)
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -2,7 +2,7 @@ nsPrefix: onap
 pullPolicy: IfNotPresent
 nodePortPrefix: 302
 image:
-  readiness: oomk8s/readiness-check:1.0.0
+  readiness: oomk8s/readiness-check:1.1.0
   mysql: mysql:5.7
   xtrabackup: gcr.io/google-samples/xtrabackup:1.0
   dgbuilderSdnc: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:v0.1.0

diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 6463588..eef104d 100644 (file)
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -5,7 +5,7 @@ dataRootDir: /dockerdata-nfs
 vidMariaDbReplicas: 1
 vidServerReplicas: 1
 image:
-  readiness: oomk8s/readiness-check:1.0.0
+  readiness: oomk8s/readiness-check:1.1.0
   mariadb: nexus3.onap.org:10001/library/mariadb:10
   vid: nexus3.onap.org:10001/openecomp/vid:v1.1.1
   filebeat: docker.elastic.co/beats/filebeat:5.5.0