From e6f1588dbeb8f4d02398b34b621d285d5112e4c5 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 27 Jan 2016 11:45:11 -0600 Subject: revert back previous changes and enabling the feature flag in JUJU. Change-Id: I567f376a697dfbc61b017f6da25e630b7f8c8248 --- ci/00-bootstrap.sh | 2 ++ ci/deploy.sh | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/00-bootstrap.sh b/ci/00-bootstrap.sh index c04ae2da..fdc65293 100755 --- a/ci/00-bootstrap.sh +++ b/ci/00-bootstrap.sh @@ -2,6 +2,8 @@ set -ex +export JUJU_DEV_FEATURE_FLAGS=address-allocation + juju bootstrap --debug --to bootstrap.maas sleep 5 juju deploy juju-gui --to 0 diff --git a/ci/deploy.sh b/ci/deploy.sh index 63d550a6..6005eb1d 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -110,7 +110,6 @@ deploy() { echo " enable-os-upgrade: false" >> environments.yaml echo " admin-secret: admin" >> environments.yaml echo " default-series: trusty" >> environments.yaml - echo " address-allocation: true" >> environments.yaml cp environments.yaml ~/.juju/ -- cgit 1.2.3-korg