performa/shaker
Code Issues Proposed changes

Fix how agent is installed inside the image

Browse Source 
Change-Id: I7598bb8a691d43cc35b506569d938cba73274481
This commit is contained in:
Ilya Shakhat 2015-08-06 12:26:11 +03:00
parent 95d71d6f0e
commit 7bd0b34de8
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shaker/openstack/clients/nova.py
View File

@ -85,7 +85,7 @@ def _poll_for_status(nova_client, server_id, final_ok_states, poll_period=20,
while True:
obj = nova_client.servers.get(server_id)
err_msg = check_server_console(nova_client, server_id, len_limit=25)
err_msg = check_server_console(nova_client, server_id)
if err_msg:
raise Exception('Critical error in instance %s console: %s' %
(server_id, err_msg))

3
shaker/resources/image_builder_templates/centos.yaml
View File

@ -92,8 +92,7 @@ resources:
make
make install
wget -O get-pip.py https://bootstrap.pypa.io/get-pip.py && python get-pip.py
pip install -U "pip<7.0"
pip install pbr netperf-wrapper flent pyshaker-agent
pip install netperf-wrapper flent pyshaker-agent
service network restart
cat<<'EOF' >> /etc/systemd/system/iperf.service
[Unit]

3
shaker/resources/image_builder_templates/debian.yaml
View File

@ -69,8 +69,7 @@ resources:
sudo apt-get update
sudo apt-get -y install iperf netperf python-dev libzmq-dev screen
wget -O get-pip.py https://bootstrap.pypa.io/get-pip.py && sudo python get-pip.py
sudo pip install -U "pip<7.0"
sudo pip install pbr netperf-wrapper flent pyshaker-agent
sudo pip install netperf-wrapper flent pyshaker-agent
echo -e 'start on startup\ntask\nexec /usr/bin/screen -dmS sudo nice -n -20 /usr/bin/iperf -s' | sudo tee /etc/init/iperf-tcp.conf
echo -e 'start on startup\ntask\nexec /usr/bin/screen -dmS sudo nice -n -20 /usr/bin/iperf -s --udp' | sudo tee /etc/init/iperf-udp.conf
sudo shutdown now

4
shaker/resources/image_builder_templates/ubuntu.yaml
View File

@ -69,8 +69,8 @@ resources:
sudo apt-get update
sudo apt-get -y install iperf netperf python-dev libzmq-dev screen
wget -O get-pip.py https://bootstrap.pypa.io/get-pip.py && sudo python get-pip.py
sudo pip install -U "pip<7.0"
sudo pip install pbr netperf-wrapper flent pyshaker-agent
sudo pip install netperf-wrapper flent pyshaker-agent
shaker-agent -h || (echo "[critical] Failed to run pyshaker-agent. Check if it installed into the image"; sleep 20)
sudo apt-add-repository "deb http://ftp.debian.org/debian/ jessie main" && sudo apt-get update
sudo apt-get -y --force-yes install iperf3
echo -e 'start on startup\ntask\nexec /usr/bin/screen -dmS sudo nice -n -20 /usr/bin/iperf -s' | sudo tee /etc/init/iperf-tcp.conf