aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-10-23 12:30:29 -0700
committerGary Wu <gary.i.wu@huawei.com>2017-10-23 12:30:29 -0700
commita770e649c6558730679a75b365eb1f6e7b441f02 (patch)
treeccea907f8d53cb05751fac97aad2d032bb8a1bc3 /test
parent30c768a499a0d3644d74591a7cc3f773b0bd9c6d (diff)
Modify properties to match recent template changes
Change-Id: Ib692dde21a35d69b9b995a8a3de8e04f380fcf6f Issue-ID: INT-278 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'test')
-rw-r--r--test/ete/labs/windriver/onap-openstack.env (renamed from test/ete/labs/windriver/onap.env)25
-rwxr-xr-xtest/ete/scripts/deploy-onap.sh2
2 files changed, 1 insertions, 26 deletions
diff --git a/test/ete/labs/windriver/onap.env b/test/ete/labs/windriver/onap-openstack.env
index 5eb5d367f..4a86f6dba 100644
--- a/test/ete/labs/windriver/onap.env
+++ b/test/ete/labs/windriver/onap-openstack.env
@@ -12,8 +12,6 @@ parameters:
ubuntu_1604_image: ubuntu-16-04-cloud-amd64
- centos_7_image: CentOS-7
-
flavor_small: m1.small
flavor_medium: m1.medium
@@ -24,18 +22,12 @@ parameters:
flavor_xxlarge: m1.xxlarge
- security_group: default
-
vm_base_name: onap
key_name: onap_key
- dcae_key_name: dcae_key
-
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh
- dcae_pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC94pcIva90rzXumORjMCf16qjVrn5+ykfW6uMcn+DPlifU+ihtqx4Up26v1gVZyCuY8BFmbhm4YGxnRykNfi71kYbWOasUFzY86dtptCuLVMRLsMYWwOA3sHQ5IcUYNbWmChh4LyOIfhy4p2atCmB1UUkQf7Icg8LokCIcdI3IohlNko50t9KOIhBvqC7Bnegnl6zpoYdtYQppdgp5xesdhYRrdIGmT86cH2QbImpcR3tMTty7SLsw5WdTSfUFwfm76s07ivUDfCRMCJoWcxQeh6my7P7BkfDYMVIYRyfWmoIf2iv3UrqahHTcCiL79SRiD0iCt0K2SEgGsVyCX2jf
-
nexus_repo: https://nexus.onap.org/content/sites/raw
nexus_docker_repo: nexus3.onap.org:10001
@@ -81,11 +73,6 @@ parameters:
aai2_ip_addr: 10.0.1.2
appc_ip_addr: 10.0.2.1
dcae_ip_addr: 10.0.4.1
- dcae_coll_ip_addr: 10.0.4.102
- dcae_db_ip_addr: 10.0.4.101
- dcae_hdp1_ip_addr: 10.0.4.103
- dcae_hdp2_ip_addr: 10.0.4.104
- dcae_hdp3_ip_addr: 10.0.4.105
dns_ip_addr: 10.0.100.1
so_ip_addr: 10.0.5.1
mr_ip_addr: 10.0.11.1
@@ -110,20 +97,8 @@ parameters:
# #
###########################
- dcae_base_environment: 1-NIC-FLOATING-IPS
-
dcae_zone: ZONE
- dcae_state: STATE
-
- nexus_repo_root: https://nexus.onap.org
-
- nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
-
- gitlab_branch: master
-
- dcae_code_version: 1.1.0
-
################################
# #
diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh
index 3c69e15e8..353c7c78c 100755
--- a/test/ete/scripts/deploy-onap.sh
+++ b/test/ete/scripts/deploy-onap.sh
@@ -49,5 +49,5 @@ fi
STACK="ete-$(uuidgen | cut -c-8)"
echo "Stack Name: ${STACK}"
-openstack stack create -t ${ONAP_WORKDIR}/demo/heat/ONAP/onap_openstack.yaml -e ${WORKSPACE}/test/ete/labs/windriver/onap.env $STACK
+openstack stack create -t ${ONAP_WORKDIR}/demo/heat/ONAP/onap_openstack.yaml -e ${WORKSPACE}/test/ete/labs/windriver/onap-openstack.env $STACK