Add windriver env file for OOM heat template

Change-Id: I9dfddd4ac3f119243a120db3d20e41871ac91ff5
Issue-ID: INT-381
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

3 files changed, 51 insertions, 2 deletions

diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap.env
index 1f3b9e5d7..6c03e947e 100644
--- a/deployment/heat/onap-oom/env/gwu/onap.env
+++ b/deployment/heat/onap-oom/env/gwu/onap.env
@@ -19,7 +19,15 @@ parameters:
   public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df
   public_net_name: provider
 
+  dcae_keystone_url: http://192.168.1.11:5000/v2.0
   oam_network_cidr: 172.16.0.0/16
   dcae_ip_addr: 172.16.0.4
-  dns_list: ["192.168.1.11", "192.168.1.3"]
   dns_forwarder: 192.168.1.11
+  external_dns: 192.168.1.3
+
+  dnsaas_proxy_enable: false
+  dnsaas_keystone_url: http://192.168.1.11:5000/v2.0
+  dnsaas_region: RegionOne
+  dnsaas_tenant_name: onap
+  dnsaas_username: demo
+  dnsaas_password: demo
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 00f3bd2cb..0810cb598 100644
--- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env
@@ -19,7 +19,15 @@ parameters:
   public_net_id: 3a6247f1-fac6-4167-a49f-33cc8415ccf4
   public_net_name: provider
 
+  dcae_keystone_url: http://10.145.122.117:5000/v2.0
   oam_network_cidr: 172.16.0.0/16
   dcae_ip_addr: 172.16.0.4
-  dns_list: ["10.145.122.117", "10.145.122.118"]
   dns_forwarder: 10.145.122.117
+  external_dns: 10.145.122.118
+
+  dnsaas_proxy_enable: false
+  dnsaas_keystone_url: http://10.145.122.117:5000/v2.0
+  dnsaas_region: RegionOne
+  dnsaas_tenant_name: onap-beijing-oom
+  dnsaas_username: demo
+  dnsaas_password: demo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
new file mode 100644
index 000000000..da01dce47
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
@@ -0,0 +1,33 @@
+parameters:
+
+  keystone_url: http://10.12.25.2:5000
+  openstack_tenant_id: 09d8566ea45e43aa974cf447ed591d77
+  openstack_tenant_name: Integration-Jenkins
+  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
+
+  apt_proxy: http://10.12.5.80:3142
+  docker_proxy: 10.12.5.80:5000
+
+  rancher_vm_flavor: m1.small
+  k8s_vm_flavor: m1.xxlarge
+
+  public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
+  public_net_name: external
+
+  dcae_keystone_url: "http://10.0.14.1/api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
+  oam_network_cidr: 10.0.0.0/16
+  dcae_ip_addr: 10.0.4.1
+  dns_forwarder: 10.12.25.5
+  external_dns: 8.8.8.8
+
+  dnsaas_proxy_enable: true
+  dnsaas_keystone_url: http://10.12.25.5:5000/v2.0
+  dnsaas_region: RegionOne
+  dnsaas_tenant_name: Integration-Jenkins
+  dnsaas_username: demo
+  dnsaas_password: onapdemo