diff options
| -rw-r--r-- | blueprints/centos_vm.yaml-template | 1 | ||||
| -rw-r--r-- | blueprints/pgaas-cluster.yaml-template | 5 | ||||
| -rw-r--r-- | blueprints/pgaas-database.yaml-template | 3 | ||||
| -rw-r--r-- | blueprints/pgaas.yaml-template | 5 | ||||
| -rwxr-xr-x | mvn-phase-lib.sh | 14 | ||||
| -rwxr-xr-x | mvn-phase-script.sh | 3 |
6 files changed, 16 insertions, 15 deletions
diff --git a/blueprints/centos_vm.yaml-template b/blueprints/centos_vm.yaml-template index 1211625..aa3bdb4 100644 --- a/blueprints/centos_vm.yaml-template +++ b/blueprints/centos_vm.yaml-template @@ -75,6 +75,7 @@ inputs: CONSULNAME=consul_${CONSULVER}_linux_amd64 MYIP=`curl -Ss http://169.254.169.254/2009-04-04/meta-data/local-ipv4` MYNAME=`hostname` + if [ ! -z "$(echo $MYNAME |grep '.')" ]; then MYNAME="$(echo $MYNAME | cut -f1 -d '.')"; fi echo >>/etc/hosts echo $MYIP $MYNAME >>/etc/hosts mkdir -p /opt/consul/config /opt/consul/data /opt/consul/bin diff --git a/blueprints/pgaas-cluster.yaml-template b/blueprints/pgaas-cluster.yaml-template index a1885f1..7f46d56 100644 --- a/blueprints/pgaas-cluster.yaml-template +++ b/blueprints/pgaas-cluster.yaml-template @@ -104,8 +104,8 @@ inputs: fi echo Look in /tmp/pgaas.out for output from installing PGaaS - NEXUS={{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform }}/debs - for pkg in cdf_17.10.0-LATEST.deb pgaas_17.10.0-LATEST.deb + NEXUS={{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_storage_pgaas_debs_releases }}/debs + for pkg in cdf.deb-1.0.0 pgaas.deb-1.0.0 do OUT=/tmp/$pkg curl -s -k -f -o $OUT $NEXUS/$pkg @@ -113,7 +113,6 @@ inputs: done case $(hostname) in - do *00 ) WRITE=-write ;; *01 ) WRITE= ;; esac diff --git a/blueprints/pgaas-database.yaml-template b/blueprints/pgaas-database.yaml-template index e1b7450..d3e58e3 100644 --- a/blueprints/pgaas-database.yaml-template +++ b/blueprints/pgaas-database.yaml-template @@ -46,9 +46,6 @@ inputs: pgaas_cluster_name: type: string default: pgcl - database_contacts: - type: {} - default: {} database_description: type: string default: 'This is a sample database' diff --git a/blueprints/pgaas.yaml-template b/blueprints/pgaas.yaml-template index 5dbf932..ed27005 100644 --- a/blueprints/pgaas.yaml-template +++ b/blueprints/pgaas.yaml-template @@ -97,8 +97,8 @@ inputs: fi echo Look in /tmp/pgaas.out for output from installing PGaaS - NEXUS={{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform }}/debs - for pkg in cdf_17.10.0-LATEST.deb pgaas_17.10.0-LATEST.deb + NEXUS={{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_storage_pgaas_debs_releases }}/debs + for pkg in cdf.deb-1.0.0 pgaas.deb-1.0.0 do OUT=/tmp/$pkg curl -s -k -f -o $OUT $NEXUS/$pkg @@ -106,7 +106,6 @@ inputs: done case $(hostname) in - do *00 ) WRITE=-write ;; *01 ) WRITE= ;; esac diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh index 6cef83e..d855abc 100755 --- a/mvn-phase-lib.sh +++ b/mvn-phase-lib.sh @@ -108,7 +108,9 @@ expand_templates() export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.platform.plugins" export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_blueprints_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.platform.blueprints" export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_blueprints_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.platform.blueprints" - + export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_storage_pgaas_debs_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.storage.pgaas/snapshots" + export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_storage_pgaas_debs_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.storage.pgaas/releases" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/releases" export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/snapshots" export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/releases" @@ -171,8 +173,9 @@ expand_templates() echo "====> Resolving the following template from environment variables " echo "$TEMPLATES" for KEY in $TEMPLATES; do - VALUE1=$(eval 'echo "$"'"$KEY"'"' | sed 1q) + VALUE1=$(eval 'echo "$'"$KEY"'"' | sed 1q) VALUE2=$(eval 'echo "$'"$KEY"'"' | sed -e 's/\//\\\//g' -e 's/$/\\/' -e '$s/\\$//') + if [ -z "$VALUE2" ];then echo "WARNING WARNING WARNING: $KEY found with no expansion"; fi echo "======> Resolving template $KEY to value $VALUE1 for file $F2" sed -i "s/{{[[:space:]]*$KEY[[:space:]]*}}/$VALUE2/g" "$F2" @@ -203,12 +206,13 @@ test_templates() done echo Verify that the inputs are correct - PATH=$PATH:$PWD/check-blueprint-vs-input/bin + PATH=$PATH:$PROJECT_ROOT/check-blueprint-vs-input/bin find . -name '*-template' | sed -e 's/-template$//' | while read blueprint do - check-blueprint-vs-input -b $blueprint -i check-blueprint-vs-input/lib/sample-inputs.yaml || true - done + check-blueprint-vs-input -b $blueprint -i $PROJECT_ROOT/check-blueprint-vs-input/lib/sample-inputs.yaml || true + done | + sed -e 's/^/WARNING WARNING WARNING: /' } diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh index 3da3e01..afbe961 100755 --- a/mvn-phase-script.sh +++ b/mvn-phase-script.sh @@ -83,7 +83,8 @@ echo "MVN_RAWREPO_SERVERID is [$MVN_RAWREPO_SERVERID]" echo "MVN_DOCKERREGISTRY_SNAPSHOT is [$MVN_DOCKERREGISTRY_SNAPSHOT]" echo "MVN_DOCKERREGISTRY_RELEASE is [$MVN_DOCKERREGISTRY_RELEASE]" echo "MVN_DOCKERREGISTRY_PUBLIC is [$MVN_DOCKERREGISTRY_PUBLIC]" - +echo "HOME is [$HOME]" +echo "PROJECT_ROOT is [$PROJECT_ROOT]" source "${PROJECT_ROOT}"/mvn-phase-lib.sh |