diff options
| author |   Carsten Lund <lund@research.att.com> | 2017-05-05 02:26:33 +0000 |
|---|---|---|
| committer | Carsten Lund <lund@research.att.com> | 2017-05-05 02:26:33 +0000 |
| commit | 96a3aa69a12a257a18572a686366d683d91cf82d (patch) | |
| tree | dfcddeb1201b9f464b5347ab373721360724e569 /dcae-demo-controller | |
| parent | 5e26ea3e299fdd98ddc1eea1bd436a1e2c7389d6 (diff) | |
[DCAE-7] updates for Vanilla Openstack support
Change-Id: Ib49c6afe4c616729aee1ce06d64f50a0765fcde1
Signed-off-by: Carsten Lund <lund@research.att.com>
Diffstat (limited to 'dcae-demo-controller')
3 files changed, 3 insertions, 2 deletions
diff --git a/dcae-demo-controller/src/main/docker-build/build.sh b/dcae-demo-controller/src/main/docker-build/build.sh index df42c9f..2500aa8 100644 --- a/dcae-demo-controller/src/main/docker-build/build.sh +++ b/dcae-demo-controller/src/main/docker-build/build.sh @@ -24,7 +24,7 @@ cp $ROOT/target/assembly/lib/*.jar lib/ # copy configuration files for controller ( cd $ROOT/.. - tar cfz - OPENECOMP-DEMO OPENECOMP-DEMO-RACKSPACE + tar cfz - OPENECOMP-DEMO OPENECOMP-DEMO-* ) > config.tar.gz if [ "$1" == "nobuild" ]; then exit; fi diff --git a/dcae-demo-controller/src/main/docker-build/controller-startup.sh b/dcae-demo-controller/src/main/docker-build/controller-startup.sh index a5b6a02..e31c72b 100644 --- a/dcae-demo-controller/src/main/docker-build/controller-startup.sh +++ b/dcae-demo-controller/src/main/docker-build/controller-startup.sh @@ -12,6 +12,7 @@ export PATH=$JAVA_HOME/bin:$GROOVY_HOME/bin:/opt/app/git/2.4.1/bin:$PATH cd /opt/app/dcae-controller-platform-server export ZONE=$(grep ZONE /opt/app/dcae-controller/config.yaml | sed s/ZONE:.//) +export BASE=$(grep BASE /opt/app/dcae-controller/config.yaml | sed s/BASE:.//) OPENSTACK_KEYNAME=$(grep OPENSTACK-KEYNAME /opt/app/dcae-controller/config.yaml | sed s/OPENSTACK-KEYNAME:.//) NETWORK=$(grep OPENSTACK-PRIVATE-NETWORK /opt/app/dcae-controller/config.yaml | sed s/OPENSTACK-PRIVATE-NETWORK:.//) diff --git a/dcae-demo-controller/src/main/docker-build/controller.makefile b/dcae-demo-controller/src/main/docker-build/controller.makefile index 40b570e..b1eb11b 100644 --- a/dcae-demo-controller/src/main/docker-build/controller.makefile +++ b/dcae-demo-controller/src/main/docker-build/controller.makefile @@ -1,7 +1,7 @@ restart: stop start gen-config: - bin/dcae-controller.sh rackspace-substitute --from OPENECOMP-DEMO-RACKSPACE --to OPENECOMP-DEMO-$(ZONE) --file /opt/app/dcae-controller/config.yaml + bin/dcae-controller.sh rackspace-substitute --from OPENECOMP-DEMO-$(BASE) --to OPENECOMP-DEMO-$(ZONE) --file /opt/app/dcae-controller/config.yaml java -cp 'lib/*' org.openecomp.dcae.controller.operation.utils.GenControllerConfiguration $(ZONE) . GITLINK OPENECOMP-DEMO sync: bin/dcae-controller.sh sync-configuration --environment OPENECOMP-DEMO-$(ZONE) |