diff options
| -rw-r--r-- | k8s-bootstrap-container/.gitignore | 4 | ||||
| -rw-r--r-- | k8s-bootstrap-container/00-consul.json | 9 | ||||
| -rw-r--r-- | k8s-bootstrap-container/Dockerfile-template | 65 | ||||
| -rw-r--r-- | k8s-bootstrap-container/README.md | 19 | ||||
| -rwxr-xr-x | k8s-bootstrap-container/bootstrap.sh | 232 | ||||
| -rwxr-xr-x | k8s-bootstrap-container/load-blueprints.sh | 44 | ||||
| -rwxr-xr-x | k8s-bootstrap-container/load-plugins.sh | 62 | ||||
| -rw-r--r-- | k8s-bootstrap-container/pom.xml | 172 | ||||
| -rwxr-xr-x | k8s-bootstrap-container/test-expand.sh | 6 | ||||
| -rw-r--r-- | k8s-bootstrap-container/uninstall.sh | 36 | ||||
| -rwxr-xr-x | mvn-phase-script.sh | 2 | ||||
| -rw-r--r-- | pom.xml | 1 |
12 files changed, 1 insertions, 651 deletions
diff --git a/k8s-bootstrap-container/.gitignore b/k8s-bootstrap-container/.gitignore deleted file mode 100644 index cf63a5a..0000000 --- a/k8s-bootstrap-container/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.project -Dockerfile -.vscode -bootstrap-container.code-workspace diff --git a/k8s-bootstrap-container/00-consul.json b/k8s-bootstrap-container/00-consul.json deleted file mode 100644 index a7d6ff4..0000000 --- a/k8s-bootstrap-container/00-consul.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "datacenter": "dc1", - "data_dir": "/opt/consul", - "log_level": "INFO", - "server": false, - "retry_join": ["consul"], - "node_name": "dcae-bootstrap", - "disable_update_check": true - }
\ No newline at end of file diff --git a/k8s-bootstrap-container/Dockerfile-template b/k8s-bootstrap-container/Dockerfile-template deleted file mode 100644 index 583de52..0000000 --- a/k8s-bootstrap-container/Dockerfile-template +++ /dev/null @@ -1,65 +0,0 @@ -# ============LICENSE_START======================================================= -# org.onap.dcae -# ================================================================================ -# Copyright (c) 2018 AT&T Intellectual Property. 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. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -FROM centos:7.4.1708 -LABEL maintainer="maintainer" - -ENV DCAE_REPO {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }} -ENV CCSDK_REPO {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }} -ENV BP_REPO {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_releases }} - -# Install gcc -RUN yum install -y gcc python-devel - -# Install Consul -RUN yum install -y unzip \ - && mkdir -p /opt/consul/bin \ - && mkdir -p /opt/consul/data \ - && mkdir -p /opt/consul/config \ - && curl -Ssf https://releases.hashicorp.com/consul/1.2.1/consul_1.2.1_linux_amd64.zip > /tmp/consul.zip \ - && unzip -pj /tmp/consul.zip > /opt/consul/bin/consul \ - && chmod +x /opt/consul/bin/consul -COPY 00-consul.json /opt/consul/config/ - -# Install jq -RUN curl -Ssf -L "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64" > /bin/jq \ -&& chmod +x /bin/jq - -# Install pip and Cloudify CLI (stay at version 4.2 because of changes in higher versions) -RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ - && python get-pip.py \ - && rm get-pip.py \ - && pip install cloudify==4.2 - -# Copy scripts -RUN mkdir scripts -COPY load-plugins.sh load-blueprints.sh bootstrap.sh uninstall.sh scripts/ -RUN chmod +x /scripts/*.sh - -# Get plugin archives and build wagons -RUN scripts/load-plugins.sh ${DCAE_REPO} ${CCSDK_REPO} \ - && rm scripts/load-plugins.sh - -# Load blueprints and input templates -RUN scripts/load-blueprints.sh ${BP_REPO} \ - && rm scripts/load-blueprints.sh - - -# Set up runtime script -ENTRYPOINT exec "/scripts/bootstrap.sh" diff --git a/k8s-bootstrap-container/README.md b/k8s-bootstrap-container/README.md deleted file mode 100644 index 0e8f88d..0000000 --- a/k8s-bootstrap-container/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# DCAE Bootstrap Container -This container is responsible for loading plugins and wagons onto the -DCAE Cloudify Manager instance and for launching DCAE components. - -The Docker image build process loads plugins and blueprints into the -image's file system. At run time, the main script in the container -(`bootstrap.sh`) uploads the plugins to Cloudify Manager, then installs -components using the blueprints. - -The container expects to be started with two environment variables: - - `CMADDR` -- the address of the target Cloudify Manager - - `CMPASS` -- the password for Cloudify Manager - -The container expects input files to use when deploying the blueprints. -It expects to find them in /inputs. The normal method for launching -the container is via a Helm Chart launched by OOM. That chart creates -a Kubernetes ConfigMap containing the input files. The ConfigMap is -mounted as a volume at /inputs. - diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh deleted file mode 100755 index 09767c6..0000000 --- a/k8s-bootstrap-container/bootstrap.sh +++ /dev/null @@ -1,232 +0,0 @@ -#!/bin/bash -# ================================================================================ -# Copyright (c) 2018-2020 AT&T Intellectual Property. 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. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= - -# Install DCAE via Cloudify Manager -# Expects: -# CM address (IP or DNS) in CMADDR environment variable -# 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 -# Plugin wagon files in /wagons -# 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) -# If CMPROTO is set to "https", bootstrap will use HTTPS to communicate with CM. Otherwise, -# it will use HTTP. -# If CMPROTO is set to "https", the script assumes the CA cert needed to verify the cert -# presented by CM is mounted at /certs/cacert.pem. - -# Set defaults for CM protocol and port -CMPROTO=${CMPROTO:-http} -CMPORT=${CMPORT:-80} - -# Set up additional parameters for using HTTPS -CFYTLS="" -CURLTLS="" -if [ $CMPROTO = "https" ] -then - CFYTLS="--rest-certificate /certs/cacert.pem --ssl" - CURLTLS="--cacert /certs/cacert.pem" -fi - -### FUNCTION DEFINITIONS ### - -# keep_running: Keep running after bootstrap finishes or after error -keep_running() { - echo $1 - sleep infinity & - wait -} - -# cm_hasany: Query Cloudify Manager and return 0 (true) if there are any entities matching the query -# Used to see if something is already present on CM -# $1 -- query fragment, for instance "plugins?archive_name=xyz.wgn" to get -# the number of plugins that came from the archive file "xyz.wgn" -function cm_hasany { - # We use _include=id to limit the amount of data the CM sends back - # We rely on the "metadata.pagination.total" field in the response - # for the total number of matching entities - COUNT=$(curl -Ss -H "Tenant: default_tenant" --user admin:${CMPASS} ${CURLTLS} "${CMPROTO}://${CMADDR}:${CMPORT}/api/v3.1/$1&_include=id" \ - | /bin/jq .metadata.pagination.total) - if (( $COUNT > 0 )) - then - return 0 - else - return 1 - fi -} - -# deploy: Deploy components if they're not already deployed -# $1 -- name (for bp and deployment) -# $2 -- blueprint file name -# $3 -- inputs file name (optional) -function deploy { - # Don't crash the script on error - set +e - - # Upload blueprint if it's not already there - if cm_hasany "blueprints?id=$1" - then - echo blueprint $1 is already installed on ${CMADDR} - else - cfy blueprints upload -b $1 /blueprints/$2 - fi - - # Create deployment if it doesn't already exist - if cm_hasany "deployments?id=$1" - then - echo deployment $1 has already been created on ${CMADDR} - else - INPUTS= - if [ -n "$3" ] - then - INPUTS="-i/inputs/$3" - fi - cfy deployments create -b $1 ${INPUTS} $1 - fi - - # Run the install workflow if it hasn't been run already - # We don't have a completely certain way of determining this. - # We check to see if the deployment has any node instances - # that are in the 'uninitialized' or 'deleted' states. (Note that - # the & in the query acts as a logical OR for the multiple state values.) - # We'll try to install when a deployment has node instances in those states - if cm_hasany "node-instances?deployment_id=$1&state=uninitialized&state=deleted" - then - cfy executions start -d $1 install - else - echo deployment $1 appears to have had an install workflow executed already or is not ready for an install - fi -} - -# Install plugin if it's not already installed -# $1 -- path to wagon file for plugin -function install_plugin { - ARCHIVE=$(basename $1) - # See if it's already installed - if cm_hasany "plugins?archive_name=$ARCHIVE" - then - echo plugin $1 already installed on ${CMADDR} - else - cfy plugin upload $1 - fi -} - -### END FUNCTION DEFINTIONS ### - -set -x - -# Make sure we keep the container alive after an error -trap keep_running ERR - -set -e - -# Consul service registration data -CBS_REG='{"ID": "dcae-cbs0", "Name": "config_binding_service", "Address": "config-binding-service", "Port": 10000}' - -# Set up profile to access Cloudify Manager -cfy profiles use -u admin -t default_tenant -p "${CMPASS}" ${CFYTLS} "${CMADDR}" - -# Output status, for debugging purposes -cfy status - -# Check Consul readiness -# The readiness container waits for a "consul-server" container to be ready, -# but this isn't always enough. We need the Consul API to be up and for -# the cluster to be formed, otherwise our Consul accesses might fail. -# (Note in ONAP R2, we never saw a problem, but occasionally in R3 we -# have seen Consul not be fully ready, so we add these checks, originally -# used in the R1 HEAT-based deployment.) -# Wait for Consul API to come up -until curl http://${CONSUL}/v1/agent/services -do - echo Waiting for Consul API - sleep 60 -done -# Wait for a leader to be elected -until [[ "$(curl -Ss http://{$CONSUL}/v1/status/leader)" != '""' ]] -do - echo Waiting for leader - sleep 30 -done - -# 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 - -# Put service registrations into the local Consul configuration directory -for sr in CBS_REG -do - echo '{"service" : ' ${!sr} ' }'> /opt/consul/config/${sr}.json -done - -# Start the local consul agent instance -/opt/consul/bin/consul agent --config-dir /opt/consul/config 2>&1 | tee /opt/consul/consul.log & - -# Store the CM password into a Cloudify secret -cfy secret create -s ${CMPASS} cmpass - -# Load plugins onto CM -for wagon in /wagons/*.wgn -do - install_plugin ${wagon} -done - -# In some oversubscribed cloud environments, we have -# observed that even though the plugin installations appear -# to have completed, there are background installation tasks -# that might still be running. So we check for running system workflows -while cm_hasany "executions?is_system_workflow=true&status=pending&status=started&status=queued&status=scheduled" -do - echo "Waiting for running system workflows to complete" - sleep 15 -done - -# After this point, failures should not stop the script or block later commands -trap - ERR -set +e - -# Initialize the DCAE postgres instance -deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml - -# Deploy service components -# tca, ves, prh, hv-ves, datafile-collector can be deployed simultaneously -deploy tca k8s-tca.yaml k8s-tca-inputs.yaml & -deploy ves k8s-ves.yaml k8s-ves-inputs.yaml & -deploy prh k8s-prh.yaml k8s-prh-inputs.yaml & -deploy hv-ves k8s-hv-ves.yaml k8s-hv_ves-inputs.yaml & -# holmes_rules must be deployed before holmes_engine, but holmes_rules can go in parallel with other service components -deploy holmes_rules k8s-holmes-rules.yaml k8s-holmes_rules-inputs.yaml -deploy holmes_engine k8s-holmes-engine.yaml k8s-holmes_engine-inputs.yaml - -# Display deployments, for debugging purposes -cfy deployments list - -# Continue running -keep_running "Finished bootstrap steps." -echo "Exiting!" diff --git a/k8s-bootstrap-container/load-blueprints.sh b/k8s-bootstrap-container/load-blueprints.sh deleted file mode 100755 index 3784d84..0000000 --- a/k8s-bootstrap-container/load-blueprints.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# ================================================================================ -# Copyright (c) 2018-2020 AT&T Intellectual Property. 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. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# Load DCAE blueprints/inputs onto container -# $1 Blueprint repo base URL -# Expect blueprints to be at <base URL>/blueprints - -set -x -set -e - -BLUEPRINTS=\ -" -k8s-holmes-engine.yaml \ -k8s-holmes-rules.yaml \ -k8s-pgaas-initdb.yaml \ -k8s-tca.yaml \ -k8s-ves.yaml \ -k8s-prh.yaml \ -k8s-hv-ves.yaml \ -k8s-helm-override.yaml \ -k8s-helm.yaml -" - -BPDEST=blueprints -mkdir ${BPDEST} - -# Download blueprints -for bp in ${BLUEPRINTS} -do - curl -Ssf $1/blueprints/${bp} > ${BPDEST}/$(basename ${bp}) -done diff --git a/k8s-bootstrap-container/load-plugins.sh b/k8s-bootstrap-container/load-plugins.sh deleted file mode 100755 index c67258e..0000000 --- a/k8s-bootstrap-container/load-plugins.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -# ============LICENSE_START======================================================= -# org.onap.dcae -# ================================================================================ -# Copyright (c) 2018-2020 AT&T Intellectual Property. 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. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. - -# Pull plugin archives from repos -# $1 is the DCAE repo URL -# $2 is the CCSDK repo URL -# (This script runs at Docker image build time) -# -set -x -set -e -DEST=wagons - -# For DCAE, starting in R5, we pull down wagons directly -DCAEPLUGINFILES=\ -"\ -k8splugin/1.7.2/k8splugin-1.7.2-py27-none-linux_x86_64.wgn -relationshipplugin/1.1.0/relationshipplugin-1.1.0-py27-none-linux_x86_64.wgn -clamppolicyplugin/1.1.0/clamppolicyplugin-1.1.0-py27-none-linux_x86_64.wgn -dcaepolicyplugin/2.4.0/dcaepolicyplugin-2.4.0-py27-none-linux_x86_64.wgn \ -" - -# For CCSDK, we pull down the wagon files directly -CCSDKPLUGINFILES=\ -"\ -plugins/pgaas-1.1.0-py27-none-any.wgn -plugins/dmaap-1.3.5-py27-none-any.wgn -plugins/sshkeyshare-1.0.0-py27-none-any.wgn -plugins/helm-4.0.0-py27-none-linux_x86_64.wgn -" - -# Copy a set of wagons from a repo -# $1 -- repo baseURL -# $2 -- list of paths to wagons in the repo -function get_wagons { - for wagon in $2 - do - target=$(basename ${wagon}) - curl -Ssf $1/${wagon} > ${DEST}/${target} - done -} - -mkdir ${DEST} -get_wagons $1 "${DCAEPLUGINFILES}" -get_wagons $2 "${CCSDKPLUGINFILES}" diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml deleted file mode 100644 index 4c201cc..0000000 --- a/k8s-bootstrap-container/pom.xml +++ /dev/null @@ -1,172 +0,0 @@ -<?xml version="1.0"?> -<!-- -================================================================================ -Copyright (c) 2018-2020 AT&T Intellectual Property. 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. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -============LICENSE_END========================================================= - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.dcaegen2.deployments</groupId> - <artifactId>deployments</artifactId> - <version>1.2.0-SNAPSHOT</version> - </parent> - <groupId>org.onap.dcaegen2.deployments</groupId> - <artifactId>k8s-bootstrap-container</artifactId> - <name>dcaegen2-deployments-k8s-bootstrap-container</name> - <version>1.8.0</version> - <url>http://maven.apache.org</url> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <sonar.skip>true</sonar.skip> - <sonar.sources>.</sonar.sources> - <!-- customize the SONARQUBE URL --> - <!-- sonar.host.url>http://localhost:9000</sonar.host.url --> - <!-- below are language dependent --> - <!-- for Python --> - <sonar.language>py</sonar.language> - <sonar.pluginName>Python</sonar.pluginName> - <sonar.inclusions>**/*.py</sonar.inclusions> - <!-- for JavaScaript --> - <!-- - <sonar.language>js</sonar.language> - <sonar.pluginName>JS</sonar.pluginName> - <sonar.inclusions>**/*.js</sonar.inclusions> - --> - </properties> - <build> - <finalName>${project.artifactId}-${project.version}</finalName> - <plugins> - <!-- plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.4.1</version> - <configuration> - <descriptors> - <descriptor>assembly/dep.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin --> - <!-- now we configure custom action (calling a script) at various lifecycle phases --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> - <executions> - <execution> - <id>clean phase script</id> - <phase>clean</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <arguments> - <argument>${project.artifactId}</argument> - <argument>clean</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>generate-sources script</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <arguments> - <argument>${project.artifactId}</argument> - <argument>generate-sources</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>compile script</id> - <phase>compile</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <arguments> - <argument>${project.artifactId}</argument> - <argument>compile</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>package script</id> - <phase>package</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <arguments> - <argument>${project.artifactId}</argument> - <argument>package</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>test script</id> - <phase>test</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <arguments> - <argument>${project.artifactId}</argument> - <argument>test</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>install script</id> - <phase>install</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <arguments> - <argument>${project.artifactId}</argument> - <argument>install</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>deploy script</id> - <phase>deploy</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <arguments> - <argument>${project.artifactId}</argument> - <argument>deploy</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/k8s-bootstrap-container/test-expand.sh b/k8s-bootstrap-container/test-expand.sh deleted file mode 100755 index dca2d22..0000000 --- a/k8s-bootstrap-container/test-expand.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -sed \ - -e 's#{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}#https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6#' \ - -e 's#{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}#https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins#' \ - -e 's#{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_releases }}#https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/R6#' \ -Dockerfile-template > Dockerfile diff --git a/k8s-bootstrap-container/uninstall.sh b/k8s-bootstrap-container/uninstall.sh deleted file mode 100644 index 71f8161..0000000 --- a/k8s-bootstrap-container/uninstall.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# ================================================================================ -# Copyright (c) 2018 AT&T Intellectual Property. 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. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= - -# Clean up DCAE during ONAP uninstall - -set -x -set +e - -# Leave the Consul cluster -/opt/consul/bin/consul leave - -# Uninstall components managed by Cloudify -# Get the list of deployment ids known to Cloudify via curl to Cloudify API. -# The output of the curl is JSON that looks like {"items" :[{"id": "config_binding_service"}, ...], "metadata" :{...}} -# -# jq gives us the just the deployment ids (e.g., "config_binding_service"), one per line -# -# xargs -I lets us run the cfy uninstall command once for each deployment id extracted by jq - -curl -Ss --user admin:$CMPASS -H "Tenant: default_tenant" "$CMADDR/api/v3.1/deployments?_include=id" \ -| /bin/jq .items[].id \ -| xargs -I % sh -c 'cfy uninstall %' diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh index 09db3b5..5bfe1dc 100755 --- a/mvn-phase-script.sh +++ b/mvn-phase-script.sh @@ -83,7 +83,7 @@ deploy) upload_files_of_extension sh build_and_push_docker ;; - k8s-bootstrap-container|tca-cdap-container|cm-container|redis-cluster-container|healthcheck-container|pnda-mirror-container|pnda-bootstrap-container|tls-init-container|consul-loader-container|multisite-init-container|dcae-k8s-cleanup-container) + tca-cdap-container|cm-container|redis-cluster-container|healthcheck-container|pnda-mirror-container|pnda-bootstrap-container|tls-init-container|consul-loader-container|multisite-init-container|dcae-k8s-cleanup-container) build_and_push_docker ;; scripts|cloud_init|heat) @@ -38,7 +38,6 @@ limitations under the License. <modules> <module>redis-cluster-container</module> <module>cm-container</module> - <module>k8s-bootstrap-container</module> <module>tca-cdap-container</module> <module>healthcheck-container</module> <module>tls-init-container</module> |