From: Mike Elliott <mike.elliott@amdocs.com>
Date: Wed, 20 Sep 2017 19:42:50 +0000 (+0000)
Subject: Merge "Added CLAMP containers to ONAP Kubernetes"
X-Git-Tag: 2.0.0-ONAP~643
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c66ca602f26e66145091d529ef970be27fb766d9;hp=-c;p=oom.git

Merge "Added CLAMP containers to ONAP Kubernetes"
---

c66ca602f26e66145091d529ef970be27fb766d9
diff --combined kubernetes/config/docker/init/config-init.sh
index 9c4c7cd3c5,ffc5e236ca..9217d2cd68
--- a/kubernetes/config/docker/init/config-init.sh
+++ b/kubernetes/config/docker/init/config-init.sh
@@@ -1,4 -1,4 +1,4 @@@
 -#!/bin/bash
 +#!/bin/bash -x
  
  echo "Validating onap-parameters.yaml has been populated"
  [[ -z "$OPENSTACK_UBUNTU_14_IMAGE" ]] && { echo "Error: OPENSTACK_UBUNTU_14_IMAGE must be set in onap-parameters.yaml"; exit 1; }
@@@ -7,7 -7,6 +7,7 @@@
  [[ -z "$OPENSTACK_OAM_SUBNET_ID" ]] && { echo "Error: OPENSTACK_OAM_SUBNET_ID must be set in onap-parameters.yaml"; exit 1; }
  [[ -z "$OPENSTACK_OAM_NETWORK_CIDR" ]] && { echo "Error: OPENSTACK_OAM_NETWORK_CIDR must be set in onap-parameters.yaml"; exit 1; }
  [[ -z "$OPENSTACK_USERNAME" ]] && { echo "Error: OPENSTACK_USERNAME must be set in onap-parameters.yaml"; exit 1; }
 +[[ -z "$OPENSTACK_TENANT_ID" ]] && { echo "Error: OPENSTACK_TENANT_ID must be set in onap-parameters.yaml"; exit 1; }
  [[ -z "$OPENSTACK_API_KEY" ]] && { echo "Error: OPENSTACK_API_KEY must be set in onap-parameters.yaml"; exit 1; }
  [[ -z "$OPENSTACK_REGION" ]] && { echo "Error: OPENSTACK_REGION must be set in onap-parameters.yaml"; exit 1; }
  [[ -z "$OPENSTACK_KEYSTONE_URL" ]] && { echo "Error: OPENSTACK_KEYSTONE_URL must be set in onap-parameters.yaml"; exit 1; }
@@@ -49,6 -48,7 +49,7 @@@ mkdir -p /config-init/$NAMESPACE/aai/el
  mkdir -p /config-init/$NAMESPACE/aai/search-data-service/logs/
  mkdir -p /config-init/$NAMESPACE/aai/data-router/logs/
  mkdir -p /config-init/$NAMESPACE/mso/mariadb/data
+ mkdir -p /config-init/$NAMESPACE/clamp/mariadb/data
  mkdir -p /config-init/$NAMESPACE/log/elasticsearch/data
  
  echo "Setting permissions to container writeable directories"
@@@ -85,8 -85,6 +86,8 @@@ find /config-init/$NAMESPACE/ -type f -
  
  find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_USERNAME_HERE/$OPENSTACK_USERNAME/g" {} \;
  
 +find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_TENANT_ID_HERE/$OPENSTACK_TENANT_ID/g" {} \;
 +
  find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_PASSWORD_HERE/$OPENSTACK_API_KEY/g" {} \;
  
  find /config-init/$NAMESPACE/ -type f -exec sed -i -e "s/OPENSTACK_REGION_HERE/$OPENSTACK_REGION/g" {} \;