summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2018-04-27 10:30:58 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2018-04-27 10:30:58 -0500
commit54046691d49f1034cbf7ba3fd4c54fd9266475ca (patch)
tree6a35aba94c83c14e5b33aef62f2fb302657cd39e
parent5235de0b3205b6d7e9c63cc85600927226a755d6 (diff)
dynamically using the bootstrap and change domain.
Change-Id: Id5fbb9cc577cd69b216d2ae2a7e8669412dbba0d Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rwxr-xr-xci/01-bootstrap.sh2
-rwxr-xr-xci/03-maasdeploy.sh17
-rwxr-xr-xci/deploy.sh1
3 files changed, 15 insertions, 5 deletions
diff --git a/ci/01-bootstrap.sh b/ci/01-bootstrap.sh
index a946b0f..62692bc 100755
--- a/ci/01-bootstrap.sh
+++ b/ci/01-bootstrap.sh
@@ -4,4 +4,4 @@ set -ex
controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
-juju bootstrap $controllername $cloudname --debug --to bootstrap.maas --bootstrap-series=xenial
+juju bootstrap $controllername $cloudname --debug --constraints tags=bootstrap --bootstrap-series=xenial
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index 7ccb72d..82c0044 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -279,6 +279,7 @@ configuremaas(){
maas $PROFILE maas set-config name=upstream_dns value=$MY_UPSTREAM_DNS || true
maas $PROFILE maas set-config name='maas_name' value=$MAAS_NAME || true
maas $PROFILE maas set-config name='ntp_server' value='ntp.ubuntu.com' || true
+ maas $PROFILE domain update 0 name=$MAAS_NAME || true
maas $PROFILE sshkeys create "key=$SSH_KEY" || true
for tag in bootstrap compute control storage
@@ -290,9 +291,9 @@ configuremaas(){
maas $PROFILE tags create name='opnfv-dpdk' comment='OPNFV DPDK enablement' \
kernel_opts='hugepagesz=2M hugepages=1024 hugepagesz=1G hugepages=20 default_hugepagesz=1G intel_iommu=on' || true
- maas $PROFILE package-repositories create name="Ubuntu Proposed new" \
- url="http://archive.ubuntu.com/ubuntu" components="main" \
- distributions="xenial-proposed" arches=amd64,i386
+ #maas $PROFILE package-repositories create name="Ubuntu Proposed new" \
+ # url="http://archive.ubuntu.com/ubuntu" components="main" \
+ # distributions="xenial-proposed" arches=amd64,i386
#create the required spaces.
maas $PROFILE space update 0 name=default || true
@@ -307,8 +308,16 @@ configuremaas(){
maas $PROFILE boot-source update $SOURCE_ID \
url=$URL keyring_filename=$KEYRING_FILE || true
+ maas $PROFILE boot-source-selections create 1 \
+ os="ubuntu" release="xenial" arches="amd64" \
+ labels="*" || true
+ maas $PROFILE boot-source-selections create 1 \
+ os="ubuntu" release="bionic" arches="amd64" \
+ labels="*" || true
+
if [ $NODE_ARCTYPE != "x86_64" ] ; then
- maas $PROFILE boot-source-selection update 1 1 arches="$NODE_ARCHES"
+ maas $PROFILE boot-source-selection update 1 1 arches="$NODE_ARCHES" || true
+ maas $PROFILE boot-source-selection update 1 2 arches="$NODE_ARCHES" || true
fi
if [ "$snapinstall" -eq "0" ]; then
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 3078ac2..a06696c 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -264,6 +264,7 @@ deploy() {
./01-bootstrap.sh
juju model-config default-series=$opnfvdistro enable-os-refresh-update=false enable-os-upgrade=false
+ juju set-model-constraints tags=
# case default deploy the opnfv platform:
./02-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature $opnfvdistro $opnfvmodel