From a635b48fee2701e495307de0af6d4eab510e84fb Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 8 Jun 2018 19:10:00 +0200 Subject: [noha] Adopt vPDF usage Previously, all virtual deployments relied on lab configuration from <./mcp/config> using 'local-virtual1' as POD name. To keep using that default sample config, one can still pass the appropiate arguments to as in: $ ./ci/deploy.sh -l local -p virtual1 [...] This changed introduces support for vPOD-specific lab config, e.g.: $ ./ci/deploy.sh -l ericsson -p virtual4 Change-Id: I6ecb8e71d7e923e4b29b4ab0693c1afa5e19b582 Signed-off-by: Alexandru Avadanii --- ci/deploy.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'ci') diff --git a/ci/deploy.sh b/ci/deploy.sh index fd41be85d..10b639e3c 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -90,7 +90,10 @@ $(notify_i "Input parameters to the build script are:" 2) -h Print this message and exit -L Deployment log path and name, eg. -L /home/jenkins/job.log.tar.gz -l Lab name as defined in the configuration directory, e.g. lf + For the sample configuration in <./mcp/config>, lab name is 'local'. -p POD name as defined in the configuration directory, e.g. pod2 + For the sample configuration in <./mcp/config>, POD name is 'virtual1' + for virtual deployments or 'pod1' for baremetal (based on lf-pod2). -N Experimental: Instead of virtualizing the control plane (VCP), deploy control plane directly on baremetal nodes -P Skip installing dependency distro packages on current host @@ -187,11 +190,6 @@ do ;; p) TARGET_POD=${OPTARG} - if [[ "${TARGET_POD}" =~ virtual ]]; then - # All vPODs will use 'local-virtual1' PDF/IDF for now - TARGET_LAB='local' - TARGET_POD='virtual1' - fi ;; P) USE_EXISTING_PKGS=1 -- cgit 1.2.3-korg