Fix dashboard bootstrap

Also remove deployment of datafile collector.
Remove generated Dockerfiles.

Issue-ID: DCAEGEN2-1418
Issue-ID: DCAEGEN2-1419
Change-Id: Ie2394fcd47ff9f80178e1e1aa2f1f383c4db700e
Signed-off-by: Jack Lucas <jflucas@research.att.com>

diff --git a/cm-container/Dockerfile b/cm-container/Dockerfile
deleted file mode 100644 (file)
index 7415c55..0000000
--- a/cm-container/Dockerfile
+++ /dev/null
@@ -1,50 +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 cloudifyplatform/community:18.7.23
-MAINTAINER maintainer
-
-ENV TYPE_REPO https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R3
-ENV CCSDK_REPO https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins
-
-# Store type files locally
-RUN mkdir scripts
-COPY get-type-files.sh dcae-cleanup.sh scripts/
-# Load our type files and the Cloudify 3.4 type files
-RUN scripts/get-type-files.sh ${TYPE_REPO} ${CCSDK_REPO}\
-    && mkdir /opt/manager/resources/spec/cloudify/3.4\
-    && curl -Ss https://cloudify.co/spec/cloudify/3.4/types.yaml > /opt/manager/resources/spec/cloudify/3.4/types.yaml\
-    && chown -R cfyuser:cfyuser /opt/manager/resources/spec/cloudify/3.4\
-    && chmod +x scripts/*.sh
-# Create mount point for CM config file
-RUN mkdir -p /opt/onap && chown cfyuser:cfyuser /opt/onap
-
-# For HEAT environment, install software needed to use Cloudify CLI 4.2 to install plugins & deploy blueprints locally
-# Install python development-related packages
-RUN yum install -y gcc python-devel python-virtualenv python-pip
-
-# Install jq (used for cleanup--parsing output of CM API call)
-RUN curl -Ss -L "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64"  > /bin/jq \
-&& chmod +x /bin/jq
-
-# Set up virtualenv and install Cloudify CLI 4.2
-RUN pip install --upgrade pip==9.0.3 \
-    && virtualenv cfy42 \
-    && source cfy42/bin/activate \
-    && pip install cloudify==4.2

diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh
index 503cec2..257775d 100755 (executable)
--- a/k8s-bootstrap-container/bootstrap.sh
+++ b/k8s-bootstrap-container/bootstrap.sh
@@ -191,11 +191,9 @@ trap - ERR
 set +e
 
 # Deploy platform components
-# Allow for some parallelism to speed up the process.  Probably could be somewhat more aggressive.
-deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml &
-deploy dashboard k8s-dashboard.yaml k8s-dashboard-inputs.yaml &
-PG_PID=$!
-wait ${PG_PID}
+# No opportunity for parallelism here -- dashboard needs pgaas
+deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml
+deploy dashboard k8s-dashboard.yaml k8s-dashboard-inputs.yaml
 
 # Deploy service components
 # tca, ves, prh, hv-ves, datafile-collector can be deployed simultaneously
@@ -204,7 +202,6 @@ deploy ves k8s-ves.yaml k8s-ves-inputs.yaml &
 deploy snmptrap k8s-snmptrap.yaml k8s-snmptrap-inputs.yaml &
 deploy prh k8s-prh.yaml k8s-prh-inputs.yaml &
 deploy hv-ves k8s-hv-ves.yaml k8s-hv_ves-inputs.yaml &
-deploy datafile-collector k8s-datafile-collector.yaml k8s-datafile-collector-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

diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml
index 98ce298..e01257f 100644 (file)
--- a/k8s-bootstrap-container/pom.xml
+++ b/k8s-bootstrap-container/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>k8s-bootstrap-container</artifactId>
   <name>dcaegen2-deployments-k8s-bootstrap-container</name>
-  <version>1.4.12</version>
+  <version>1.4.13</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/tls-init-container/Dockerfile b/tls-init-container/Dockerfile
deleted file mode 100644 (file)
index 366276d..0000000
--- a/tls-init-container/Dockerfile
+++ /dev/null
@@ -1,23 +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=========================================================
-FROM busybox
-RUN mkdir -p /opt/tls/source && mkdir -p /opt/tls/shared
-COPY ./tls /opt/tls/source
-RUN base64 -d /opt/tls/source/trust.jks.b64 > /opt/tls/source/trust.jks  && base64 -d /opt/tls/source/cert.jks.b64 > /opt/tls/source/cert.jks && base64 -d /opt/tls/source/cert.p12.b64 > /opt/tls/source/cert.p12
-COPY setup-tls.sh /opt/tls
-ENTRYPOINT  ["/opt/tls/setup-tls.sh"]