diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-03-28 16:10:33 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-03-28 16:12:42 -0700 |
| commit | b2df4c4d1ffc32f7d2f90563c7ace6be332a8481 (patch) | |
| tree | d7cdeb1607a40d51240d55002dc9f3fe0be9310e | |
| parent | a1c6226a72665bf66476c38c3c259ae623b0b749 (diff) | |
Send both ubuntu versions to Robot VMamsterdam
The closed loop Robot test suites need Ubuntu 14.04
for vFW, but 16.04 for vDNS. This change sends both
versions to the Robot VM.
Change-Id: Id837d55d1cceecfa0e0710067b23e0460d707cbc
Issue-ID: INT-407
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
| -rw-r--r-- | .gitreview | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 6 |
2 files changed, 5 insertions, 2 deletions
@@ -2,3 +2,4 @@ host=gerrit.onap.org port=29418 project=demo.git +defaultbranch=amsterdam diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index a0a19bab..2db9f8ba 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -907,7 +907,8 @@ resources: __clamp_ip_addr__: { get_param: clamp_ip_addr } __openo_ip_addr__: { get_param: openo_ip_addr } __external_dns__: { get_param: external_dns } - __vm_image_name__: { get_param: ubuntu_1404_image } + __ubuntu_1404_image__: { get_param: ubuntu_1404_image } + __ubuntu_1604_image__: { get_param: ubuntu_1604_image } __vm_flavor__: { get_param: flavor_medium } __public_net_id__: { get_param: public_net_id } __script_version__: { get_param: artifacts_version } @@ -947,7 +948,8 @@ resources: echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt - echo "__vm_image_name__" > /opt/config/vm_image_name.txt + echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt + echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt echo "__vm_flavor__" > /opt/config/vm_flavor.txt echo "__script_version__" > /opt/config/script_version.txt echo "__public_net_id__" > /opt/config/public_net_id.txt |