Adapt to latest changes in dev-install

Also decrease number of workers and their flavor to allow deploying on
smaller boxes.

Author: dulek

tools/dsal/dsal_helper/dsal_helper.py

@@ -152,8 +152,7 @@ def dev_install_cfg(self, args):
             vars['host_ip'] = socket.gethostbyname(args.hostname)
 
         range = netaddr.IPRange(args.fip_pool_start, args.fip_pool_end)
-        vars['control_plane_ip'] = range[0]
-        vars['external_start'] = range[1]
+        vars['external_start'] = range[0]
         vars['external_end'] = range[-1]
 
         self._create_dir('dev-install')

tools/dsal/dsal_helper/templates/install-config.yaml.tpl

@@ -6,12 +6,14 @@ compute:
     openstack:
       zones: []
       additionalNetworkIDs: []
-  replicas: 3
+      type: m1.large
+  replicas: 2
 controlPlane:
   name: master
   platform:
     openstack:
       zones: []
+      type: m1.xlarge
   replicas: 3
 metadata:
   name: "ostest"
@@ -27,7 +29,7 @@ platform:
     cloud:        	   "{{ cloud }}"
     externalNetwork:   "external"
     region:       	   "regionOne"
-    computeFlavor:	   "m1.xlarge"
+    computeFlavor:     "m1.xlarge"
     lbFloatingIP: 	   "{{ api_fip }}"
     ingressFloatingIP: "{{ ingress_fip }}"
     externalDNS:  	   ["1.1.1.1"]

tools/dsal/dsal_helper/templates/local-overrides-16.2.yaml.tpl

@@ -1,7 +1,6 @@
 # Override default variables by putting them in this file
 standalone_host: {{ hostname }}
 public_api: {{ host_ip }}
-control_plane_ip: {{ control_plane_ip }}
 external_cidr: 10.1.8.0/22
 external_gateway: 10.1.11.254
 external_fip_pool_start : {{ external_start }}

tools/dsal/scripts/get-latest.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -x
 
 version=$1
-latest_nightly=$(curl -s https://openshift-release-artifacts.apps.ci.l2s4.p1.openshiftapps.com/ | awk "match(\$0, /($version.0-0.nightly[-0-9]+)/, a) {print a[1]}" | tail -1)
+latest_nightly=$(curl -s https://openshift-release-artifacts.apps.ci.l2s4.p1.openshiftapps.com/ | awk "match(\$0, /($version.0-0.nightly-[-0-9]+)/, a) {print a[1]}" | tail -1)
 wget "https://openshift-release-artifacts.apps.ci.l2s4.p1.openshiftapps.com/$latest_nightly/openshift-install-linux-${latest_nightly}.tar.gz"
 mkdir $latest_nightly
 tar -C $latest_nightly -xvzf openshift-install-linux-${latest_nightly}.tar.gz openshift-install

tools/dsal/scripts/open-ping.sh

@@ -0,0 +1,7 @@
+#!/bin/bash -x
+
+sgs=`openstack security group list -f value | grep OpenShift | cut -f 1 -d " "`
+
+for sg in $sgs; do
+    openstack security group rule create --dst-port 22 --protocol tcp $sg
+done