summaryrefslogtreecommitdiffstats
path: root/test/ete
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-10-30 18:18:17 -0700
committerGary Wu <gary.i.wu@huawei.com>2017-10-30 18:18:17 -0700
commitbf2de39935b11a9cdd07be7052fb3be5d4663db8 (patch)
tree383cda00db1ba2e1de0e03ec046cf627fa3f2ff0 /test/ete
parent35ed5406fd12a20dc48a1ec010f22c96f05cbf24 (diff)
Update heat template for DCAE changes
Change-Id: I58482e8bf091ec747b912a71b8017833c61be302 Issue-ID: INT-278 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'test/ete')
-rw-r--r--test/ete/labs/windriver/onap-openstack-template.env23
1 files changed, 11 insertions, 12 deletions
diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env
index e5dcde17d..8619cad08 100644
--- a/test/ete/labs/windriver/onap-openstack-template.env
+++ b/test/ete/labs/windriver/onap-openstack-template.env
@@ -63,7 +63,7 @@ parameters:
# #
######################
- dns_list: 8.8.8.8
+ dns_list: ["10.12.25.5", "8.8.8.8"]
external_dns: 8.8.8.8
oam_network_cidr: 10.0.0.0/16
@@ -116,19 +116,18 @@ parameters:
# dcae_code_version: 1.1.0
- dnsaas_config_enabled: false
+ dnsaas_config_enabled: true
dnsaas_region: RegionOne
- dnsaas_tenant_id: ${OS_PROJECT_ID}
- dnsaas_keystone_url: http://10.12.25.2:5000/v2.0
- dnsaas_username: ${OS_USERNAME}
- dnsaas_password: ${OS_PASSWORD}
- dcae_keystone_url: http://10.12.25.2:5000/v2.0
- dcae_centos_7_image: 3a1f7b58-e1ee-4693-a310-d6c40a405545
- dcae_security_group: 9efe6dba-0d32-467d-816d-70557fce6a8b
- dcae_key_name: dcae-key
+ dnsaas_tenant_id: DCAE
+ dnsaas_keystone_url: http://10.12.25.5:5000/v3
+ dnsaas_username: demo
+ dnsaas_password: onapdemo
+ dcae_keystone_url: "http://10.0.14.1/api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
+ dcae_centos_7_image: CentOS-7
+ dcae_security_group: open
+ dcae_key_name: 'id_lji_onap'
dcae_public_key: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDloKgBHx/yKRV77lr828rqa+zK+iTZpqmH3WSUU3vdNhSbEMNKkGVXR4+Gq1hNd8UNF+jMg87kOFSlQbE5jvsQMWuu1unxLKbH3AeXJd21gR1Gx4KXjkWsfl4URWMZ9WNvH0hMvqEV5SdFIDQmx07C/NOfy3R5N1pCgNsh9RT+EpDFh7jmimxrAqdxP0HnGFC2oM3rYMnzfh2/+Obkag6O3RZOkYx/WLQKbOKTi8K1C4UM5pwFzLT/vC+d9DF8pE7P9dlrbHTF9c3IGsP5oCa8CQ/WE4lVj/L9/iFNs0WsxdYaOnf11GJmPs663hltvWbQiqsFpdjX6tk/zMb3Xipz ubuntu@lusheng-sm-b781d54e-48ac-42fa-a780-3289b56e6598'
- dcae_private_key: '
------BEGIN RSA PRIVATE KEY-----\n
+ dcae_private_key: '-----BEGIN RSA PRIVATE KEY-----\n
MIIEowIBAAKCAQEA5aCoAR8f8ikVe+5a/NvK6mvsyvok2aaph91klFN73TYUmxDD\n
SpBlV0ePhqtYTXfFDRfozIPO5DhUpUGxOY77EDFrrtbp8Symx9wHlyXdtYEdRseC\n
l45FrH5eFEVjGfVjbx9ITL6hFeUnRSA0JsdOwvzTn8t0eTdaQoDbIfUU/hKQxYe4\n