summaryrefslogtreecommitdiffstats
path: root/deployment/heat/onap-oom/env/tlab
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-05-02 16:19:04 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-05-02 22:16:46 -0700
commit11c9874f6aa84e8f3ab03f9bec84c8b0c5033003 (patch)
treeeb84e76c21f0a51fad2c8534d5714de88599988b /deployment/heat/onap-oom/env/tlab
parent14a6b3094ec9fc45d545e6beb6b2d4a9e7049238 (diff)
Pass integration-override directly in env file
Change-Id: I5fddab2211fcaa1edbc91662222801499c610cfb Issue-ID: INT-381 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat/onap-oom/env/tlab')
-rw-r--r--deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env25
-rw-r--r--deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env25
-rw-r--r--deployment/heat/onap-oom/env/tlab/integration-override.yaml121
3 files changed, 44 insertions, 127 deletions
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 eb0afc41f..59e0598cc 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: "Ubuntu 14.04 LTS Generic"
ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
- lab_name: tlab
apt_proxy: 192.168.31.204:3142
docker_proxy: 192.168.31.204:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
- public_net_name: admin-vpn-floating
oam_network_cidr: 10.0.0.0/16
+
+ integration_override_yaml: >
+ global:
+ repository: 192.168.31.204:5000
+ pullPolicy: IfNotPresent
+ robot:
+ openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+ openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
+ openStackPassword: "${OS_PASSWORD}"
+ openStackTenantId: "${OS_PROJECT_ID}"
+ openStackUserName: "${OS_USERNAME}"
+ ubuntu14Image: "Ubuntu 14.04 LTS Generic"
+ ubuntu16Image: "Ubuntu 16.04 LTS Generic"
+ openStackPrivateNetId: "__oam_network_id__"
+ openStackPrivateSubnetId: "__oam_subnet_id__"
+ openStackPrivateNetCidr: "10.0.0.0/16"
+ openStackOamNetworkCidrPrefix: "10.0"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
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 eb0afc41f..59e0598cc 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
@@ -1,9 +1,7 @@
parameters:
- ubuntu_1404_image: "Ubuntu 14.04 LTS Generic"
ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
- lab_name: tlab
apt_proxy: 192.168.31.204:3142
docker_proxy: 192.168.31.204:5000
@@ -11,6 +9,27 @@ parameters:
k8s_vm_flavor: m1.xlarge
public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
- public_net_name: admin-vpn-floating
oam_network_cidr: 10.0.0.0/16
+
+ integration_override_yaml: >
+ global:
+ repository: 192.168.31.204:5000
+ pullPolicy: IfNotPresent
+ robot:
+ openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+ openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
+ openStackPassword: "${OS_PASSWORD}"
+ openStackTenantId: "${OS_PROJECT_ID}"
+ openStackUserName: "${OS_USERNAME}"
+ ubuntu14Image: "Ubuntu 14.04 LTS Generic"
+ ubuntu16Image: "Ubuntu 16.04 LTS Generic"
+ openStackPrivateNetId: "__oam_network_id__"
+ openStackPrivateSubnetId: "__oam_subnet_id__"
+ openStackPrivateNetCidr: "10.0.0.0/16"
+ openStackOamNetworkCidrPrefix: "10.0"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/tlab/integration-override.yaml b/deployment/heat/onap-oom/env/tlab/integration-override.yaml
deleted file mode 100644
index c56d139e9..000000000
--- a/deployment/heat/onap-oom/env/tlab/integration-override.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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
-appc:
- enabled: true
-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: "gw3113"
- openStackRegion: "RegionOne"
- openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
- openStackServiceTenantName: "service"
- openStackEncryptedPasswordHere: "05daa77613ae3690172d9f822883dda9"
-sdc:
- enabled: true
-sdnc:
- enabled: true
-so:
- enabled: true
- # so server configuration
- config:
- # openstack configuration
- openStackUserName: "gw3113"
- openStackRegion: "RegionOne"
- openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
- openStackServiceTenantName: "service"
- openStackEncryptedPasswordHere: "05daa77613ae3690172d9f822883dda9"
-
-uui:
- enabled: true
-vfc:
- enabled: true
-vid:
- enabled: true
-vnfsdk:
- enabled: true