Merge "Modifications for AAF identities"
authorAlexis de Talhouët <adetalhouet89@gmail.com>
Tue, 29 Jan 2019 21:50:21 +0000 (21:50 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 29 Jan 2019 21:50:21 +0000 (21:50 +0000)
13 files changed:
docs/oom_user_guide.rst
kubernetes/aai/charts/aai-cassandra/templates/statefulset.yaml
kubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh [new file with mode: 0755]
kubernetes/appc/templates/statefulset.yaml
kubernetes/appc/values.yaml
kubernetes/common/music/charts/music-cassandra/templates/statefulset.yaml
kubernetes/pomba/charts/pomba-contextaggregator/resources/config/application.properties
kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/aai.properties
kubernetes/sdc/charts/sdc-fe/resources/config/plugins/plugins-configuration.yaml [new file with mode: 0644]
kubernetes/sdc/charts/sdc-fe/templates/configmap.yaml
kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
kubernetes/sdc/charts/sdc-fe/values.yaml
kubernetes/sdc/resources/config/environments/AUTO.json

index ea658f0..99a9a47 100644 (file)
@@ -145,15 +145,19 @@ system, and looks for matches::
 
 In any case, setup of the Helm repository is a one time activity.
 
+Next, install Helm Plugins required to deploy the ONAP Casablanca release::
+
+  > cp -R helm/plugins/ ~/.helm
+
 Once the repo is setup, installation of ONAP can be done with a single command::
 
-  > helm install local/onap --name development
+  > helm deploy development local/onap --namespace onap
 
 This will install ONAP from a local repository in a 'development' Helm release.
 As described below, to override the default configuration values provided by
 OOM, an environment file can be provided on the command line as follows::
 
-  > helm install local/onap --name development -f onap-development.yaml
+  > helm deploy development local/onap --namespace onap -f overrides.yaml
 
 To get a summary of the status of all of the pods (containers) running in your
 deployment::
@@ -174,9 +178,9 @@ deployment::
 
 
 To install a specific version of a single ONAP component (`so` in this example)
-with the given name enter::
+with the given release name enter::
 
-  > helm install onap/so --version 2.0.1 -n so
+  > helm deploy so onap/so --version 3.0.1
 
 To display details of a specific resource or group of resources type::
 
index 4a8ae39..a576eba 100644 (file)
@@ -127,5 +127,6 @@ spec:
             storage: {{ .Values.persistence.size | quote }}
         selector:
           matchLabels:
+            app: {{ include "common.name" . }}
             release: "{{ .Release.Name }}"
   {{- end }}
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/installFeatures.sh
new file mode 100755 (executable)
index 0000000..724f4e7
--- /dev/null
@@ -0,0 +1,184 @@
+#!/bin/bash
+
+###
+# ============LICENSE_START=======================================================
+# APPC
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# 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.
+# ============LICENSE_END=========================================================
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+###
+
+ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
+APPC_HOME=${APPC_HOME:-/opt/onap/appc}
+ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
+APPC_FEATURE_DIR=${APPC_FEATURE_DIR:-${APPC_HOME}/features}
+
+function featureInstall {
+COUNT=0
+while [ $COUNT -lt 10 ]; do
+  ${ODL_HOME}/bin/client feature:install $1 2> /tmp/installErr
+  cat /tmp/installErr
+  if grep -q 'Failed to get the session' /tmp/installErr; then
+    sleep 10
+  else
+    let COUNT=10
+  fi
+  let COUNT=COUNT+1
+done
+}
+
+ APPC_FEATURES=" \
+ appc-metric \
+ appc-dmaap-adapter \
+ appc-chef-adapter \
+ appc-netconf-adapter \
+ appc-rest-adapter \
+ appc-lifecycle-management \
+ appc-dispatcher \
+ appc-provider \
+ appc-dg-util \
+ appc-dg-shared \
+ appc-sdc-listener \
+ appc-oam \
+ appc-iaas-adapter \
+ appc-ansible-adapter \
+ appc-sequence-generator \
+ appc-artifact-handler \
+ appc-aai-client"
+
+APPC_FEATURES_1=" \
+ onap-appc-core \
+ onap-appc-metric \
+ onap-appc-dmaap-adapter \
+ onap-appc-chef-adapter \
+ onap-appc-netconf-adapter \
+ onap-appc-rest-adapter \
+ onap-appc-lifecycle-management \
+ onap-appc-license-manager"
+
+ APPC_FEATURES_2=" \
+ onap-appc-dg-util \
+ onap-appc-dg-shared \
+ onap-appc-sdc-listener \
+ onap-appc-oam \
+ onap-appc-iaas-adapter \
+ onap-appc-ansible-adapter \
+ onap-appc-sequence-generator \
+ onap-appc-config-generator \
+ onap-appc-config-data-services \
+ onap-appc-config-adaptor \
+ onap-appc-config-audit \
+ onap-appc-config-encryption-tool \
+ onap-appc-config-flow-controller \
+ onap-appc-config-params \
+ onap-appc-artifact-handler
+ onap-appc-aai-client \
+ onap-appc-event-listener \
+ onap-appc-network-inventory-client \
+ onap-appc-design-services \
+ onap-appc-interfaces-service"
+
+ APPC_FEATURES_UNZIP=" \
+ appc-core \
+ appc-metric \
+ appc-dmaap-adapter \
+ appc-event-listener \
+ appc-chef-adapter \
+ appc-netconf-adapter \
+ appc-rest-adapter \
+ appc-lifecycle-management \
+ appc-dispatcher \
+ appc-provider \
+ appc-dg-util \
+ appc-dg-shared \
+ appc-sdc-listener \
+ appc-oam \
+ appc-iaas-adapter \
+ appc-ansible-adapter \
+ appc-sequence-generator \
+ appc-config-generator \
+ appc-config-data-services \
+ appc-config-adaptor \
+ appc-config-audit \
+ appc-config-encryption-tool \
+ appc-config-flow-controller \
+ appc-config-params \
+ appc-artifact-handler \
+ appc-aai-client \
+ appc-network-inventory-client \
+ appc-design-services \
+ appc-interfaces-service"
+
+
+if $ENABLE_ODL_CLUSTER
+  then
+    echo "Enabling core APP-C features with clustering enabled"
+    featureInstall odl-netconf-connector-all
+    featureInstall odl-restconf-noauth
+    featureInstall odl-netconf-clustered-topology
+  else
+    echo "Enabling core APP-C features with clustering disabled"
+    featureInstall odl-netconf-connector-all
+    featureInstall odl-restconf-noauth
+    featureInstall odl-netconf-topology
+fi
+
+sleep 7s
+echo "Installing APP-C Features"
+echo ""
+
+for feature in ${APPC_FEATURES_UNZIP}
+do
+  if [ -f ${APPC_FEATURE_DIR}/${feature}/install-feature.sh ]
+  then
+    ${APPC_FEATURE_DIR}/${feature}/install-feature.sh
+  else
+    echo "No installer found for feature ${feature}"
+  fi
+done
+
+#${ODL_HOME}/bin/client feature:install appc-metric appc-dmaap-adapter appc-event-listener appc-chef-adapter appc-netconf-adapter appc-rest-adapter appc-lifecycle-management appc-dispatcher appc-provider appc-dg-util appc-dg-shared appc-sdc-listener appc-oam appc-iaas-adapter appc-ansible-adapter appc-sequence-generator appc-config-generator appc-config-data-services appc-config-adaptor appc-config-audit appc-config-encryption-tool appc-config-flow-controller appc-config-params appc-artifact-handler appc-aai-client
+
+for feature in ${APPC_FEATURES_1}
+do
+  echo "Installing ${feature}"
+  start=$(date +%s)
+  ${ODL_HOME}/bin/client "feature:install -r ${feature}"
+  end=$(date +%s)
+  echo "Install of ${feature} took $(expr $end - $start) seconds"
+  sleep 7s
+  echo "Sleep Finished"
+done
+
+  echo "Installing dispatcher features"
+  start=$(date +%s)
+  ${ODL_HOME}/bin/client "feature:install -r onap-appc-request-handler onap-appc-command-executor onap-appc-lifecycle-management onap-appc-workflow-management lock-manager onap-appc-provider"
+  end=$(date +%s)
+  echo "Install of dispatcher features took $(expr $end - $start) seconds"
+  sleep 7s
+  echo "Sleep Finished"
+
+for feature in ${APPC_FEATURES_2}
+do
+  echo "Installing ${feature}"
+  start=$(date +%s)
+  ${ODL_HOME}/bin/client "feature:install -r ${feature}"
+  end=$(date +%s)
+  echo "Install of ${feature} took $(expr $end - $start) seconds"
+  sleep 7s
+  echo "Sleep Finished"
+done
+
index 6b0373f..6677516 100644 (file)
@@ -116,6 +116,9 @@ spec:
           - mountPath: /opt/onap/appc/bin/installAppcDb.sh
             name: onap-appc-bin
             subPath: installAppcDb.sh
+          - mountPath: /opt/onap/appc/bin/installFeatures.sh
+            name: onap-appc-bin
+            subPath: installFeatures.sh
           - mountPath: /opt/onap/appc/bin/health_check.sh
             name: onap-appc-bin
             subPath: health_check.sh
index d885616..f3d20bc 100644 (file)
@@ -31,7 +31,7 @@ global:
 flavor: small
 # application image
 repository: nexus3.onap.org:10001
-image: onap/appc-image:1.4.3
+image: onap/appc-image:1.5.0-SNAPSHOT-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
index 009c40d..cdea9e3 100644 (file)
@@ -134,5 +134,6 @@ spec:
             storage: {{ .Values.persistence.size | quote }}
         selector:
           matchLabels:
+            app: {{ include "common.name" . }}
             release: "{{ .Release.Name }}"
   {{- end }}
index dc885ac..8ffeb09 100755 (executable)
@@ -29,6 +29,9 @@ transport.consume.consumerid=audit1
 transport.consume.timeout=15000
 transport.consume.batchsize=8
 transport.consume.type=HTTPAUTH
+transport.message-router.apiKey=apiKeyTemp123
+transport.message-router.apiSecret=apiSecretTemp123
+transport.message-router.requiredPombaTopics=POA-AUDIT-INIT,POA-AUDIT-RESULT,POA-RULE-VALIDATION
 
 transport.publish.host=message-router
 transport.publish.port=3904
index 5d1e583..db72a01 100755 (executable)
@@ -1,4 +1,4 @@
-# Copyright © 2018 Amdocs
+# Copyright © 2018 Amdocs
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/kubernetes/sdc/charts/sdc-fe/resources/config/plugins/plugins-configuration.yaml b/kubernetes/sdc/charts/sdc-fe/resources/config/plugins/plugins-configuration.yaml
new file mode 100644 (file)
index 0000000..f9a3b17
--- /dev/null
@@ -0,0 +1,28 @@
+pluginsList:
+   - pluginId: DCAED
+     pluginDiscoveryUrl: "{{ .Values.config.plugins.dcae_discovery_url }}"
+     pluginSourceUrl: "{{ .Values.config.plugins.dcae_source_url }}"
+     pluginStateUrl: "dcaed"
+     pluginDisplayOptions:
+        context:
+            displayName: "Monitoring"
+            displayContext: ["SERVICE"]
+            displayRoles: ["DESIGNER"]
+   - pluginId: DCAE-DS
+     pluginDiscoveryUrl: "{{ .Values.config.plugins.dcae_dt_discovery_url }}"
+     pluginSourceUrl: "{{ .Values.config.plugins.dcae_dt_source_url }}"
+     pluginStateUrl: "dcae-ds"
+     pluginDisplayOptions:
+       tab:
+           displayName: "DCAE-DS"
+           displayRoles: ["DESIGNER"]
+   - pluginId: WORKFLOW
+     pluginDiscoveryUrl: "{{ .Values.config.plugins.workflow_discovery_url }}"
+     pluginSourceUrl: "{{ .Values.config.plugins.workflow_source_url }}"
+     pluginStateUrl: "workflowDesigner"
+     pluginDisplayOptions:
+        tab:
+            displayName: "WORKFLOW"
+            displayRoles: ["DESIGNER", "TESTER"]
+
+connectionTimeout: 1000
\ No newline at end of file
index 03eb04e..fedbda8 100644 (file)
@@ -25,3 +25,16 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
 {{ tpl (.Files.Glob "resources/config/logging/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-plugins-configmap
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/config/plugins/*").AsConfig . | indent 2 }}
\ No newline at end of file
index 9a34263..46ba241 100644 (file)
@@ -98,6 +98,9 @@ spec:
             readOnly: true
           - name: {{ include "common.fullname" . }}-logs
             mountPath: /var/log/onap
+          - name: {{ include "common.fullname" . }}-configs
+            mountPath: /var/lib/jetty/config/catalog-fe/plugins-configuration.yaml
+            subPath: plugins-configuration.yaml
           - name: {{ include "common.fullname" . }}-logback
             mountPath: /tmp/logback.xml
             subPath: logback.xml
@@ -126,6 +129,10 @@ spec:
             name: {{ .Release.Name }}-sdc-filebeat-configmap
         - name: {{ include "common.fullname" . }}-data-filebeat
           emptyDir: {}
+        - name: {{ include "common.fullname" . }}-configs
+          configMap:
+            name : {{ include "common.fullname" . }}-plugins-configmap
+            defaultMode: 0777
         - name: {{ include "common.fullname" . }}-logback
           configMap:
             name : {{ include "common.fullname" . }}-logging-configmap
index f0909e2..2782222 100644 (file)
@@ -33,6 +33,13 @@ pullPolicy: Always
 
 config:
   javaOptions: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=6000,server=y,suspend=n -Xmx256m -Xms256m"
+  plugins:
+    dcae_discovery_url: "http://sdc-dcae-fe:8183/dcaed/#/home"
+    dcae_source_url: "http://sdc.dcae.plugin.simpledemo.onap.org:30263/dcaed/#/home"
+    dcae_dt_discovery_url: "http://sdc-dcae-dt:8186/dcae/#/dcae/home"
+    dcae_dt_source_url: "http://sdc.dcae.plugin.simpledemo.onap.org:30265/dcae/#/dcae/home"
+    workflow_discovery_url: "http://sdc-wfd-fe:8080"
+    workflow_source_url: "http://sdc.workflow.plugin.simpledemo.onap.org:30256"
 
 # default number of instances
 replicaCount: 1
index 46c58ef..bb5df2b 100755 (executable)
             ],
             "KB": "sdc-kb.{{include "common.namespace" .}}"
         },
-        "Plugins": {
-            "DCAE": {
-                "dcae_discovery_url": "http://sdc-dcae-fe.{{include "common.namespace" .}}:8183/dcaed/#/home",
-                "dcae_source_url": "http://sdc.dcae.plugin.simpledemo.onap.org:30263/dcaed/#/home"
-            },
-            "DCAE-TAB": {
-                "dcae_dt_discovery_url": "http://sdc-dcae-dt.{{include "common.namespace" .}}:8186/dcae/#/dcae/home",
-                "dcae_dt_source_url": "http://sdc.dcae.plugin.simpledemo.onap.org:30265/dcae/#/dcae/home"
-            },
-            "WORKFLOW": {
-                "workflow_discovery_url": "http://sdc-wfd-fe.{{include "common.namespace" .}}:8080",
-                "workflow_source_url": "http://sdc.workflow.plugin.simpledemo.onap.org:30256"
-            }
-        },
         "VnfRepo": {
             "vnfRepoPort": "{{.Values.config.environment.vnfRepoPort}}",
             "vnfRepoHost": "refrepo.{{include "common.namespace" .}}"