summaryrefslogtreecommitdiffstats
path: root/kubernetes/onap
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/onap')
-rw-r--r--kubernetes/onap/Chart.yaml4
-rw-r--r--kubernetes/onap/resources/environments/core-onap.yaml2
-rw-r--r--kubernetes/onap/resources/environments/dev.yaml2
-rw-r--r--kubernetes/onap/resources/environments/disable-allcharts.yaml2
-rw-r--r--kubernetes/onap/resources/environments/minimal-onap.yaml2
-rw-r--r--kubernetes/onap/resources/overrides/environment.yaml5
-rw-r--r--kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml12
-rw-r--r--kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml2
-rw-r--r--kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml2
-rw-r--r--kubernetes/onap/resources/overrides/onap-all.yaml2
-rw-r--r--kubernetes/onap/resources/overrides/onap-vfw.yaml2
-rw-r--r--kubernetes/onap/resources/overrides/openstack.yaml14
-rw-r--r--kubernetes/onap/resources/overrides/sm-onap.yaml2
-rwxr-xr-xkubernetes/onap/values.yaml12
14 files changed, 3 insertions, 62 deletions
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 951543473a..6627e02bbb 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -33,10 +33,6 @@ dependencies:
version: ~12.x-0
repository: '@local'
condition: aai.enabled
- - name: appc
- version: ~12.x-0
- repository: '@local'
- condition: appc.enabled
- name: cassandra
version: ~12.x-0
repository: '@local'
diff --git a/kubernetes/onap/resources/environments/core-onap.yaml b/kubernetes/onap/resources/environments/core-onap.yaml
index 8a4bb706d9..a0abc2256c 100644
--- a/kubernetes/onap/resources/environments/core-onap.yaml
+++ b/kubernetes/onap/resources/environments/core-onap.yaml
@@ -54,8 +54,6 @@ aai:
replicaCount: 1
aaf:
enabled: false
-appc:
- enabled: false
cassandra:
enabled: true
replicaCount: 3
diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml
index 2caad2d530..01c2b5c6be 100644
--- a/kubernetes/onap/resources/environments/dev.yaml
+++ b/kubernetes/onap/resources/environments/dev.yaml
@@ -58,8 +58,6 @@ aai:
enabled: false
aai-cassandra:
replicaCount: 1
-appc:
- enabled: false
cassandra:
enabled: false
replicaCount: 1
diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml
index 43aa4c8c05..2d1466fa7e 100644
--- a/kubernetes/onap/resources/environments/disable-allcharts.yaml
+++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml
@@ -29,8 +29,6 @@ aaf:
enabled: false
aai:
enabled: false
-appc:
- enabled: false
cassandra:
enabled: false
clamp:
diff --git a/kubernetes/onap/resources/environments/minimal-onap.yaml b/kubernetes/onap/resources/environments/minimal-onap.yaml
index 7bfa258e5a..4035cb39d5 100644
--- a/kubernetes/onap/resources/environments/minimal-onap.yaml
+++ b/kubernetes/onap/resources/environments/minimal-onap.yaml
@@ -49,8 +49,6 @@ aai:
replicaCount: 1
aaf:
enabled: false
-appc:
- enabled: false
cassandra:
enabled: true
replicaCount: 1
diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml
index cb43e2e094..c22a3eee30 100644
--- a/kubernetes/onap/resources/overrides/environment.yaml
+++ b/kubernetes/onap/resources/overrides/environment.yaml
@@ -75,11 +75,6 @@ aai:
periodSeconds: 120
readiness:
periodSeconds: 60
-appc:
- mariadb-galera:
- liveness:
- initialDelaySeconds: 180
- periodSeconds: 60
cassandra:
liveness:
timeoutSeconds: 30
diff --git a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
index 506dd4f7fe..b20d7eb618 100644
--- a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
+++ b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
@@ -72,16 +72,6 @@ aaf:
enabled: true
aai:
enabled: true
-appc:
- enabled: false
- config:
- openStackType: OpenStackProvider
- openStackName: OpenStack
- openStackKeyStoneUrl: http://localhost:8181/apidoc/explorer/index.html
- openStackServiceTenantName: default
- openStackDomain: default
- openStackUserName: admin
- openStackEncryptedPassword: admin
cassandra:
enabled: true
cds:
@@ -137,7 +127,7 @@ portal:
robot:
enabled: true
config:
- # openStackEncryptedPasswordHere should match the encrypted string used in SO and APPC and overridden per environment
+ # openStackEncryptedPasswordHere should match the encrypted string used in SO and overridden per environment
openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
sdc:
enabled: true
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
index c78ac8abd2..74ec06e0df 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
@@ -49,8 +49,6 @@ aaf:
enabled: true
aai:
enabled: true
-appc:
- enabled: false
cds:
enabled: true
cli:
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
index 9a090c1a41..0aeb207dbd 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
@@ -37,8 +37,6 @@ aaf:
enabled: true
aai:
enabled: true
-appc:
- enabled: false
cds:
enabled: true
clamp:
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index aeac83f7ef..a287f303fa 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -36,8 +36,6 @@ aaf:
enabled: true
aai:
enabled: true
-appc:
- enabled: false
cds:
enabled: true
clamp:
diff --git a/kubernetes/onap/resources/overrides/onap-vfw.yaml b/kubernetes/onap/resources/overrides/onap-vfw.yaml
index fc0c94de24..565c9bca74 100644
--- a/kubernetes/onap/resources/overrides/onap-vfw.yaml
+++ b/kubernetes/onap/resources/overrides/onap-vfw.yaml
@@ -25,8 +25,6 @@ aaf:
enabled: true
aai:
enabled: true
-appc:
- enabled: true
clamp:
enabled: true
consul:
diff --git a/kubernetes/onap/resources/overrides/openstack.yaml b/kubernetes/onap/resources/overrides/openstack.yaml
index 5e09d7cfe9..9c0fc539c3 100644
--- a/kubernetes/onap/resources/overrides/openstack.yaml
+++ b/kubernetes/onap/resources/overrides/openstack.yaml
@@ -15,19 +15,7 @@
#################################################################
# 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: "OPENSTACK_TENANTNAME_HERE"
- openStackDomain: "Default"
- openStackUserName: "OPENSTACK_USERNAME_HERE"
- openStackEncryptedPassword: "XXXXXXXXXXXXXXXXXXXXXXXX_OPENSTACK_PASSWORD_HERE_XXXXXXXXXXXXXXXX"
robot:
- appcUsername: "appc@appc.onap.org"
- appcPassword: "demo123456!"
openStackKeyStoneUrl: "http://10.12.25.2:5000"
openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
openStackTenantId: "09d8566ea45e43aa974cf447ed591d77"
@@ -46,7 +34,7 @@ robot:
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 should match the encrypted string used in SO and overridden per environment
openStackEncryptedPasswordHere: "XXXXXXXXXXXXXXXXXXXXXXXX_OPENSTACK_ENCRYPTED_PASSWORD_HERE_XXXXXXXXXXXXXXXX"
so:
# so server configuration
diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml
index 1d3b2eb5c9..e1cf186da5 100644
--- a/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@ -66,8 +66,6 @@ aaf:
cps:
# you must always set the same values as value set in cps.enabled
enabled: false
-appc:
- enabled: false
cassandra:
enabled: true
replicaCount: 3
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index bdbf5ab323..9755e91fce 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -285,16 +285,6 @@ aaf:
enabled: false
aai:
enabled: false
-appc:
- enabled: false
- config:
- openStackType: OpenStackProvider
- openStackName: OpenStack
- openStackKeyStoneUrl: http://localhost:8181/apidoc/explorer/index.html
- openStackServiceTenantName: default
- openStackDomain: default
- openStackUserName: admin
- openStackEncryptedPassword: admin
cassandra:
enabled: false
cds:
@@ -358,7 +348,7 @@ portal:
robot:
enabled: false
config:
- # openStackEncryptedPasswordHere should match the encrypted string used in SO and APPC and overridden per environment
+ # openStackEncryptedPasswordHere should match the encrypted string used in SO and overridden per environment
openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
sdc:
enabled: false