summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-05-12 16:23:41 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-12 16:23:41 +0000
commit43577ea6e8c3ef918997156df2654ad781257d0c (patch)
treea7de9af90353771dbac29aea7d5f57187753df7f
parentccfee6905c593d028aef03583c7d30e54637ba4f (diff)
parente3ab84d2d3011c06b9aa638b5ad13f742c38b25a (diff)
Merge "include the mutiple Ubuntu distro and architecture"
-rw-r--r--jjb/joid/joid-deploy.sh4
-rw-r--r--jjb/opnfv/installer-params.yml8
2 files changed, 10 insertions, 2 deletions
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 149447733..6cd2ee323 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -142,9 +142,9 @@ sed -i -r -- "s/^(\s+osd-reformat: )'no'/\1'$CEPH_REFORMAT'/" $SRCBUNDLE
##
echo "------ Deploy with juju ------"
-echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME"
+echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO"
-./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME
+./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO
exit_on_error $? "Main deploy FAILED"
##
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 57ca9864e..c0223e235 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -85,3 +85,11 @@
name: MAAS_REINSTALL
default: 'false'
description: "Reinstall MAAS and Bootstrap before deploy [true/false]"
+ - string:
+ name: UBUNTU_DISTRO
+ default: 'trusty'
+ description: "Ubuntu distribution to use for Openstack (trusty|xenial)"
+ - string:
+ name: CPU_ARCHITECTURE
+ default: 'amd64'
+ description: "CPU Architecture to use for Ubuntu distro "