diff options
Diffstat (limited to 'yardstick/vTC/apexlake/heat_templates/stress_workload.yaml')
-rw-r--r-- | yardstick/vTC/apexlake/heat_templates/stress_workload.yaml | 40 |
1 files changed, 14 insertions, 26 deletions
diff --git a/yardstick/vTC/apexlake/heat_templates/stress_workload.yaml b/yardstick/vTC/apexlake/heat_templates/stress_workload.yaml index 85477fe85..9820705a4 100644 --- a/yardstick/vTC/apexlake/heat_templates/stress_workload.yaml +++ b/yardstick/vTC/apexlake/heat_templates/stress_workload.yaml @@ -9,24 +9,18 @@ parameters: type: string memory: type: string + network: + type: string + subnet: + type: string resources: - internal_net: - type: OS::Neutron::Net - properties: - name: traffic_network - internal_subnet: - type: OS::Neutron::Subnet - properties: - network_id: { get_resource: internal_net } - cidr: 10.100.0.0/24 - port: type: OS::Neutron::Port properties: - network: { get_resource: internal_net } + network: { get_param: network } fixed_ips: - - subnet: { get_resource: internal_subnet } + - subnet: { get_param: subnet } vm1: type: OS::Nova::Server @@ -49,28 +43,22 @@ resources: dhclient eth1 sed -i 's/localhost/localhost traffic_vm1/g' /etc/hosts - touch /etc/resolfconf/resolv.conf.d/tail - echo 'nameserver 8.8.8.8' > /etc/resolvconf/resolv.conf.d/tail + touch /etc/resolvconf/resolv.conf.d/tail + echo 'nameserver 10.118.32.193' > /etc/resolvconf/resolv.conf.d/tail resolvconf -u + echo 'nameserver 10.118.32.193' > /etc/resolv.conf + # Installation of stress apt-get install -y stress cd /home/clouduser - # Setup merlin - rm -rf merlin - mkdir merlin - cd merlin - wget http://10.2.1.65/~iolie/merlin/MerlinAgent-12-06-2015-TNovaVM-001.zip - apt-get install -y zip - unzip MerlinAgent-12-06-2015-TNovaVM-001.zip - ./updateConfiguration.py ./instrumentation.cfg tags source=tnova_vm - ./updateConfiguration.py ./instrumentation.cfg tags role=cpu_stress - nohup ./Agent.py ./instrumentation.cfg >log.out 2>&1 & - cd .. # workload setup - nohup stress -c #CORES --vm-bytes #MEMORY + echo 'stress -c $CORES --vm-bytes $MEMORY' > ./stress.sh + chmod +x ./stress.sh + nohup ./stress.sh & + #nohup stress -c #CORES --vm-bytes #MEMORY params: $NAME: { get_param: name } |