Merge "add missing config properties found"

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index ae22cb2..37d8b3f 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -7,16 +7,16 @@
 .. Links
 .. _release-notes-label:
 
-Release Notes
-=============
+ONAP Operations Manager Release Notes
+=====================================
 
-Version 4.0.0 Dublin Release
-----------------------------
+Version 4.0.0 (Dublin Release)
+------------------------------
 
-:Release Date: 2019-06-10
+:Release Date: 2019-06-26
 
 Summary
-=======
+-------
 
 **Platform Resiliency**
 
@@ -78,7 +78,7 @@ Version 3.0.0 Casablanca Release
 :Release Date: 2018-11-30
 
 Summary
-=======
+-------
 
 The focus of this release was on incremental improvements in the following
 areas:

diff --git a/kubernetes/appc/charts/appc-cdt/values.yaml b/kubernetes/appc/charts/appc-cdt/values.yaml
index 13dcc1c..7db9527 100644 (file)
--- a/kubernetes/appc/charts/appc-cdt/values.yaml
+++ b/kubernetes/appc/charts/appc-cdt/values.yaml
@@ -26,7 +26,7 @@ flavor: small
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/appc-cdt-image:1.5.2
+image: onap/appc-cdt-image:1.5.3
 pullPolicy: Always
 
 # application configuration

diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
index 64cf3d9..ed35de8 100755 (executable)
--- a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
+++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
@@ -133,6 +133,7 @@ then
         if $ENABLE_ODL_CLUSTER
         then
                 echo "Installing Opendaylight cluster features"
+                ${ODL_HOME}/bin/client feature:install odl-mdsal-clustering
                 enable_odl_cluster
         fi
 
@@ -145,11 +146,24 @@ then
         fi
 
         echo "Restarting OpenDaylight"
-        echo "Stopping OpenDaylight and waiting for it to stop"
         ${ODL_HOME}/bin/stop
-        #The karaf command will exit when odl shuts down. This is the most reliable way to wait for opendaylight to stop
-        #before exiting the docker container.
-        ${ODL_HOME}/bin/karaf
+        checkRun () {
+                running=0
+                while read a b c d e f g h
+                do
+                if [ "$h" == "/bin/sh /opt/opendaylight/bin/karaf server" ]
+                then
+                     running=1
+                fi
+                done < <(ps -eaf)
+                echo $running
+        }
+
+        while [ $( checkRun ) == 1 ]
+        do
+                echo "Karaf is still running, waiting..."
+                sleep 5s
+        done
         echo "Karaf process has stopped"
         sleep 10s
 

diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 4998b2e..a19b67d 100644 (file)
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -31,7 +31,7 @@ global:
 flavor: small
 # application image
 repository: nexus3.onap.org:10001
-image: onap/appc-image:1.5.2
+image: onap/appc-image:1.5.3
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index 8b76f64..eb6744b 100755 (executable)
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -59,7 +59,7 @@ function usage
 
 # Set the defaults
 
-echo "Number of parameters:" 
+echo "Number of parameters:"
 echo $#
 
 if [ $# -lt 2 ];then
@@ -199,7 +199,7 @@ do
         vfwclosedloop)
                         TAG="vfwclosedloop"
                         shift
-                        VARIABLES="$VARIABLES -v pkg_host:$1"
+                        VARIABLES="$VARIABLES -v PACKET_GENERATOR_HOST:$1 -v pkg_host:$1"
                         shift
                         ;;
        *)
@@ -221,4 +221,3 @@ DISPLAY_NUM=$(($GLOBAL_BUILD_NUMBER + 90))
 VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py"
 
 kubectl --namespace $NAMESPACE exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} -i ${TAG} --display $DISPLAY_NUM 2> ${TAG}.out
-

diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
index 173def5..9cc3031 100644 (file)
--- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py
@@ -75,6 +75,7 @@ GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE = '{{ .Values.openStackTenantId
 GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE = '{{ .Values.openStackProjectNameRegionThree }}'
 GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE = '{{ .Values.openStackDomainIdRegionThree }}'
 GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX = '{{ .Values.openStackOamNetworkCidrPrefix }}'
+GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK = 'public'
 GLOBAL_INJECTED_POLICY_IP_ADDR = 'pdp.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = 'drools.{{include "common.namespace" .}}'
 GLOBAL_INJECTED_PORTAL_IP_ADDR = 'portal-app.{{include "common.namespace" .}}'
@@ -167,6 +168,7 @@ GLOBAL_INJECTED_PROPERTIES = {
     "GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE" : '{{ .Values.openStackProjectNameRegionThree }}',
     "GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE" : '{{ .Values.openStackDomainIdRegionThree }}',
     "GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX" : '{{ .Values.openStackOamNetworkCidrPrefix }}',
+    "GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK" : 'public',
     "GLOBAL_INJECTED_POLICY_IP_ADDR" : 'pdp.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR" : 'drools.{{include "common.namespace" .}}',
     "GLOBAL_INJECTED_POLICY_API_IP_ADDR" : 'policy-api.{{include "common.namespace" .}}',

diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index 7701424..65da947 100644 (file)
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -22,7 +22,7 @@ global: # global defaults
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/testsuite:1.4.1
+image: onap/testsuite:1.4.2
 pullPolicy: Always
 
 ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
@@ -72,7 +72,7 @@ openStackPasswordRegionThree: "tenantPassword"
 # this is the java encrypted password that is needed for SO
 openSackMsoEncryptdPasswordRegionThree: "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
 openStackTenantIdRegionThree: "3583253e932845a09cd4c8ca2f31d095"
-openStackProjectNameRegionThree: "Integration-HEAT-Staging-Daily"
+openStackProjectNameRegionThree: "Integration-SB-RegionThree"
 openStackDomainIdRegionThree: "Default"
 #
 # Openstack glance image name for Ubuntu 14.  Maps to GLOBAL_INJECTED_UBUNTU_1404_IMAGE

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index cf90eb1..f94ddc8 100755 (executable)
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -43,7 +43,7 @@ global:
 # Application configuration defaults.
 #################################################################
 repository: nexus3.onap.org:10001
-image: onap/so/api-handler-infra:1.4.3
+image: onap/so/api-handler-infra:1.4.4
 pullPolicy: Always
 
 replicaCount: 1