From 96a3aa69a12a257a18572a686366d683d91cf82d Mon Sep 17 00:00:00 2001 From: Carsten Lund Date: Fri, 5 May 2017 02:26:33 +0000 Subject: [DCAE-7] updates for Vanilla Openstack support Change-Id: Ib49c6afe4c616729aee1ce06d64f50a0765fcde1 Signed-off-by: Carsten Lund --- dcae-demo-controller/src/main/docker-build/build.sh | 2 +- dcae-demo-controller/src/main/docker-build/controller-startup.sh | 1 + dcae-demo-controller/src/main/docker-build/controller.makefile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'dcae-demo-controller') 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) -- cgit 1.2.3-korg