diff options
author | Mike Elliott <mike.elliott@amdocs.com> | 2019-05-08 19:42:53 -0400 |
---|---|---|
committer | Mike Elliott <mike.elliott@amdocs.com> | 2019-05-08 19:43:44 -0400 |
commit | 980eaa938bdf125e20797601f4eae125a37dfd0b (patch) | |
tree | b7c360a97ff5de7c86e67d108fd10ef7993e3a3f /kubernetes/onap | |
parent | defe9ad0c9e20bd49fb99f31931d867c33a7827b (diff) |
Update overrides to support docs
Change-Id: I2a0428bfec238231b299c9f35364979b116a5d67
Issue-ID: OOM-1598
Signed-off-by: Mike Elliott <mike.elliott@amdocs.com>
Diffstat (limited to 'kubernetes/onap')
-rw-r--r-- | kubernetes/onap/resources/overrides/onap-all.yaml | 7 | ||||
-rw-r--r-- | kubernetes/onap/resources/overrides/onap-vfw.yaml | 55 | ||||
-rw-r--r-- | kubernetes/onap/resources/overrides/openstack.yaml | 66 | ||||
-rw-r--r-- | kubernetes/onap/values.yaml | 2 |
4 files changed, 127 insertions, 3 deletions
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml index 9f9f166e91..1716415b3e 100644 --- a/kubernetes/onap/resources/overrides/onap-all.yaml +++ b/kubernetes/onap/resources/overrides/onap-all.yaml @@ -15,14 +15,17 @@ ################################################################### # This override file enables helm charts for all ONAP applications. ################################################################### +cassandra: + enabled: true +mariadb-galera: + enabled: true + aaf: enabled: true aai: enabled: true appc: enabled: true -cassandra: - enabled: true clamp: enabled: true cli: diff --git a/kubernetes/onap/resources/overrides/onap-vfw.yaml b/kubernetes/onap/resources/overrides/onap-vfw.yaml new file mode 100644 index 0000000000..323961fba3 --- /dev/null +++ b/kubernetes/onap/resources/overrides/onap-vfw.yaml @@ -0,0 +1,55 @@ +# Copyright © 2019 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 enables ONAP Application helm charts for the +# vFW use case. +################################################################### +cassandra: + enabled: true +mariadb-galera: + enabled: true + +aaf: + enabled: true +aai: + enabled: true +appc: + enabled: true +clamp: + enabled: true +consul: + enabled: true +dcaegen2: + enabled: true +dmaap: + enabled: true +log: + enabled: true +oof: + enabled: true +msb: + enabled: true +policy: + enabled: true +portal: + enabled: true +robot: + enabled: true +sdc: + enabled: true +sdnc: + enabled: true +so: + enabled: true
\ No newline at end of file diff --git a/kubernetes/onap/resources/overrides/openstack.yaml b/kubernetes/onap/resources/overrides/openstack.yaml new file mode 100644 index 0000000000..a3c5867e15 --- /dev/null +++ b/kubernetes/onap/resources/overrides/openstack.yaml @@ -0,0 +1,66 @@ +# Copyright © 2019 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 configures openstack parameters for ONAP +################################################################# +appc: + config: + enableClustering: false + openStackType: "OpenStackProvider" + openStackName: "OpenStack" + openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0" + openStackServiceTenantName: "Integration-OOM-Staging-Daily" + openStackDomain: "Default" + openStackUserName: "demo" + openStackEncryptedPassword: "onapdemo" +robot: + appcUsername: "appc@appc.onap.org" + appcPassword: "demo123456!" + openStackKeyStoneUrl: "http://10.12.25.2:5000" + openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4" + openStackTenantId: "09d8566ea45e43aa974cf447ed591d77" + openStackUserName: "demo" + ubuntu14Image: "ubuntu-14-04-cloud-amd64" + ubuntu16Image: "ubuntu-16-04-cloud-amd64" + openStackPrivateNetId: "c7824f00-bef7-4864-81b9-f6c3afabd313" + openStackPrivateSubnetId: "2a0e8888-f93e-4615-8d28-fc3d4d087fc3" + openStackPrivateNetCidr: "10.0.0.0/16" + openStackSecurityGroup: "3a7a1e7e-6d15-4264-835d-fab1ae81e8b0" + openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "10.12.6.88" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + demoArtifactsVersion: "1.4.0-SNAPSHOT" + demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases" + scriptVersion: "1.4.0-SNAPSHOT" + rancherIpAddress: "10.12.5.127" + config: + # openStackEncryptedPasswordHere should match the encrypted string used in SO and APPC and overridden per environment + openStackEncryptedPasswordHere: "bbaef6cd76625ab9eb60deedeae7dbb9" +so: + # so server configuration + so-catalog-db-adapter: + config: + openStackUserName: "demo" + openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0" + openStackEncryptedPasswordHere: "1E82B3AF7ACF458C3A6058DF4DD5FD5E526FDAFAF163589C5F85F80CD7AEC09E034F375B" + # configure embedded mariadb + mariadb: + config: + mariadbRootPassword: password +nbi: + config: + # openstack configuration + openStackRegion: "Yolo" + openStackVNFTenantId: "1234"
\ No newline at end of file diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index b62606ebde..613a223ed8 100644 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -112,7 +112,7 @@ nbi: openStackRegion: "Yolo" openStackVNFTenantId: "1234" nfs-provisioner: - enabled: true + enabled: false policy: enabled: false pomba: |