From cd3d0e80dfe527ddf82b7070d16e4a7e4892d870 Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Mon, 16 Oct 2017 22:45:41 -0400 Subject: [PATCH] Adjust for new location of cloud_init scripts Issue-Id: DCAEGEN2-128 Change-Id: I086602f0aa3d4aec567b66703a549c7ce3b53d39 Signed-off-by: Lusheng Ji --- blueprints/cdapbp7.yaml-template | 3 ++- input-templates/inputs.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/blueprints/cdapbp7.yaml-template b/blueprints/cdapbp7.yaml-template index d9c529b..1284388 100644 --- a/blueprints/cdapbp7.yaml-template +++ b/blueprints/cdapbp7.yaml-template @@ -61,7 +61,8 @@ inputs: vm_init_cdap: type: string default: | - wget -qO- $CODE_SOURCE/${CODE_VERSION}-raw/cloud_init/cdap-init.sh >/tmp/cdap-init.sh + #wget -qO- $CODE_SOURCE/${CODE_VERSION}-raw/cloud_init/cdap-init.sh >/tmp/cdap-init.sh + wget -qO- $CODE_SOURCE/${CODE_VERSION}/cdap-init.sh >/tmp/cdap-init.sh sh /tmp/cdap-init.sh "$CODE_SOURCE" "$CODE_VERSION" "$CLUSTER_INDEX" "$CLUSTER_SIZE" "$CLUSTER_FQDNS" "$CLUSTER_LOCAL_IPS" "$CLUSTER_FLOATING_IPS" "$DATACENTER" "$REGISTERED_NAME" location_id: default: "solutioning-central" diff --git a/input-templates/inputs.yaml b/input-templates/inputs.yaml index 7578d25..a30b2cd 100644 --- a/input-templates/inputs.yaml +++ b/input-templates/inputs.yaml @@ -15,4 +15,4 @@ key_filename: '/opt/dcae/key' location_prefix: 'onapr1' location_domain: 'dcae2.onapdevlab.onap.org' codesource_url: 'https://nexus.onap.org/service/local/repositories/raw/content' -codesource_version: 'org.onap.dcaegen2.deployments/releases/scripts' +codesource_version: 'org.onap.dcaegen2.deployments/releases/scripts/cloud_init' -- 2.16.6