diff options
Diffstat (limited to 'deployment/heat/onap-oom/env/tlab')
4 files changed, 49 insertions, 200 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 daa145a86..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,34 +1,35 @@ parameters: - keystone_url: https://bdc1tlab01.research.att.com:5000 - openstack_tenant_id: 76b1938dd3b9471fa1ed413a1b212a96 - openstack_tenant_name: ETE-HEAT-Test - openstack_username: ${OS_USERNAME} - openstack_api_key: ${OS_PASSWORD} - - ubuntu_1404_image: "Ubuntu 14.04 LTS Generic" 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 - rancher_vm_flavor: m2.large - k8s_vm_flavor: m5.xxlarge + rancher_vm_flavor: m1.xlarge + 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 - dns_forwarder: 204.178.3.230 - external_dns: 8.8.8.8 - dnsaas_proxy_enable: "false" - dnsaas_proxied_keystone_url_path: "v3" - dnsaas_keystone_url: https://bdc1tlab01.research.att.com:5000 - dnsaas_region: RegionOne - dnsaas_tenant_id: 76b1938dd3b9471fa1ed413a1b212a96 - dnsaas_tenant_name: ETE-HEAT-Test - dnsaas_username: ${OS_USERNAME} - dnsaas_password: ${OS_PASSWORD} + 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 cbda112f7..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,34 +1,35 @@ parameters: - keystone_url: https://bdc1tlab01.research.att.com:5000 - openstack_tenant_id: b4062c7fbf9646b8a2bcb71c46695ff3 - openstack_tenant_name: ETE-OOM-Test - openstack_username: ${OS_USERNAME} - openstack_api_key: ${OS_PASSWORD} - - ubuntu_1404_image: "Ubuntu 14.04 LTS Generic" 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 - rancher_vm_flavor: m2.large - k8s_vm_flavor: m5.xxlarge + rancher_vm_flavor: m1.xlarge + 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 - dns_forwarder: 204.178.3.230 - external_dns: 8.8.8.8 - dnsaas_proxy_enable: "false" - dnsaas_proxied_keystone_url_path: "v3" - dnsaas_keystone_url: https://bdc1tlab01.research.att.com:5000 - dnsaas_region: RegionOne - dnsaas_tenant_id: b4062c7fbf9646b8a2bcb71c46695ff3 - dnsaas_tenant_name: ETE-OOM-Test - dnsaas_username: ${OS_USERNAME} - dnsaas_password: ${OS_PASSWORD} + 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/EXTONAP_DEV.env b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env index cb9244299..eb0afc41f 100644 --- a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env +++ b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env @@ -1,33 +1,16 @@ parameters: - keystone_url: https://bdc1tlab01.research.att.com:5000 - openstack_tenant_id: 01b47c21807242598cd5ab63d1c6ba8e - openstack_tenant_name: EXTONAP_DEV - openstack_username: ${OS_USERNAME} - openstack_api_key: ${OS_PASSWORD} - ubuntu_1404_image: "Ubuntu 14.04 LTS Generic" 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 - rancher_vm_flavor: m1.large - k8s_vm_flavor: m2.xxlarge + rancher_vm_flavor: m1.xlarge + 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 - dns_forwarder: 204.178.3.230 - external_dns: 8.8.8.8 - - dnsaas_proxy_enable: "false" - dnsaas_proxied_keystone_url_path: "v3" - dnsaas_keystone_url: https://bdc1tlab01.research.att.com:5000 - dnsaas_region: RegionOne - dnsaas_tenant_id: 01b47c21807242598cd5ab63d1c6ba8e - dnsaas_tenant_name: EXTONAP_DEV - dnsaas_username: ${OS_USERNAME} - dnsaas_password: ${OS_PASSWORD} 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 87302c96d..000000000 --- a/deployment/heat/onap-oom/env/tlab/integration-override.yaml +++ /dev/null @@ -1,136 +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 - # 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 |