From cf5ff7813441f6b42bc8d34600613a6a288f3054 Mon Sep 17 00:00:00 2001 From: Jack Lucas Date: Tue, 3 Mar 2020 11:37:39 -0500 Subject: Update type files for R6 Configures resolver to R6 path to type files Picks up k8splugin change to provide CA certs in JKS format Issue-ID: DCAEGEN2-1938 Signed-off-by: Jack Lucas Change-Id: I7519d8be52254ef0ac41eb02d6a66f4a80d79501 --- cm-container/README.md | 13 ++++++------- cm-container/pom.xml | 4 ++-- cm-container/scripts/get-type-files.sh | 14 +++++++------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/cm-container/README.md b/cm-container/README.md index 7d90aeb..3e3d45a 100644 --- a/cm-container/README.md +++ b/cm-container/README.md @@ -3,12 +3,11 @@ The artifacts in this directory build a Docker image based on the public image from Cloudify (`cloudifyplatform/community`). The image has the Cloudify Manager software from the base image -and adds our types files. It edits `/etc/cloudify/config.yaml` -to configure the import resolver to use our local type files instead -of fetching them over the Internet. It adds -Cloudify 3.4 type files that are still used in some plugins -and blueprints. Finally, it sets up the `/opt/onap` mount point -for our config files. +and adds our types files. It configures +the import resolver to use our local type files instead +of fetching them over the Internet. It sets up the `/opt/onap` mount point +for our config files. It also sets up the certificate, key and other +configuration for using TLS. ## Running the Container The container is intended to be launched via a Helm chart as part @@ -37,7 +36,7 @@ In an ONAP deployment driven by OOM, Cloudify Manager will store data related to in a Kubernetes PersistentVolume. If the Cloudify Manager pod is destroyed and recreated, the new instance will have all of the state information from the previous run. -To set up persistent, we replace the command run by the container (`CMD` in the Dockerfile) with +To set up persistent storage, we replace the command run by the container (`CMD` in the Dockerfile) with our own script `start-persistent.sh`. This script checks to see if a persistent volume has been mounted in a well-known place (`/cfy-persist` in the container's file system). If so, the script then checks to see if the persistent volume has been populated with data. There are two possibilities: diff --git a/cm-container/pom.xml b/cm-container/pom.xml index f59c66c..207e979 100644 --- a/cm-container/pom.xml +++ b/cm-container/pom.xml @@ -1,7 +1,7 @@