diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-05 19:09:05 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-08-05 19:10:11 -0500 |
| commit | 669a243f81e11b1fb4e74ac58f8c6f426f1c7751 (patch) | |
| tree | 8f3d574eba4346e83a19849e0acbcf8cc2894935 /ci/00-maasdeploy.sh | |
| parent | 0f81e81552bdf0053fc0303c53dff455c17d56a6 (diff) | |
corrected the files as per review comment.
Change-Id: Ib7ad9bdb54b29db25d37d80ad9c1259734032ef2
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/00-maasdeploy.sh')
| -rwxr-xr-x | ci/00-maasdeploy.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ci/00-maasdeploy.sh b/ci/00-maasdeploy.sh index 8b8a8d44..98ca47af 100755 --- a/ci/00-maasdeploy.sh +++ b/ci/00-maasdeploy.sh @@ -31,14 +31,14 @@ labfile=$2 case "$labname" in intelpod[569]|orangepod[12]|cengnpod[12] ) array=(${labname//pod/ }) - cp maas/${array[0]}/pod${array[0]}/labconfig.yaml . - python genDeploymentConfig.py > deployment.yaml - python genMAASConfig.py > deployconfig.yaml + cp ../labconfig/${array[0]}/pod${array[1]}/labconfig.yaml . + python genMAASConfig.py -l labconfig.yaml > deployment.yaml + python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml ;; 'attvirpod1' ) - cp maas/att/virpod1/labconfig.yaml . - python genDeploymentConfig.py > deployment.yaml - python genMAASConfig.py > deployconfig.yaml + cp ../labconfig/att/virpod1/labconfig.yaml . + python genMAASConfig.py -l labconfig.yaml > deployment.yaml + python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml ;; 'juniperpod1' ) cp maas/juniper/pod1/deployment.yaml ./deployment.yaml @@ -56,8 +56,8 @@ case "$labname" in if [ ! -e ./labconfig.yaml ]; then virtinstall=1 else - python genDeploymentConfig.py > deployment.yaml - python genMAASConfig.py > deployconfig.yaml + python genMAASConfig.py -l labconfig.yaml > deployment.yaml + python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml labname=`grep "maas_name" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //'` fi ;; |