From 14a6b3094ec9fc45d545e6beb6b2d4a9e7049238 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Tue, 1 May 2018 15:59:28 -0700 Subject: Run OOM with 7 Kubernetes host VMs Bump helm to 2.8.2. Bump kubectl to 1.8.10. Remove obsolete HEAT parameters. Change-Id: Ifb644cc354b8dc4dc8a8c39023b2016eaf84c7da Issue-ID: INT-381 Signed-off-by: Gary Wu --- .../onap-oom/env/windriver/Integration-SB-06.env | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'deployment/heat/onap-oom/env/windriver/Integration-SB-06.env') diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env index 184a21110..e4fd54d4c 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env @@ -1,34 +1,16 @@ parameters: - keystone_url: http://10.12.25.2:5000 - openstack_tenant_id: 7fad299815104c0a8f90a8df80343f03 - openstack_tenant_name: Integration-SB-06 - openstack_username: demo - openstack_api_key: onapdemo - ubuntu_1404_image: ubuntu-14-04-cloud-amd64 ubuntu_1604_image: ubuntu-16-04-cloud-amd64 - centos_7_image: CentOS-7 lab_name: windriver apt_proxy: 10.12.5.2:3142 docker_proxy: 10.12.5.2:5000 - rancher_vm_flavor: m1.large - k8s_vm_flavor: m2.xxlarge + rancher_vm_flavor: m1.xlarge + k8s_vm_flavor: m1.xlarge public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4 public_net_name: external oam_network_cidr: 10.0.0.0/16 - dns_forwarder: 10.12.25.5 - external_dns: 8.8.8.8 - - dnsaas_proxy_enable: "true" - dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0" - dnsaas_keystone_url: http://10.12.25.5:5000 - dnsaas_region: RegionOne - dnsaas_tenant_id: 2d7c6ec2cf9147fa974fa059b3673d7a - dnsaas_tenant_name: Integration-SB-06 - dnsaas_username: demo - dnsaas_password: onapdemo -- cgit 1.2.3-korg