diff options
| -rwxr-xr-x | bootstrap/installer-docker.sh-template | 4 | ||||
| -rwxr-xr-x | k8s-bootstrap-container/bootstrap.sh | 3 | ||||
| -rwxr-xr-x | k8s-bootstrap-container/load-blueprints.sh | 3 | ||||
| -rw-r--r-- | k8s-bootstrap-container/pom.xml | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/bootstrap/installer-docker.sh-template b/bootstrap/installer-docker.sh-template index 4f889fc..1364dc1 100755 --- a/bootstrap/installer-docker.sh-template +++ b/bootstrap/installer-docker.sh-template @@ -383,7 +383,7 @@ curl -X PUT -H "Content-Type: application/json" --data-binary '[{"username":"doc # Install platform Docker host # Note we're still in the "consul" directory, which is init'ed for talking to CM -set +e +set +e # Docker host for platform containers cfy install -v -p ./blueprints/docker/${DOCKERBP} -b DockerBP -d DockerPlatform -i ../${INPUTS} -i "registered_dockerhost_name=platform_dockerhost" -i "registrator_image=onapdcae/registrator:v7" -i "location_id=${LOCATION}" -i "node_name=dokp00" -i "target_datacenter=${LOCATION}" @@ -451,7 +451,7 @@ cfy install -p ./blueprints/hrules/${HRULESBP} -b hrules -d hrules -i ../config/ 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 +cfy install -p ./blueprints/prh/${PRHBP} -b prh -d prh -i ../config/prh-input.yaml # HV-VES cfy install -p ./blueprints/hv-ves/${HVVESBP} -b hv-ves -d hv-ves diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh index b4a05a7..a675ba8 100755 --- a/k8s-bootstrap-container/bootstrap.sh +++ b/k8s-bootstrap-container/bootstrap.sh @@ -217,12 +217,13 @@ PH_PID=$! wait ${INV_PID} ${DH_PID} ${PH_PID} # Deploy service components -# tca, ves, prh, hv-ves can be deployed simultaneously +# 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 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-input.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/load-blueprints.sh b/k8s-bootstrap-container/load-blueprints.sh index 4bc8004..fbbb194 100755 --- a/k8s-bootstrap-container/load-blueprints.sh +++ b/k8s-bootstrap-container/load-blueprints.sh @@ -18,7 +18,8 @@ k8s-tca.yaml \ k8s-ves.yaml \ k8s-snmptrap.yaml \ k8s-prh.yaml \ -k8s-hv-ves.yaml +k8s-hv-ves.yaml \ +k8s-datafile-collector.yaml " BPDEST=blueprints diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml index 7b2096d..6d65969 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.2</version> + <version>1.4.3</version> <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |