From 2ef983414d7b84071a50d31ccd8405f20ad5119e Mon Sep 17 00:00:00 2001
From: Ilya Shakhat <ishakhat@mirantis.com>
Date: Tue, 10 Feb 2015 18:50:42 +0300
Subject: [PATCH] Update prepare script and demo template

---
 bin/prepare.sh                     | 3 ++-
 requirements.txt                   | 1 +
 scenarios/single_net.heat.template | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/prepare.sh b/bin/prepare.sh
index 981913b..f8381eb 100755
--- a/bin/prepare.sh
+++ b/bin/prepare.sh
@@ -56,7 +56,8 @@ setup_image() {
     message "Installing packages into VM"
     remote_shell ${FLOATING_IP} ${KEY} "sudo apt-add-repository \"deb http://nova.clouds.archive.ubuntu.com/ubuntu/ trusty multiverse\""
     remote_shell ${FLOATING_IP} ${KEY} "sudo apt-get update"
-    remote_shell ${FLOATING_IP} ${KEY} "sudo apt-get -y install iperf netperf python-pip git python-dev libzmq-dev"
+    remote_shell ${FLOATING_IP} ${KEY} "sudo apt-get -y install iperf netperf git python-dev libzmq-dev"
+    remote_shell ${FLOATING_IP} ${KEY} "wget -O get-pip.py https://bootstrap.pypa.io/get-pip.py && sudo python get-pip.py"
     remote_shell ${FLOATING_IP} ${KEY} "sudo pip install pbr netperf-wrapper"
     remote_shell ${FLOATING_IP} ${KEY} "git clone git://github.com/Mirantis/shaker && cd shaker && sudo python setup.py develop"
 
diff --git a/requirements.txt b/requirements.txt
index bb84cdc..90b93ff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,7 @@
 
 pbr>=0.6,!=0.7,<1.0
 
+iso8601>=0.1.9
 Jinja2>=2.6  # BSD License (3 clause)
 oslo.concurrency>=1.4.1         # Apache-2.0
 oslo.config>=1.6.0  # Apache-2.0
diff --git a/scenarios/single_net.heat.template b/scenarios/single_net.heat.template
index 8498592..4a628b1 100644
--- a/scenarios/single_net.heat.template
+++ b/scenarios/single_net.heat.template
@@ -41,6 +41,7 @@ resources:
     properties:
       network_id: { get_resource: private_net }
       cidr: { get_param: private_net_cidr }
+      dns_nameservers: [ 8.8.8.8, 8.8.4.4 ]
 
   router:
     type: OS::Neutron::Router
@@ -61,8 +62,8 @@ resources:
       rules: [
         {remote_ip_prefix: 0.0.0.0/0,
         protocol: tcp,
-        port_range_min: 22,
-        port_range_max: 22},
+        port_range_min: 1,
+        port_range_max: 65535},
         {remote_ip_prefix: 0.0.0.0/0,
         protocol: icmp}]