summaryrefslogtreecommitdiffstats
path: root/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-05-01 15:59:28 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-05-02 13:40:29 -0700
commit14a6b3094ec9fc45d545e6beb6b2d4a9e7049238 (patch)
tree14a1d5c4c40dc8d863bdcbc2d0c39a19cd82e563 /deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
parentb1979e4131a07225147c371abac2ab0cc2c3b05d (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/huawei/onap-beijing-oom.env')
-rw-r--r--deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env23
1 files changed, 3 insertions, 20 deletions
diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
index 88d6b7492..98e909f70 100644
--- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
@@ -1,33 +1,16 @@
parameters:
- keystone_url: http://10.145.122.117:5000
- openstack_tenant_id: 3d228d2fcbb7447bbba3cde703431bc1
- openstack_tenant_name: onap-beijing-oom
- openstack_username: demo
- openstack_api_key: demo
-
ubuntu_1404_image: trusty
ubuntu_1604_image: xenial
- centos_7_image: centos7
+ lab_name: huawei
apt_proxy: 10.145.122.118:3142
docker_proxy: 10.145.122.118:5000
- rancher_vm_flavor: m1.large
- k8s_vm_flavor: m2.xxlarge
+ rancher_vm_flavor: m1.xlarge
+ k8s_vm_flavor: m1.xlarge
public_net_id: 3a6247f1-fac6-4167-a49f-33cc8415ccf4
public_net_name: provider
oam_network_cidr: 172.16.0.0/16
- dns_forwarder: 10.145.122.117
- external_dns: 10.145.122.118
-
- dnsaas_proxy_enable: "false"
- dnsaas_proxied_keystone_url_path: "v2.0"
- dnsaas_keystone_url: http://10.145.122.117:5000
- dnsaas_region: RegionOne
- dnsaas_tenant_id: 3d228d2fcbb7447bbba3cde703431bc1
- dnsaas_tenant_name: onap-beijing-oom
- dnsaas_username: demo
- dnsaas_password: demo