summaryrefslogtreecommitdiffstats
path: root/kubernetes/oof
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-11-02 12:23:37 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-02 12:23:37 +0000
commit0908860b88c1400119d588da6b6c59b4b8864e03 (patch)
treea4697ad97a47f4629e5d17441eb5cb24e0a96495 /kubernetes/oof
parentee8f6075f6970f541f93d21b8dfa216d15595727 (diff)
parentba7fe94b93e4da611d179f09cf307aff97f2224f (diff)
Merge "AAF Integration for OOF-HAS"
Diffstat (limited to 'kubernetes/oof')
-rwxr-xr-xkubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml2
-rwxr-xr-xkubernetes/oof/charts/oof-has/resources/config/conductor.conf21
2 files changed, 17 insertions, 6 deletions
diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml
index 7589a0a3b4..9940305659 100755
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-api/templates/deployment.yaml
@@ -37,6 +37,8 @@ spec:
args:
- --container-name
- oof-has-controller
+ - --container-name
+ - aaf-service
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
index 32213319a7..4db857a898 100755
--- a/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
+++ b/kubernetes/oof/charts/oof-has/resources/config/conductor.conf
@@ -148,21 +148,30 @@ log_config_append = /usr/local/bin/log.conf
#fatal_deprecations = false
-[aaf_authentication]
+[aaf_api]
#
# From conductor
#
# is_aaf_enabled. (boolean value)
-is_aaf_enabled = false
+is_aaf_enabled = true
# aaf_cache_expiry_hrs. (integer value)
-#aaf_cache_expiry_hrs = 3
+aaf_cache_expiry_hrs = 3
# aaf_url. (string value)
-#aaf_url = http://aaf-service:8100/authz/perms/user/
-aaf_url = http://{{.Values.config.aaf.serviceName}}.{{ include "common.namespace" . }}:{{.Values.config.aaf.port}}/authz/perms/user/
+aaf_url = https://{{.Values.config.aaf.serviceName}}:{{.Values.config.aaf.port}}/authz/perms/user/
+
+# aaf_cert_file. (string value)
+#aaf_cert_file = <None>
+
+# aaf_cert_key_file. (string value)
+#aaf_cert_key_file = <None>
+
+# aaf_ca_bundle_file. (string value)
+#aaf_ca_bundle_file =
+aaf_ca_bundle_file = /usr/local/bin/AAF_RootCA.cer
# aaf_retries. (integer value)
#aaf_retries = 3
@@ -171,7 +180,7 @@ aaf_url = http://{{.Values.config.aaf.serviceName}}.{{ include "common.namespace
#aaf_timeout = 100
# aaf_user_roles. (list value)
-#aaf_user_roles = {"type": "org.onap.oof","instance": "plans","action": "GET"},{"type": "org.onap.oof","instance": "plans","action": "POST"}
+#aaf_permissions = {"type": "org.onap.oof.access","instance": "*","action": "*"}
[aaf_sms]