Merge "[Contrib] Authorize choice of subcomponents"

diff --git a/docs/index.rst b/docs/index.rst
index 340b43b..c8048d1 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,6 +1,7 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright 2018 Amdocs, Bell Canada
+.. _master_index:
 
 
 OOM Documentation Repository

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 154c6ab..899ad2c 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -3,6 +3,7 @@
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright 2017 Bell Canada & Amdocs Intellectual Property.  All rights
 .. reserved.
+.. _release_notes:
 
 .. Links
 .. _release-notes-label:
@@ -120,7 +121,7 @@ Summary
   * Automated rolling upgrades for applications
   * In-place schema and data migrations
   * Blue-Green deployment environment migration (e.g. Pre-prod to Prod)
-  * Upgrades from embedded database instance into shared database instance
+  * Upgrades from embedded database instance into shared database instance
 
 * Release-to-release upgrade support delivered for the following projects
 
@@ -268,7 +269,7 @@ Story
 * [`OOM-52 <https://jira.onap.org/browse/OOM-52>`_] - OOM ONAP Configuration Management - Parameterization of docker images
 * [`OOM-53 <https://jira.onap.org/browse/OOM-53>`_] - OOM ONAP Configuration Management - Parameterization for Sizing
 * [`OOM-63 <https://jira.onap.org/browse/OOM-63>`_] - Kubernetes cluster created by TOSCA description
-* [`OOM-85 <https://jira.onap.org/browse/OOM-85>`_] - Test the code in the “Lab” project environment
+* [`OOM-85 <https://jira.onap.org/browse/OOM-85>`_] - Test the code in the "Lab" project environment
 * [`OOM-86 <https://jira.onap.org/browse/OOM-86>`_] - Monitoring the health status of ONAP components
 * [`OOM-87 <https://jira.onap.org/browse/OOM-87>`_] - Configure TOSCA description via dashboard
 * [`OOM-88 <https://jira.onap.org/browse/OOM-88>`_] - Deploy Holmes on K8S cluster by TOSCA description

diff --git a/kubernetes/portal/charts/portal-app/values.yaml b/kubernetes/portal/charts/portal-app/values.yaml
index 433352c..9a17ab0 100644 (file)
--- a/kubernetes/portal/charts/portal-app/values.yaml
+++ b/kubernetes/portal/charts/portal-app/values.yaml
@@ -24,6 +24,7 @@ global:
   loggingImage: beats/filebeat:5.5.0
   #AAF service
   aafEnabled: true
+  aafAgentImage: onap/aaf/aaf_agent:2.1.20
 
 #################################################################
 # Application configuration defaults.

diff --git a/kubernetes/portal/charts/portal-sdk/values.yaml b/kubernetes/portal/charts/portal-sdk/values.yaml
index 77ceb27..ad1e156 100644 (file)
--- a/kubernetes/portal/charts/portal-sdk/values.yaml
+++ b/kubernetes/portal/charts/portal-sdk/values.yaml
@@ -25,6 +25,7 @@ global:
   persistence: {}
   #AAF service
   aafEnabled: true
+  aafAgentImage: onap/aaf/aaf_agent:2.1.20
 
 #################################################################
 # Application configuration defaults.

diff --git a/kubernetes/robot b/kubernetes/robot
index 7f37c3c..4b3ce28 160000 (submodule)
--- a/kubernetes/robot
+++ b/kubernetes/robot
@@ -1 +1 @@
-Subproject commit 7f37c3cd610edd911a8b68e2118212d9ec8149d6
+Subproject commit 4b3ce28d5c42f2bc8ca9445545895aa34ff09a03