performa/shaker
Code Issues Proposed changes

Update prepare script and demo template

Browse Source
This commit is contained in:
Ilya Shakhat 2015-02-10 18:50:42 +03:00
parent 8b0cf02ce8
commit 2ef983414d
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/prepare.sh
View File

@ -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"

1
requirements.txt
View File

@ -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

5
scenarios/single_net.heat.template
View File

@ -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}]