summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLusheng Ji <lji@research.att.com>2017-10-16 22:45:41 -0400
committerLusheng Ji <lji@research.att.com>2017-10-16 22:45:49 -0400
commitcd3d0e80dfe527ddf82b7070d16e4a7e4892d870 (patch)
tree99e9fe177794cafd8274e98ed1dcf022d8d7e4bd
parentd7ddfd370052c3ed4556c598711aa31b8c0fa649 (diff)
Adjust for new location of cloud_init scripts
Issue-Id: DCAEGEN2-128 Change-Id: I086602f0aa3d4aec567b66703a549c7ce3b53d39 Signed-off-by: Lusheng Ji <lji@research.att.com>
-rw-r--r--blueprints/cdapbp7.yaml-template3
-rw-r--r--input-templates/inputs.yaml2
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'