From fdd18f453853d90811accde5e187db0e114e3f2a Mon Sep 17 00:00:00 2001 From: Bryan Sullivan Date: Wed, 1 Mar 2017 14:31:51 -0800 Subject: Align with vHello_Tacker update for Danube JIRA: MODELS-23 Change-Id: I9dafea969c9333f3890532644055c6ebffd11407 Signed-off-by: Bryan Sullivan --- .../tosca-vnfd-3node-tacker/blueprint.yaml | 124 ++++++++++++++++++++- 1 file changed, 121 insertions(+), 3 deletions(-) mode change 100755 => 100644 tests/blueprints/tosca-vnfd-3node-tacker/blueprint.yaml (limited to 'tests/blueprints/tosca-vnfd-3node-tacker/blueprint.yaml') diff --git a/tests/blueprints/tosca-vnfd-3node-tacker/blueprint.yaml b/tests/blueprints/tosca-vnfd-3node-tacker/blueprint.yaml old mode 100755 new mode 100644 index 2b4bd18..f6198f1 --- a/tests/blueprints/tosca-vnfd-3node-tacker/blueprint.yaml +++ b/tests/blueprints/tosca-vnfd-3node-tacker/blueprint.yaml @@ -9,6 +9,10 @@ topology_template: node_templates: VDU1: type: tosca.nodes.nfv.VDU.Tacker + artifacts: + VNFImage: + type: tosca.artifacts.Deployment.Image.VM + file: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img capabilities: nfv_compute: properties: @@ -16,9 +20,58 @@ topology_template: mem_size: 1024 MB disk_size: 4 GB properties: - image: models-xenial-server availability_zone: nova mgmt_driver: noop + config_drive: true + user_data_format: RAW + user_data: | + #!/bin/bash + set -x + mkdir /home/ubuntu + chown -R ubuntu /home/ubuntu + sudo mount /dev/sr0 /mnt/ + mkdir ~/www + mkdir ~/www/html + cat > ~/www/Dockerfile < + + + Hello World! + + + + + Welcome to OPNFV @ $host!
+ +
+

Instance ID fom config drive file /mnt/openstack/latest/meta_data.json>

+ 
+          $id
+
+

Server setup completed at $(date)

+
+ + EOM + wget https://git.opnfv.org/cgit/models/plain/tests/blueprints/tosca-vnfd-hello-ves/favicon.ico -O ~/www/html/favicon.ico + sudo apt-get install apt-transport-https ca-certificates + sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D + echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list + sudo apt-get update + sudo apt-get purge lxc-docker + sudo apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual + sudo apt-get install -y docker-engine + sudo docker pull nginx + cd ~/www + sudo docker build -t vhello . + sudo docker run --name vHello -d -p 80:80 vhello config: | param0: key1 param1: key2 @@ -46,6 +99,10 @@ topology_template: VDU2: type: tosca.nodes.nfv.VDU.Tacker + artifacts: + VNFImage: + type: tosca.artifacts.Deployment.Image.VM + file: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img capabilities: nfv_compute: properties: @@ -53,9 +110,58 @@ topology_template: mem_size: 1024 MB disk_size: 4 GB properties: - image: models-xenial-server availability_zone: nova mgmt_driver: noop + config_drive: true + user_data_format: RAW + user_data: | + #!/bin/bash + set -x + mkdir /home/ubuntu + chown -R ubuntu /home/ubuntu + sudo mount /dev/sr0 /mnt/ + mkdir ~/www + mkdir ~/www/html + cat > ~/www/Dockerfile < + + + Hello World! + + + + + Welcome to OPNFV @ $host!
+ +
+

Instance ID fom config drive file /mnt/openstack/latest/meta_data.json>

+ 
+          $id
+
+

Server setup completed at $(date)

+
+ + EOM + wget https://git.opnfv.org/cgit/models/plain/tests/blueprints/tosca-vnfd-hello-ves/favicon.ico -O ~/www/html/favicon.ico + sudo apt-get install apt-transport-https ca-certificates + sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D + echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list + sudo apt-get update + sudo apt-get purge lxc-docker + sudo apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual + sudo apt-get install -y docker-engine + sudo docker pull nginx + cd ~/www + sudo docker build -t vhello . + sudo docker run --name vHello -d -p 80:80 vhello config: | param0: key1 param1: key2 @@ -83,6 +189,10 @@ topology_template: VDU3: type: tosca.nodes.nfv.VDU.Tacker + artifacts: + VNFImage: + type: tosca.artifacts.Deployment.Image.VM + file: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img capabilities: nfv_compute: properties: @@ -90,9 +200,17 @@ topology_template: mem_size: 1024 MB disk_size: 4 GB properties: - image: models-xenial-server availability_zone: nova mgmt_driver: noop + user_data_format: RAW + user_data: | + #!/bin/bash + set -x + echo "1" | sudo tee /proc/sys/net/ipv4/ip_forward + sudo sysctl net.ipv4.ip_forward=1 + sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -m state --state NEW -m statistic --mode nth --every 2 --packet 0 -j DNAT --to-destination :80 + sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -m state --state NEW -m statistic --mode nth --every 2 --packet 0 -j DNAT --to-destination :80 + sudo iptables -t nat -A POSTROUTING -j MASQUERADE config: | param0: key1 param1: key2 -- cgit 1.2.3-korg