summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorburdziak <olaf.burdziakowski@nokia.com>2018-06-04 10:40:41 +0200
committerburdziak <olaf.burdziakowski@nokia.com>2018-06-05 11:41:18 +0200
commitd0afc3c4501f752cb97c5b00190ca65d90e8bbff (patch)
tree33cd7e1b5333045affff24d65da6dbf6cab4a6c1
parent5867fe10b1f5583bc2fd9cd7458039998ddd43a3 (diff)
Micro-Service Blueprint
Modified pomm minor versions Change-Id: Ib302f06d30ed1851bddc2e54b80097ba6848d415 Issue-ID: DCAEGEN2-394 Signed-off-by: burdziak <olaf.burdziakowski@nokia.com>
-rwxr-xr-xbootstrap/installer-docker.sh-template5
-rw-r--r--bootstrap/pom.xml2
-rwxr-xr-xk8s-bootstrap-container/bootstrap.sh1
-rwxr-xr-xk8s-bootstrap-container/load-blueprints.sh3
-rw-r--r--k8s-bootstrap-container/pom.xml2
5 files changed, 10 insertions, 3 deletions
diff --git a/bootstrap/installer-docker.sh-template b/bootstrap/installer-docker.sh-template
index 5957381..21ccabb 100755
--- a/bootstrap/installer-docker.sh-template
+++ b/bootstrap/installer-docker.sh-template
@@ -39,6 +39,7 @@ VESBP=ves.yaml
TCABP=tca.yaml
HRULESBP=holmes-rules.yaml
HENGINEBP=holmes-engine.yaml
+PRHBP=prh.yaml
DOCKERBPURL="${PLATBPSRC}/${DOCKERBP}"
CBSBPURL="${PLATBPSRC}/${CBSBP}"
@@ -52,6 +53,7 @@ VESBPURL="${PLATBPSRC}/${VESBP}"
TCABPURL="${PLATBPSRC}/${TCABP}"
HRULESBPURL="${PLATBPSRC}/${HRULESBP}"
HENGINEBPURL="${PLATBPSRC}/${HENGINEBP}"
+PRHBPURL="${PLATBPSRC}/${PRHBP}"
LOCATIONID=$(printenv LOCATION)
@@ -369,6 +371,7 @@ wget -P ./blueprints/ves/ ${VESBPURL}
wget -P ./blueprints/tca/ ${TCABPURL}
wget -P ./blueprints/hrules/ ${HRULESBPURL}
wget -P ./blueprints/hengine/ ${HENGINEBPURL}
+wget -P ./blueprints/prh/ ${PRHBPURL}
# Set up the credentials for access to the Docker registry
@@ -444,6 +447,8 @@ cfy install -p ./blueprints/tca/${TCABP} -b tca -d tca -i ../config/tcainputs.ya
cfy install -p ./blueprints/hrules/${HRULESBP} -b hrules -d hrules -i ../config/hr-ip.yaml
cfy install -p ./blueprints/hengine/${HENGINEBP} -b hengine -d hengine -i ../config/he-ip.yaml
+# PRH
+cfy install -p ./blueprints/prh/${PRHBP} -b prh -d prh -i ../config/prhinput.yaml
# write out IP addresses
echo "$CONSULIP" > "$STARTDIR"/config/runtime.ip.consul
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index fe30d92..d2965e9 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -28,7 +28,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<groupId>org.onap.dcaegen2.deployments</groupId>
<artifactId>bootstrap</artifactId>
<name>dcaegen2-deployments-bootstrap</name>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh
index 0ac0f8e..6d39404 100755
--- a/k8s-bootstrap-container/bootstrap.sh
+++ b/k8s-bootstrap-container/bootstrap.sh
@@ -107,6 +107,7 @@ deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml
# Deploy service components
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
# holmes_rules must be deployed before holmes_engine
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/load-blueprints.sh b/k8s-bootstrap-container/load-blueprints.sh
index 2037427..9410f61 100755
--- a/k8s-bootstrap-container/load-blueprints.sh
+++ b/k8s-bootstrap-container/load-blueprints.sh
@@ -15,7 +15,8 @@ k8s-inventory.yaml \
k8s-policy_handler.yaml \
k8s-pgaas-initdb.yaml \
k8s-tca.yaml \
-k8s-ves.yaml
+k8s-ves.yaml \
+k8s-prh.yaml
"
BPDEST=blueprints
diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml
index 660f734..a755f46 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.1.11</version>
+ <version>1.2.0</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>