Unverified Commit c9cc15c0 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #132 from nikhildoifode/na-1042 

user-chart folder creation and demo2 documentation update
parents 954d72df 732c1829

examples/demo2/README.md

+24 −3
Original line number Diff line number Diff line
@@ -11,6 +11,27 @@ This scenario is the same as [demo1](../demo1/README.md) except that it uses _us 


## Using the scenario



- [Import scenario in AdvantEDGE](https://github.com/InterDigitalInc/AdvantEDGE/wiki/basic-operation#import-demo1-scenario-in-advantedge)

- Deploy scenario

  - Scenario behavior is identical to [demo1](../demo1/README.md)
 
 No newline at end of file
 
The following steps need to be done prior to using this scenario



##### Build



To build demo2:



```

cd ~/AdvantEDGE/examples/demo2/

./build-demo2.sh

```



##### Import



To import demo2 follow steps given for demo1 just import demo2-scenario.yaml from AdvantEDGE/examples/demo2/ instead of demo1-scenario.yaml:



[Import scenario in AdvantEDGE](https://github.com/InterDigitalInc/AdvantEDGE/wiki/basic-operation#import-demo1-scenario-in-advantedge)







##### Deploy



To deploy demo2 follow steps given for demo1 just select demo2 from dropdown instead of demo:



[Deploy scenario in AdvantEDGE](https://github.com/InterDigitalInc/AdvantEDGE/wiki/basic-operation#deploy-demo1-scenario)

examples/demo2/build-demo2.sh

0 → 100755
+17 −0
Original line number Diff line number Diff line 
#!/bin/bash



# Get full path to script directory

SCRIPT=$(readlink -f "$0")

BASEDIR=$(dirname "$SCRIPT")

cd $BASEDIR



# Retrieve workdir

WORKDIR=`grep workdir $HOME/.meepctl.yaml | sed 's/^.*workdir:[ \t]*//'`

DEMO2DIR=${WORKDIR}/virt-engine/user-charts/demo2



# Copy demo charts to workdir

mkdir -p ${DEMO2DIR}

cp -r ./charts ${DEMO2DIR}

cp -r ./values ${DEMO2DIR}



echo ">>> Demo2 build completed"

go-apps/meepctl/cmd/deploy.go

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ func deployEnsureStorage(cobraCmd *cobra.Command) { 
	cmd.Args = append(cmd.Args, deployData.workdir+"/influxdb")

	cmd.Args = append(cmd.Args, deployData.workdir+"/tmp")

	cmd.Args = append(cmd.Args, deployData.workdir+"/virt-engine")

	cmd.Args = append(cmd.Args, deployData.workdir+"/virt-engine/user-charts")

	cmd.Args = append(cmd.Args, deployData.workdir+"/omt")

	cmd.Args = append(cmd.Args, deployData.workdir+"/postgis")

	_, err := utils.ExecuteCmd(cmd, cobraCmd)