summaryrefslogtreecommitdiffstats
path: root/tests/blueprints
diff options
context:
space:
mode:
authorbryan <bryan.sullivan@att.com>2017-03-07 08:16:46 -0800
committerbryan <bryan.sullivan@att.com>2017-03-07 08:16:46 -0800
commit93bf70421d2a8abbfbc3889e3e65b0ca4447673f (patch)
tree2e4b082b7396d0891ea6930a789d6c82d5cdac83 /tests/blueprints
parentaaaa9301f4ddb0d48926cccf7cd89be196b383cb (diff)
Setup monitor before agents (otherwise they exit)
JIRA: VES-1 Setup config drive for LB agent access to UUID. Change-Id: Ieb877d48007bf02c01a6b763143347ab69207924 Signed-off-by: bryan <bryan.sullivan@att.com>
Diffstat (limited to 'tests/blueprints')
-rwxr-xr-xtests/blueprints/tosca-vnfd-hello-ves/blueprint.yaml2
-rwxr-xr-xtests/blueprints/tosca-vnfd-hello-ves/start.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/blueprints/tosca-vnfd-hello-ves/blueprint.yaml b/tests/blueprints/tosca-vnfd-hello-ves/blueprint.yaml
index c652423..a998dad 100755
--- a/tests/blueprints/tosca-vnfd-hello-ves/blueprint.yaml
+++ b/tests/blueprints/tosca-vnfd-hello-ves/blueprint.yaml
@@ -203,6 +203,7 @@ topology_template:
image: models-xenial-server
availability_zone: nova
mgmt_driver: noop
+ config_drive: true
user_data_format: RAW
user_data: |
#!/bin/bash
@@ -213,6 +214,7 @@ topology_template:
cat << EOM >/home/ubuntu/.ssh/authorized_keys
<pubkey>
EOM
+ sudo mount /dev/sr0 /mnt/
cat << EOF >/tmp/setup.sh
echo "1" | sudo tee /proc/sys/net/ipv4/ip_forward
sudo sysctl net.ipv4.ip_forward=1
diff --git a/tests/blueprints/tosca-vnfd-hello-ves/start.sh b/tests/blueprints/tosca-vnfd-hello-ves/start.sh
index 76de81d..da44fc7 100755
--- a/tests/blueprints/tosca-vnfd-hello-ves/start.sh
+++ b/tests/blueprints/tosca-vnfd-hello-ves/start.sh
@@ -202,7 +202,7 @@ setup_monitor () {
sed -i -- "/vel_topic_name = /a vdu1_id = $vdu1_id" evel-test-collector/config/collector.conf
cp monitor.py evel-test-collector/code/collector/monitor.py
-# python evel-test-collector/code/collector/monitor.py --config evel-test-collector/config/collector.conf --section default
+ nohup python evel-test-collector/code/collector/monitor.py --config evel-test-collector/config/collector.conf --section default > /dev/null 2>&1 &
}
type=$1