From d2c821277a10f0c746ddb1a99c59a3ef88fb2f1c Mon Sep 17 00:00:00 2001
From: Vijay Venkatesh Kumar <vv770d@att.com>
Date: Fri, 5 Apr 2019 00:38:59 +0000
Subject: Bulk update to deployment

1) Removed pnda folder (moved to pnda repo)
2) Moved older R3 - heat repo into archive folder
3) Added Dmaap plugin
4) Added new blueprints for Dashboard/helm

Change-Id: I82cb8c482a0a35fe8094da825e7403b0fc4ee33b
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-1270
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
---
 k8s-bootstrap-container/bootstrap.sh       | 1 +
 k8s-bootstrap-container/build-plugins.sh   | 1 +
 k8s-bootstrap-container/load-blueprints.sh | 4 +++-
 k8s-bootstrap-container/pom.xml            | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'k8s-bootstrap-container')

diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh
index 0c55559..503cec2 100755
--- a/k8s-bootstrap-container/bootstrap.sh
+++ b/k8s-bootstrap-container/bootstrap.sh
@@ -193,6 +193,7 @@ 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}
 
diff --git a/k8s-bootstrap-container/build-plugins.sh b/k8s-bootstrap-container/build-plugins.sh
index f7bc393..388f234 100755
--- a/k8s-bootstrap-container/build-plugins.sh
+++ b/k8s-bootstrap-container/build-plugins.sh
@@ -42,6 +42,7 @@ dcaepolicyplugin/2.3.0/dcaepolicyplugin-2.3.0.tgz \
 CCSDKPLUGINFILES=\
 "\
 plugins/pgaas-1.1.0-py27-none-any.wgn
+plugins/dmaap-1.3.2-py27-none-any.wgn
 plugins/sshkeyshare-1.0.0-py27-none-any.wgn
 plugins/helm-4.0.0-py27-none-linux_x86_64.wgn
 "
diff --git a/k8s-bootstrap-container/load-blueprints.sh b/k8s-bootstrap-container/load-blueprints.sh
index e42a72e..e6838e6 100755
--- a/k8s-bootstrap-container/load-blueprints.sh
+++ b/k8s-bootstrap-container/load-blueprints.sh
@@ -30,7 +30,9 @@ k8s-ves.yaml \
 k8s-snmptrap.yaml \
 k8s-prh.yaml \
 k8s-hv-ves.yaml \
-k8s-datafile-collector.yaml
+k8s-helm-override.yaml \
+k8s-helm.yaml \
+k8s-dashboard.yaml 
 "
 
 BPDEST=blueprints
diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml
index dc7393a..98ce298 100644
--- 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.11</version>
+  <version>1.4.12</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-- 
cgit 1.2.3-korg