aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/heat/onap-oom/env/windriver
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2018-04-17 19:50:54 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-17 19:50:54 +0000
commitb957878dd1a9e4a3ba88cd607de423df54782404 (patch)
treea0f392a453bf48693cdb021d85e5710390e842ae /deployment/heat/onap-oom/env/windriver
parenta42f86e38b9c8b3496a74fc23ae5d3fda3ce0e2c (diff)
parent19c81b4d853c6517ae6ee367195a75271a8bcf35 (diff)
Merge "Use integration-override.yaml in OOM deploy script"
Diffstat (limited to 'deployment/heat/onap-oom/env/windriver')
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env1
l---------deployment/heat/onap-oom/env/windriver/Integration-SB-00-DNS-openrc1
l---------deployment/heat/onap-oom/env/windriver/Integration-SB-00-openrc1
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-00.env34
l---------deployment/heat/onap-oom/env/windriver/Integration-SB-01-DNS-openrc1
l---------deployment/heat/onap-oom/env/windriver/Integration-SB-01-openrc1
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-01.env34
l---------deployment/heat/onap-oom/env/windriver/Integration-SB-02-DNS-openrc1
l---------deployment/heat/onap-oom/env/windriver/Integration-SB-02-openrc1
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-02.env34
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-03.env1
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-04.env1
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-05.env1
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-06.env1
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-SB-07.env1
-rw-r--r--deployment/heat/onap-oom/env/windriver/integration-override.yaml7
16 files changed, 120 insertions, 1 deletions
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
index 22a5bdeb2..d80b8a54b 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
@@ -10,6 +10,7 @@ parameters:
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
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-00-DNS-openrc
new file mode 120000
index 000000000..f5d04b1f2
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00-DNS-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-SB-00-DNS-openrc \ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-00-openrc
new file mode 120000
index 000000000..29084fbfc
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-SB-00-openrc \ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
new file mode 100644
index 000000000..16965979f
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
@@ -0,0 +1,34 @@
+parameters:
+
+ keystone_url: http://10.12.25.2:5000
+ openstack_tenant_id: 41d6d38489bd40b09ea8a6b6b852dcbd
+ openstack_tenant_name: Integration-SB-00
+ 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: m1.xxlarge
+
+ 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: a813ac529c6d4b44a3308ed38bcd7480
+ dnsaas_tenant_name: Integration-SB-00
+ dnsaas_username: demo
+ dnsaas_password: onapdemo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-01-DNS-openrc
new file mode 120000
index 000000000..208d760eb
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01-DNS-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-SB-01-DNS-openrc \ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-01-openrc
new file mode 120000
index 000000000..c33055e6a
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-SB-01-openrc \ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
new file mode 100644
index 000000000..8e851913c
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
@@ -0,0 +1,34 @@
+parameters:
+
+ keystone_url: http://10.12.25.2:5000
+ openstack_tenant_id: 087050388b204c73a3e418dd2c1fe30b
+ openstack_tenant_name: Integration-SB-01
+ 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: m1.xxlarge
+
+ 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: 4318a6c5788449cc97c88fd745b554b9
+ dnsaas_tenant_name: Integration-SB-01
+ dnsaas_username: demo
+ dnsaas_password: onapdemo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-02-DNS-openrc
new file mode 120000
index 000000000..814962e0d
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02-DNS-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-SB-02-DNS-openrc \ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-02-openrc
new file mode 120000
index 000000000..0180cd580
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-SB-02-openrc \ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
new file mode 100644
index 000000000..99d267bc6
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
@@ -0,0 +1,34 @@
+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: m1.xxlarge
+
+ 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
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
index 350bd475a..89fc801ba 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
@@ -10,6 +10,7 @@ parameters:
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
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
index 4e6e1cdfd..ec4227e7d 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
@@ -10,6 +10,7 @@ parameters:
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
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
index 47147ed3a..af6c5fe23 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
@@ -10,6 +10,7 @@ parameters:
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
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 6cf405386..72ddd4172 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
@@ -10,6 +10,7 @@ parameters:
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
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
index 10b691e89..6c5f23aa5 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
@@ -10,6 +10,7 @@ parameters:
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
diff --git a/deployment/heat/onap-oom/env/windriver/integration-override.yaml b/deployment/heat/onap-oom/env/windriver/integration-override.yaml
index edc19f5fc..31c28fe41 100644
--- a/deployment/heat/onap-oom/env/windriver/integration-override.yaml
+++ b/deployment/heat/onap-oom/env/windriver/integration-override.yaml
@@ -32,8 +32,12 @@ global:
# with other instances running within the same k8s cluster
nodePortPrefix: 302
+ # windriver local nexus proxy - nexus3 default
+ repository: 10.12.5.2:5000
# image pull policy
- pullPolicy: Always
+ #pullPolicy: Always
+ pullPolicy: IfNotPresent
+
# default mount path root directory referenced
# by persistent volumes and log files
@@ -99,6 +103,7 @@ portal:
enabled: true
robot:
enabled: true
+ #pullPolicy: Always
# config:
# openstack configuration
# openStackUserName: "demo"