diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-05-17 17:41:02 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-05-17 19:55:16 -0700 |
| commit | c257cc411773f2b91fcdcebd35c8c30f4f356156 (patch) | |
| tree | a27f52336550a897990f631ebe7432499f4b3106 | |
| parent | 6f6c15df3da4360c57c616355447052ae1802f85 (diff) | |
Add option to use OAM network for Robot public net
Change-Id: I7d2692e64d0e09afed0b09dc9349c03e09b1869e
Issue-ID: INT-414
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index bdbc0ee2..11ce2a06 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -170,6 +170,11 @@ parameters: type: string description: CIDR of the OAM ONAP network + use_oam_net_for_robot: + type: boolean + description: Whether to use oam_network for Robot VNFs or not. The default is false, which uses public_net_id. Set to true if the Robot VNFs are unable to bind to the public network (needed by TLAB). + default: false + ### Private IP addresses ### aai1_ip_addr: type: string @@ -1057,10 +1062,12 @@ resources: __vm_image_name__: { get_param: ubuntu_1404_image } __vm_flavor__: { get_param: flavor_medium } __public_net_id__: { get_param: public_net_id } + __oam_network_id__: { get_resource: oam_onap } __script_version__: { get_param: artifacts_version } __robot_repo__: { get_param: robot_repo } __docker_version__: { get_param: robot_docker } __vnf_pub_key__: { get_param: pub_key } + __use_oam_net_for_robot__: { get_param: use_oam_net_for_robot } template: | #!/bin/bash @@ -1110,7 +1117,13 @@ resources: echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt echo "__vm_image_name__" > /opt/config/vm_image_name.txt echo "__script_version__" > /opt/config/script_version.txt - echo "__public_net_id__" > /opt/config/public_net_id.txt + if [ "__use_oam_net_for_robot__" != "False" ] && [ "__use_oam_net_for_robot__" != "false" ]; then + echo "__oam_network_id__" > /opt/config/public_net_id.txt + else + echo "__public_net_id__" > /opt/config/public_net_id.txt + fi + echo "__oam_network_id__" > /opt/config/oam_network_id.txt + echo "__use_oam_net_for_robot__" > /opt/config/use_oam_net_for_robot.txt echo "__vnf_pub_key__" > /opt/config/vnf_pub_key.txt echo "__robot_repo__" > /opt/config/remote_repo.txt echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot |