Use integration-override.yaml in OOM deploy script
Change-Id: I2c8417b9339715b733f585ae52fd35251d9ca509
Issue-ID: INT-381
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
diff --git a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
index 4050083..843e006 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
@@ -10,6 +10,7 @@
ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
centos_7_image: "centos7"
+ lab_name: tlab
apt_proxy: 192.168.31.204:3142
docker_proxy: 192.168.31.204:5000
diff --git a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
index 63d2f67..2b54be7 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
@@ -10,6 +10,7 @@
ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
centos_7_image: "centos7"
+ lab_name: tlab
apt_proxy: 192.168.31.204:3142
docker_proxy: 192.168.31.204:5000
diff --git a/deployment/heat/onap-oom/env/tlab/integration-override.yaml b/deployment/heat/onap-oom/env/tlab/integration-override.yaml
new file mode 100644
index 0000000..87302c9
--- /dev/null
+++ b/deployment/heat/onap-oom/env/tlab/integration-override.yaml
@@ -0,0 +1,136 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This override file is useful to test one or more subcharts.
+# It overrides the default ONAP parent chart behaviour to deploy
+# all of ONAP.
+#
+# Example use to enable a single subchart (from this directory):
+#
+# helm install local/onap -n onap --namespace onap -f disable-allcharts.yaml --set so.enabled=true
+
+
+#################################################################
+# Global configuration overrides.
+#
+# These overrides will affect all helm charts (ie. applications)
+# that are listed below and are 'enabled'.
+#################################################################
+global:
+ # Change to an unused port prefix range to prevent port conflicts
+ # with other instances running within the same k8s cluster
+ nodePortPrefix: 302
+
+ # lab local nexus proxy - nexus3 default
+ repository: 192.168.31.204:5000
+ # image pull policy
+ #pullPolicy: Always
+ pullPolicy: IfNotPresent
+
+
+ # default mount path root directory referenced
+ # by persistent volumes and log files
+# persistence:
+# mountPath: /onapdata
+
+#################################################################
+# Enable/disable and configure helm charts (ie. applications)
+# to customize the ONAP deployment.
+#################################################################
+aaf:
+ enabled: true
+aai:
+ enabled: true
+ # aai subchart image overrides
+ aai-champ:
+ image: onap/champ:1.2-STAGING-latest
+ aai-data-router:
+ image: onap/data-router:1.2-STAGING-latest
+ aai-modelloader:
+ image: onap/model-loader:1.2-STAGING-latest
+ aai-resources:
+ image: onap/aai-resources:1.2-STAGING-latest
+ aai-search-data:
+ image: onap/search-data-service:1.2-STAGING-latest
+ aai-sparky-be:
+ image: onap/sparky-be:1.2-STAGING-latest
+ aai-traveral:
+ image: onap/aai-traversal:1.2-STAGING-latest
+appc:
+ enabled: false
+clamp:
+ enabled: true
+cli:
+ enabled: true
+consul:
+ enabled: true
+dcaegen2:
+ enabled: false
+esr:
+ enabled: true
+ # esr parent chart (server) image override
+ image: onap/aai/esr-server:1.1.0-SNAPSHOT
+ # esr subchart omage override
+ esr-gui:
+ image: onap/aai/esr-gui:1.1.0-SNAPSHOT
+log:
+ enabled: true
+message-router:
+ enabled: true
+# kafka:
+# repositoryOverride: docker.io
+# image: wurstmeister/kafka:latest
+mock:
+ enabled: true
+msb:
+ enabled: true
+multicloud:
+ enabled: true
+policy:
+ enabled: true
+portal:
+ enabled: true
+robot:
+ enabled: true
+ #pullPolicy: Always
+# config:
+ # openstack configuration
+# openStackUserName: "demo"
+# openStackRegion: "RegionOne"
+# openStackKeyStoneUrl: "http://10.12.25.2:5000"
+# openStackServiceTenantName: "service"
+# openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
+sdc:
+ enabled: true
+sdnc:
+ enabled: true
+so:
+ enabled: true
+ # so server configuration
+ config:
+ # openstack configuration
+ openStackUserName: "demo"
+ openStackRegion: "RegionOne"
+ openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+ openStackServiceTenantName: "service"
+ openStackEncryptedPasswordHere: "bbaef6cd76625ab9eb60deedeae7dbb9"
+
+uui:
+ enabled: true
+vfc:
+ enabled: true
+vid:
+ enabled: true
+vnfsdk:
+ enabled: true
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
index 22a5bde..d80b8a5 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 @@
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 0000000..f5d04b1
--- /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 0000000..29084fb
--- /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 0000000..1696597
--- /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 0000000..208d760
--- /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 0000000..c33055e
--- /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 0000000..8e85191
--- /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 0000000..814962e
--- /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 0000000..0180cd5
--- /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 0000000..99d267b
--- /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 350bd47..89fc801 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 @@
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 4e6e1cd..ec4227e 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 @@
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 47147ed..af6c5fe 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 @@
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 6cf4053..72ddd41 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 @@
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 10b691e..6c5f23a 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 @@
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 edc19f5..31c28fe 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 @@
# 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 @@
enabled: true
robot:
enabled: true
+ #pullPolicy: Always
# config:
# openstack configuration
# openStackUserName: "demo"
diff --git a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
index d483e73..f4c6eb6 100644
--- a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
@@ -125,6 +125,7 @@
# Clone OOM:
cd ~
git clone -b master http://gerrit.onap.org/r/oom
+cd oom
git log -1
# Update values.yaml to point to docker-proxy instead of nexus3:
@@ -136,6 +137,16 @@
git diff
+# Clone integration:
+cd ~
+git clone -b master http://gerrit.onap.org/r/integration
+cd integration
+git log -1
+
+cd ~
+ln -s ~/integration/deployment/heat/onap-oom/env/__lab_name__/integration-override.yaml
+
+
# version control the persistence volume to see what's happening
mkdir -p /dockerdata-nfs/
cd /dockerdata-nfs/
@@ -157,7 +168,7 @@
helm repo list
make all
helm search -l | grep local
-helm install local/onap -n dev --namespace onap
+helm install local/onap -n dev --namespace onap -f ~/integration/deployment/heat/onap-oom/env/__lab_name__/integration-override.yaml
# Check ONAP status:
sleep 3
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index 0a40ee2..a6a5cf0 100644
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -2,6 +2,9 @@
description: ONAP on Kubernetes using OOM
parameters:
+ lab_name:
+ type: string
+
docker_proxy:
type: string
@@ -227,6 +230,7 @@
user_data:
str_replace:
params:
+ __lab_name__: { get_param: lab_name }
__docker_proxy__: { get_param: docker_proxy }
__apt_proxy__: { get_param: apt_proxy }
__rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }