From f2fee53204aa7f3f8fe532b0394b60300a7f96f6 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 21 Dec 2016 14:15:14 -0600 Subject: typing mistake. Change-Id: I55ecd127cd1a3eeef2f2006ad3462dbe12a00037 Signed-off-by: Narinder Gupta --- ci/02-deploybundle.sh | 4 +++- ci/kubernates/fetch-charms.sh | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh index 8589c6ae..23107878 100755 --- a/ci/02-deploybundle.sh +++ b/ci/02-deploybundle.sh @@ -63,7 +63,7 @@ if [[ "$opnfvmodel" = "openstack" ]]; then osdomname=`grep "os-domain-name" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'` fi - workmutiple=`maas maas nodes list | grep "cpu_count" | cut -d ':' -f 2 | sed -e 's/ //' | tr ',' ' '` + workmutiple=`maas maas nodes read | grep "cpu_count" | cut -d ':' -f 2 | sed -e 's/ //' | tr ',' ' '` max=0 for v in ${workmutiple[@]}; do if (( $v > $max )); then max=$v; fi; @@ -111,6 +111,8 @@ if [[ "$opnfvmodel" = "openstack" ]]; then if [ "$osdomname" != "None" ]; then var=$var"_"publicapi fi +else + var=k8-$opnfvsdn-$fea-baremetal-core fi if [[ "$opnfvmodel" = "openstack" ]]; then diff --git a/ci/kubernates/fetch-charms.sh b/ci/kubernates/fetch-charms.sh index 2a3d7536..e5bc1fe3 100755 --- a/ci/kubernates/fetch-charms.sh +++ b/ci/kubernates/fetch-charms.sh @@ -10,8 +10,9 @@ function build { } # openstack +bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp charm pull cs:~containers/kubernetes-master $distro/kubernetes-master charm pull cs:~containers/kubernetes-worker $distro/kubernetes-worker charm pull cs:~containers/flannel $distro/flannel charm pull cs:~containers/etcd $distro/etcd -charm pull cs:~containers/easyrca $distro/easyrca +charm pull cs:~containers/easyrsa $distro/easyrsa -- cgit 1.2.3-korg