From: Gary Wu Date: Mon, 13 Nov 2017 22:53:03 +0000 (-0800) Subject: Update environment file to match template changes X-Git-Tag: 1.0.0-Amsterdam~36^2~3 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=00c05f6b9d09d719a172b6e943d98116b24aff15;p=integration.git Update environment file to match template changes Change-Id: I1632f6eeb718d27dab164f7a3e9fbed419478411 Issue-ID: INT-334 Signed-off-by: Gary Wu --- diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env index 72df4f654..8f47e6574 100644 --- a/test/ete/labs/windriver/onap-openstack-template.env +++ b/test/ete/labs/windriver/onap-openstack-template.env @@ -69,8 +69,8 @@ parameters: dns_list: ["10.12.25.5", "8.8.8.8"] external_dns: 8.8.8.8 - oam_network_cidr: 10.0.0.0/16 dns_forwarder: 10.12.25.5 + oam_network_cidr: 10.0.0.0/16 ### Private IP addresses ### @@ -78,11 +78,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 @@ -95,41 +90,21 @@ parameters: clamp_ip_addr: 10.0.12.1 openo_ip_addr: 10.0.14.1 -# dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE -# dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE -# dcae_hdp1_float_ip: PUT DCAE HADOOP VM1 FLOATING IP HERE -# dcae_hdp2_float_ip: PUT DCAE HADOOP VM2 FLOATING IP HERE -# dcae_hdp3_float_ip: PUT DCAE HADOOP VM3 FLOATING IP HERE - ########################### # # # Parameters used by DCAE # # # ########################### -# 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 - dnsaas_config_enabled: true dnsaas_region: RegionOne dnsaas_keystone_url: http://10.12.25.5:5000/v3 dnsaas_tenant_name: ${OS_PROJECT_NAME} dnsaas_username: ${OS_USERNAME} dnsaas_password: ${OS_PASSWORD} - dcae_domain: dcaeg2.onap.org 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_domain: dcaeg2.onap.org dcae_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh dcae_private_key: '-----BEGIN RSA PRIVATE KEY-----\n MIIEpQIBAAKCAQEAylw4KKN/ljqnFBvP+blG5PNfsnM4MAuGPMsE5rkKmzcZWNaE\n @@ -169,36 +144,50 @@ y7RoiFqJtkdFQykzJemA+xOXvHLgKi/MXFsU90PCD0VJKLj8vwpX78Y=\n appc_branch: master so_branch: master mr_branch: master - dcae_branch: master policy_branch: master portal_branch: release-1.3.0 robot_branch: master - sdc_branch: master - sdnc_branch: master + sdc_branch: release-1.1.0 + sdnc_branch: release-1.1.0 vid_branch: master clamp_branch: master vnfsdk_branch: master - aai_docker: 1.1-STAGING-latest + aai_docker: v1.1.0 + aai_sparky_docker: v1.0.0 appc_docker: 1.1-STAGING-latest - so_docker: 1.1-STAGING-latest - mr_docker: 1.1-STAGING-latest + so_docker: v1.1.0 dcae_docker: 1.1-latest - policy_docker: 1.1-STAGING-latest - portal_docker: 1.3-STAGING-latest + policy_docker: v1.1.0 + portal_docker: v1.3.0 robot_docker: 1.1-STAGING-latest - sdc_docker: 1.1-STAGING-latest + sdc_docker: v1.0.0 sdnc_docker: 1.2-STAGING-latest - vid_docker: 1.1-STAGING-latest - clamp_docker: 1.1-STAGING-latest - msb_docker: latest + vid_docker: v1.1.0 + clamp_docker: v1.1.0 + msb_docker: v1.0.0 mvim_docker: latest - vfc_docker: latest uui_docker: latest - esr_docker: latest + esr_docker: v1.0.0 dgbuilder_docker: 0.1-STAGING-latest cli_docker: v1.1.0 + vfc_nokia_docker: v1.0.0 + vfc_ztevmanagerdriver_docker: v1.0.1 + vfc_ztesdncdriver_docker: v1.0.1 + vfc_vnfres_docker: v1.0.1 + vfc_vnfmgr_docker: v1.0.1 + vfc_vnflcm_docker: v1.0.1 + vfc_resmanagement_docker: v1.0.0 + vfc_nslcm_docker: v1.0.1 + vfc_huawei_docker: v1.0.0 + vfc_jujudriver_docker: v1.0.0 + vfc_gvnfmdriver_docker: v1.0.1 + vfc_emsdriver_docker: v1.0.1 + vfc_catalog_docker: v1.0.1 + vfc_wfengine_mgrservice_docker: v1.0.0 + vfc_wfengine_activiti_docker: v1.0.0 + ##################### # # # ONAP repositories # @@ -206,7 +195,6 @@ y7RoiFqJtkdFQykzJemA+xOXvHLgKi/MXFsU90PCD0VJKLj8vwpX78Y=\n ##################### aai_repo: http://gerrit.onap.org/r/aai/test-config appc_repo: http://gerrit.onap.org/r/appc/deployment.git - dcae_repo: http://gerrit.onap.org/r/dcae/demo/startup/controller.git mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git so_repo: http://gerrit.onap.org/r/so/docker-config.git policy_repo: http://gerrit.onap.org/r/policy/docker.git