summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJack Lucas <jflos@sonoris.net>2021-01-13 12:50:10 -0500
committerJack Lucas <jflos@sonoris.net>2021-01-13 12:50:10 -0500
commitec9906058fd977947b970af72725dc00c591587b (patch)
tree8c0d1317543212de443fa027cddffa382d9cbc5f /scripts
parent95afae23452a6debbbeaf5bd18f6466522457197 (diff)
Move bootstrap container to python 33.0.0
Move to an Alpine python base image and install a Python 3 version of the Cloudify CLI. Also remove loading of k8s plugin configurations. (Will move to CM via an init container.) Issue-ID: DCAEGEN2-2543 Issue-ID: DCAEGEN2-2582 Signed-off-by: Jack Lucas <jflos@sonoris.net> Change-Id: I6d147bbbce863ee8e04d2bd70d7189dc63fa9950
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bootstrap.sh16
1 files changed, 2 insertions, 14 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 9cd69c8..8089439 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,6 +1,7 @@
#!/bin/bash
# ================================================================================
# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2021 J. F. Lucas. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -21,11 +22,8 @@
# CM password in CMPASS environment variable (assumes user is "admin")
# ONAP common Kubernetes namespace in ONAP_NAMESPACE environment variable
# If DCAE components are deployed in a separate Kubernetes namespace, that namespace in DCAE_NAMESPACE variable.
-# Consul address with port in CONSUL variable
-# Blueprints for components to be installed in /blueprints
+# Blueprints for components to be installed in /blueprints
# Input files for components to be installed in /inputs
-# Configuration JSON files that need to be loaded into Consul in /dcae-configs
-# Consul is installed in /opt/consul/bin/consul, with base config in /opt/consul/config/00consul.json
# Optionally, allows:
# CM protocol in CMPROTO environment variable (defaults to HTTP)
# CM port in CMPORT environment variable (defaults to 80)
@@ -137,16 +135,6 @@ cfy status
# Store the CM password into a Cloudify secret
cfy secret create -s ${CMPASS} cmpass
-# Load configurations into Consul KV store
-for config in /dcae-configs/*.json
-do
- # The basename of the file is the Consul key
- key=$(basename ${config} .json)
- # Strip out comments, empty lines
- egrep -v "^#|^$" ${config} > /tmp/dcae-upload
- curl -v -X PUT -H "Content-Type: application/json" --data-binary @/tmp/dcae-upload ${CONSUL}/v1/kv/${key}
-done
-
# After this point, failures should not stop the script or block later commands
trap - ERR
set +e