diff options
author | Gary Wu <gary.i.wu@huawei.com> | 2018-05-01 15:59:28 -0700 |
---|---|---|
committer | Gary Wu <gary.i.wu@huawei.com> | 2018-05-02 13:40:29 -0700 |
commit | 14a6b3094ec9fc45d545e6beb6b2d4a9e7049238 (patch) | |
tree | 14a1d5c4c40dc8d863bdcbc2d0c39a19cd82e563 /deployment/heat/onap-oom/env/windriver/Integration-SB-02.env | |
parent | b1979e4131a07225147c371abac2ab0cc2c3b05d (diff) |
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 <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat/onap-oom/env/windriver/Integration-SB-02.env')
-rw-r--r-- | deployment/heat/onap-oom/env/windriver/Integration-SB-02.env | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env index bc113a89d..53e26f017 100644 --- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env @@ -1,34 +1,16 @@ parameters: - keystone_url: http://10.12.25.2:5000 - openstack_tenant_id: ebb0ea7144004bacac1e39ff23105fa7 - openstack_tenant_name: Integration-SB-02 - 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: 89fee629f5f044739fb64380be63b6da - dnsaas_tenant_name: Integration-SB-02 - dnsaas_username: demo - dnsaas_password: onapdemo + oam_network_cidr: 172.16.0.0/16 |