summaryrefslogtreecommitdiffstats
path: root/juju
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-10-19 07:22:26 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-10-19 07:58:51 -0500
commit9510c5939f4a30b79d6104ea5b05af42a1ea446a (patch)
treeb4625282cc988168af1eb73eaca5ab2777e5b870 /juju
parentc47f8b6275db5fe659aad4967ea024ac6e7b4146 (diff)
fixing creation of the network.
Change-Id: Id46aa07dce661dc309ccbc73d4afa62e94657b9b Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'juju')
-rwxr-xr-xjuju/joid-configure-openstack15
1 files changed, 5 insertions, 10 deletions
diff --git a/juju/joid-configure-openstack b/juju/joid-configure-openstack
index 6c872521..34661281 100755
--- a/juju/joid-configure-openstack
+++ b/juju/joid-configure-openstack
@@ -68,17 +68,12 @@ echo "Modifying the flavors to be better sized for the Orange Box"
#Modify the flavours to fit better on the OB
#nova flavor-create FLAVOR_NAME FLAVOR_ID RAM_IN_MB ROOT_DISK_IN_GB NUMBER_OF_VCPUS
-openstack flavor delete m1.tiny > /dev/null 2>&1
-openstack flavor delete m1.small > /dev/null 2>&1
-openstack flavor delete m1.medium > /dev/null 2>&1
-openstack flavor delete m1.large > /dev/null 2>&1
-openstack flavor delete m1.xlarge > /dev/null 2>&1
-openstack flavor create --ram 512 --disk 5 --vcpus 1 --public m1.tiny > /dev/null 2>&1
-openstack flavor create --ram 1024 --disk 10 --vcpus 1 --public m1.small > /dev/null 2>&1
-openstack flavor create --ram 2048 --disk 10 --vcpus 2 --public m1.medium > /dev/null 2>&1
-openstack flavor create --ram 3072 --disk 10 --vcpus 2 --public m1.large > /dev/null 2>&1
+openstack flavor show m1.tiny > /dev/null 2>&1 || openstack flavor create --ram 512 --disk 5 --vcpus 1 --public m1.tiny > /dev/null 2>&1
+openstack flavor show m1.small > /dev/null 2>&1 || openstack flavor create --ram 1024 --disk 10 --vcpus 1 --public m1.small > /dev/null 2>&1
+openstack flavor show m1.medium > /dev/null 2>&1 || openstack flavor create --ram 2048 --disk 10 --vcpus 2 --public m1.medium > /dev/null 2>&1
+openstack flavor show m1.large > /dev/null 2>&1 || openstack flavor create --ram 3072 --disk 10 --vcpus 2 --public m1.large > /dev/null 2>&1
# need extra for windows image (15g)
-openstack flavor create --ram 8096 --disk 30 --vcpus 4 --public m1.xlarge > /dev/null 2>&1
+openstack flavor show m1.xlarge > /dev/null 2>&1 || openstack flavor create --ram 8096 --disk 30 --vcpus 4 --public m1.xlarge > /dev/null 2>&1
echo "modifying default quotas for admin user"