Merge pull request #190 from dosaboy/ps-vips

Dynamically set VIP_ADDR_START

common/generate_bundle_base

@@ -10,6 +10,17 @@ declare -a overlay_opts=()
 update_master_opts ${MOD_PASSTHROUGH_OPTS[@]}
 
 vip_start=${MASTER_OPTS[VIP_ADDR_START]}
+if [[ -z $vip_start ]]; then
+    # prodstack
+    cidr=$(source ~/novarc; openstack subnet show subnet_${OS_USERNAME} -c cidr -f value 2>/dev/null)
+    if [[ -z $cidr ]]; then
+        # stsstack
+        cidr=$(source ~/novarc; openstack subnet show ${OS_USERNAME}_admin_subnet -c cidr -f value 2>/dev/null)
+    fi
+    if [[ -n $cidr ]]; then
+        vip_start=$(echo $cidr| sed -r 's/([0-9]+\.[0-9]+).+/\1/g').150.0
+    fi
+fi
 VIP_START_PREFIX=${vip_start%\.*}
 VIP_START_SUFFIX=${vip_start##*\.}
 

common/helpers

@@ -8,7 +8,7 @@ declare -A MASTER_OPTS=(
     [BUNDLE_NAME]=''
     [CLOUD_NAME]=''
     [TARGET_RELEASE_NAME]=''
-    [VIP_ADDR_START]=10.5.100.0
+    [VIP_ADDR_START]=
     [CHARM_REVISIONS]=
     [CHARM_STORE]=ch:
 )