Merge "Changes to support onappf PDP-A"
authorAlexis de Talhouët <adetalhouet89@gmail.com>
Wed, 17 Apr 2019 12:21:13 +0000 (12:21 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 17 Apr 2019 12:21:13 +0000 (12:21 +0000)
kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml
kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
kubernetes/portal/charts/portal-app/resources/certs/keystoreONAPPortal.p12
kubernetes/robot/demo-k8s.sh
kubernetes/so/charts/so-vnfm-adapter/resources/config/overrides/override.yaml

index a576eba..bd62c56 100644 (file)
@@ -60,7 +60,7 @@ spec:
             - -c
             - nodetool status | grep $POD_IP | awk '$1!="UN" { exit 1; }'
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
-          timeoutSeconds: {{ .Values.liveness.periodSeconds }}
+          periodSeconds: {{ .Values.readiness.periodSeconds }}
         lifecycle:
           preStop:
             exec:
index 4499499..ae5f7c5 100644 (file)
@@ -74,7 +74,7 @@ spec:
             - -c
             - nodetool status | grep $POD_IP | awk '$1!="UN" { exit 1; }'
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
-          timeoutSeconds: {{ .Values.liveness.periodSeconds }}
+          periodSeconds: {{ .Values.readiness.periodSeconds }}
         lifecycle:
           preStop:
             exec:
index c53a7ae..9f52189 100644 (file)
Binary files a/kubernetes/portal/charts/portal-app/resources/certs/keystoreONAPPortal.p12 and b/kubernetes/portal/charts/portal-app/resources/certs/keystoreONAPPortal.p12 differ
index d253ec7..31b8643 100755 (executable)
@@ -1,5 +1,6 @@
 #!/bin/bash
 # Copyright (C) 2018 Amdocs, Bell Canada
+# Modifications Copyright (C) 2019 Samsung
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Execute tags built to support the hands on demo,
+# Execute tags built to support the hands-on demo
 #
 function usage
 {
-       echo "Usage: demo.sh namespace <command> [<parameters>]"
+       echo "Usage: demo-k8s.sh <namespace> <command> [<parameters>]"
        echo " "
-       echo "       demo.sh <namespace> init"
+       echo "       demo-k8s.sh <namespace> init"
        echo "               - Execute both init_customer + distribute"
        echo " "
-       echo "       demo.sh <namespace> init_customer"
+       echo "       demo-k8s.sh <namespace> init_customer"
        echo "               - Create demo customer (Demonstration) and services, etc."
        echo " "
-       echo "       demo.sh <namespace> distribute  [<prefix>]"
+       echo "       demo-k8s.sh <namespace> distribute  [<prefix>]"
        echo "               - Distribute demo models (demoVFW and demoVLB)"
        echo " "
-       echo "       demo.sh <namespace> preload <vnf_name> <module_name>"
+       echo "       demo-k8s.sh <namespace> preload <vnf_name> <module_name>"
        echo "               - Preload data for VNF for the <module_name>"
        echo " "
-       echo "       demo.sh <namespace> appc <module_name>"
-    echo "               - provide APPC with vFW module mount point for closed loop"
+       echo "       demo-k8s.sh <namespace> appc <module_name>"
+       echo "               - provide APPC with vFW module mount point for closed loop"
        echo " "
-       echo "       demo.sh <namespace> init_robot [ <etc_hosts_prefix> ]"
-    echo "               - Initialize robot after all ONAP VMs have started"
+       echo "       demo-k8s.sh <namespace> init_robot [ <etc_hosts_prefix> ]"
+       echo "               - Initialize robot after all ONAP VMs have started"
        echo " "
-       echo "       demo.sh <namespace> instantiateVFW"
-    echo "               - Instantiate vFW module for the a demo customer (DemoCust<uuid>)"
+       echo "       demo-k8s.sh <namespace> instantiateVFW"
+       echo "               - Instantiate vFW module for the demo customer (DemoCust<uuid>)"
        echo " "
-       echo "       demo.sh <namespace> deleteVNF <module_name from instantiateVFW>"
-    echo "               - Delete the module created by instantiateVFW"
+       echo "       demo-k8s.sh <namespace> deleteVNF <module_name from instantiateVFW>"
+       echo "               - Delete the module created by instantiateVFW"
        echo " "
-       echo "       demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service> <oam-ip-address>"
-    echo "               - Run heatbridge against the stack for the given service instance and service"
+       echo "       demo-k8s.sh <namespace> heatbridge <stack_name> <service_instance_id> <service> <oam-ip-address>"
+       echo "               - Run heatbridge against the stack for the given service instance and service"
        echo " "
-       echo "       demo.sh <namespace> vfwclosedloop <pgn-ip-address>"
+       echo "       demo-k8s.sh <namespace> vfwclosedloop <pgn-ip-address>"
         echo "           - vFWCL: Sets the packet generator to high and low rates, and checks whether the policy "
         echo "             kicks in to modulate the rates back to medium"
        echo " "
@@ -110,7 +111,7 @@ do
                        TAG="PreloadDemo"
                        shift
                        if [ $# -ne 2 ];then
-                               echo "Usage: demo.sh <namespace> preload <vnf_name> <module_name>"
+                               echo "Usage: demo-k8s.sh <namespace> preload <vnf_name> <module_name>"
                                exit
                        fi
                        VARIABLES="$VARIABLES -v VNF_NAME:$1"
@@ -122,7 +123,7 @@ do
                        TAG="APPCMountPointDemo"
                        shift
                        if [ $# -ne 1 ];then
-                                       echo "Usage: demo.sh <namespace> appc <module_name>"
+                                       echo "Usage: demo-k8s.sh <namespace> appc <module_name>"
                                        exit
                                fi
                        VARIABLES="$VARIABLES -v MODULE_NAME:$1"
@@ -137,7 +138,7 @@ do
                        TAG="deleteVNF"
                        shift
                        if [ $# -ne 1 ];then
-                               echo "Usage: demo.sh <namespace> deleteVNF <module_name from instantiateVFW>"
+                               echo "Usage: demo-k8s.sh <namespace> deleteVNF <module_name from instantiateVFW>"
                                exit
                        fi
                        VARFILE=$1.py
@@ -153,7 +154,7 @@ do
                        TAG="heatbridge"
                        shift
                        if [ $# -ne 4 ];then
-                               echo "Usage: demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service> <oam-ip-address>"
+                               echo "Usage: demo-k8s.sh <namespace> heatbridge <stack_name> <service_instance_id> <service> <oam-ip-address>"
                                exit
                        fi
                        VARIABLES="$VARIABLES -v HB_STACK:$1"
index 0b52949..236f5d5 100755 (executable)
@@ -32,3 +32,10 @@ mso:
   logPath: ./logs/vnfm-adapter
   msb-ip: msb-iag.{{ include "common.namespace" . }}
   msb-port: 80
+sdc:
+  username: mso
+  password: 76966BDD3C7414A03F7037264FF2E6C8EEC6C28F2B67F2840A1ED857C0260FEE731D73F47F828E5527125D29FD25D3E0DE39EE44C058906BF1657DE77BF897EECA93BDC07FA64F
+  key: 566B754875657232314F5548556D3665
+  endpoint: https://sdc-be.{{ include "common.namespace" . }}:8443
+vnfmadapter:
+  endpoint: https://so-vnfm-adapter.{{ include "common.namespace" . }}:9092