Merge "[SDNC] Move ODL persistent data to pvc" into guilin
diff --git a/docs/conf.py b/docs/conf.py
index 3b28eb7..a45acf3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -9,6 +9,30 @@
intersphinx_mapping = {}
+needs_services = {
+ 'github-issues': {
+ 'url': 'https://api.github.com/',
+ 'need_type': 'spec',
+ 'max_amount': 2,
+ 'max_content_lines': 20,
+ 'id_prefix': 'GH_ISSUE_'
+ },
+ 'github-prs': {
+ 'url': 'https://api.github.com/',
+ 'need_type': 'spec',
+ 'max_amount': 2,
+ 'max_content_lines': 20,
+ 'id_prefix': 'GH_PR_'
+ },
+ 'github-commits': {
+ 'url': 'https://api.github.com/',
+ 'need_type': 'spec',
+ 'max_amount': 2,
+ 'max_content_lines': 20,
+ 'id_prefix': 'GH_COMMIT_'
+ }
+}
+
html_last_updated_fmt = '%d-%b-%y %H:%M'
def setup(app):
diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index 6b1c69c..51c28c2 100644
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -161,8 +161,9 @@
> make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] all
`HELM_BIN`
- Sets the helm binary to be used. The default value use helm from PATH. Allow the user to have
- multiple version of helm in operating system and choose which one to use.
+ Sets the helm binary to be used. The default value use helm from PATH. Allow
+ the user to have multiple version of helm in operating system and choose
+ which one to use.
**Step 7.** Display the onap charts that available to be deployed::
diff --git a/docs/oom_setup_ingress_controller.rst b/docs/oom_setup_ingress_controller.rst
index c15171c..e49c72a 100644
--- a/docs/oom_setup_ingress_controller.rst
+++ b/docs/oom_setup_ingress_controller.rst
@@ -15,7 +15,7 @@
.. figure:: oomLogoV2-medium.png
:align: right
-.. _onap-on-kubernetes-with-rancher:
+.. _oom_setup_ingress_controller:
Ingress controller setup on HA Kubernetes Cluster
@@ -174,7 +174,6 @@
---
<...>
- #ingress virtualhost based configuration
global:
<...>
ingress:
diff --git a/docs/oom_user_guide.rst b/docs/oom_user_guide.rst
index ac716a3..9aac8ae 100644
--- a/docs/oom_user_guide.rst
+++ b/docs/oom_user_guide.rst
@@ -142,8 +142,9 @@
> make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] all
`HELM_BIN`
- Sets the helm binary to be used. The default value use helm from PATH. Allow the user to have
- multiple version of helm in operating system and choose which one to use.
+ Sets the helm binary to be used. The default value use helm from PATH.
+ Allow the user to have multiple version of helm in operating system and
+ choose which one to use.
The Helm search command reads through all of the repositories configured on the
system, and looks for matches::
diff --git a/docs/oom_user_guide_helm3.rst b/docs/oom_user_guide_helm3.rst
index b687fe8..08e9ec0 100644
--- a/docs/oom_user_guide_helm3.rst
+++ b/docs/oom_user_guide_helm3.rst
@@ -12,8 +12,8 @@
.. _Helm Documentation: https://docs.helm.sh/helm/
.. _Helm: https://docs.helm.sh/
.. _Kubernetes: https://Kubernetes.io/
-.. _Kubernetes LoadBalancer: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer
-.. _user-guide-label:
+.. _Kubernetes LoadBalancer: https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer
+.. _oom_user_guide_helm3:
OOM User Guide helm3 (experimental)
###################################
@@ -415,7 +415,7 @@
Ensure you've disabled any proxy settings the browser you are using to access
the portal and then simply access now the new ssl-encrypted URL:
-https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm
+``https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm``
.. note::
Using the HTTPS based Portal URL the Browser needs to be configured to accept
@@ -482,7 +482,7 @@
.. figure:: consulHealth.png
:align: center
-To see the real-time health of a deployment go to: http://<kubernetes IP>:30270/ui/
+To see the real-time health of a deployment go to: ``http://<kubernetes IP>:30270/ui/``
where a GUI much like the following will be found:
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index b3188dd..e14c784 100644
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -8,6 +8,7 @@
sphinxcontrib-blockdiag
sphinxcontrib-needs>=0.2.3
sphinxcontrib-nwdiag
+sphinxcontrib-redoc
sphinxcontrib-seqdiag
sphinxcontrib-swaggerdoc
sphinxcontrib-plantuml
diff --git a/kubernetes/common/common/templates/_ingress.tpl b/kubernetes/common/common/templates/_ingress.tpl
index e57d4be..18f9bb1 100644
--- a/kubernetes/common/common/templates/_ingress.tpl
+++ b/kubernetes/common/common/templates/_ingress.tpl
@@ -1,42 +1,18 @@
-{{- define "ingress.config.host" -}}
-{{- $dot := default . .dot -}}
-{{- $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) -}}
-{{- $burl := (required "'baseurl' param, set to the generic part of the fqdn, is required." $dot.Values.global.ingress.virtualhost.baseurl) -}}
-{{ printf "%s.%s" $baseaddr $burl }}
-{{- end -}}
-
{{- define "ingress.config.port" -}}
{{- $dot := default . .dot -}}
-{{- if .Values.ingress -}}
-{{- if .Values.global.ingress -}}
-{{- if or (not .Values.global.ingress.virtualhost) (not .Values.global.ingress.virtualhost.enabled) -}}
- - http:
- paths:
-{{- range .Values.ingress.service }}
-{{ $baseaddr := required "baseaddr" .baseaddr }}
- - path: {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }}
- backend:
- serviceName: {{ .name }}
- servicePort: {{ .port }}
-{{- end -}}
-{{- else if .Values.ingress.service -}}
+{{- $burl := (required "'baseurl' param, set to the generic part of the fqdn, is required." $dot.Values.global.ingress.virtualhost.baseurl) -}}
{{ range .Values.ingress.service }}
-{{ $baseaddr := required "baseaddr" .baseaddr }}
- - host: {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }}
+{{- $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) }}
+ - host: {{ printf "%s.%s" $baseaddr $burl }}
http:
paths:
- backend:
serviceName: {{ .name }}
servicePort: {{ .port }}
-{{- end -}}
-{{- else -}}
- - path: {{ printf "/%s" .Chart.Name }}
- backend:
- serviceName: {{ .Chart.Name }}
- servicePort: {{ .Values.service.externalPort }}
-{{- end -}}
-{{- end -}}
-{{- end -}}
+ {{- if .path }}
+ path: {{ .path }}
+ {{- end }}
+{{- end }}
{{- end -}}
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
index 5be8cac..f2128d2 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
@@ -25,9 +25,8 @@
readinessImage: onap/oom/readiness:3.0.1
ingress:
- enabled: true
virtualhost:
- enabled: false
+ baseurl: "simpledemo.onap.org"
config:
nifiJarsIndexURL: http://dcaemod-genprocessor:8080/nifi-jars
@@ -47,11 +46,14 @@
ingress:
enabled: true
+ enabledOverride: true
service:
- - baseaddr: "nifi"
+ - baseaddr: "dcaemod"
+ path: "/nifi"
name: "dcaemod-designtool"
port: 8080
- - baseaddr: "nifi-api"
+ - baseaddr: "dcaemod"
+ path: "/nifi-api"
name: "dcaemod-designtool"
port: 8080
config:
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
index c717ca3..f08ef82 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
@@ -25,9 +25,8 @@
readinessImage: onap/oom/readiness:3.0.1
ingress:
- enabled: true
virtualhost:
- enabled: false
+ baseurl: "simpledemo.onap.org"
config:
nifiRegistryURL: http://dcaemod-nifi-registry:18080/nifi-registry-api
@@ -46,8 +45,10 @@
ingress:
enabled: true
+ enabledOverride: true
service:
- - baseaddr: "distributor"
+ - baseaddr: "dcaemod"
+ path: "/distributor"
name: dcaemod-distributor-api
port: 8080
config:
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml
index 92633ac..9bfcc83 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml
@@ -24,9 +24,8 @@
nodePortPrefixExt: 304
readinessImage: onap/oom/readiness:3.0.1
ingress:
- enabled: true
virtualhost:
- enabled: false
+ baseurl: "simpledemo.onap.org"
config:
onboardingAPIURL: http://dcaemod-onboarding-api:8080/onboarding
@@ -45,8 +44,10 @@
ingress:
enabled: true
+ enabledOverride: true
service:
- - baseaddr: "nifi-jars"
+ - baseaddr: "dcaemod"
+ path: "/nifi-jars"
name: dcaemod-genprocessor
port: 8080
config:
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
index 161b362..3c460ca 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
@@ -23,9 +23,9 @@
nodePortPrefixExt: 304
readinessImage: onap/oom/readiness:3.0.1
ingress:
- enabled: true
virtualhost:
- enabled: false
+ baseurl: "simpledemo.onap.org"
+
#################################################################
# Secrets metaconfig
#################################################################
@@ -49,8 +49,10 @@
port: 8080
ingress:
enabled: true
+ enabledOverride: true
service:
- - baseaddr: "onboarding"
+ - baseaddr: "dcaemod"
+ path: "/onboarding"
name: dcaemod-onboarding-api
port: 8080
config:
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 54f886d..11068ba 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -106,7 +106,6 @@
ingress:
enabled: false
virtualhost:
- enabled: true
baseurl: "simpledemo.onap.org"
# Global Service Mesh configuration
diff --git a/kubernetes/releases/7.0.0.yaml b/kubernetes/releases/7.0.0.yaml
new file mode 100644
index 0000000..41db038
--- /dev/null
+++ b/kubernetes/releases/7.0.0.yaml
@@ -0,0 +1,6 @@
+---
+distribution_type: 'helm-charts'
+release_tag: '7.0.0'
+project: 'oom'
+log_dir: 'oom-guilin-merge-helm/22/'
+ref: 'Ia61a08d1e6cc4499525d82c5b2dfd83cf2d6a3e8'
diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/kubernetes/sdnc/components/dmaap-listener/values.yaml
index 0f3f18b..4695f36 100644
--- a/kubernetes/sdnc/components/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/values.yaml
@@ -55,7 +55,7 @@
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdnc-dmaap-listener-image:2.0.4
+image: onap/sdnc-dmaap-listener-image:2.0.5
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
index 080ae9c..fd85746 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
@@ -55,7 +55,7 @@
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdnc-ansible-server-image:2.0.4
+image: onap/sdnc-ansible-server-image:2.0.5
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml
index 136379a..5496e9a 100644
--- a/kubernetes/sdnc/components/sdnc-web/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/values.yaml
@@ -27,7 +27,7 @@
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: "onap/sdnc-web-image:2.0.4"
+image: "onap/sdnc-web-image:2.0.5"
pullPolicy: Always
config:
diff --git a/kubernetes/sdnc/components/ueb-listener/values.yaml b/kubernetes/sdnc/components/ueb-listener/values.yaml
index 2b0da14..09a3b5d 100644
--- a/kubernetes/sdnc/components/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/values.yaml
@@ -61,7 +61,7 @@
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdnc-ueb-listener-image:2.0.4
+image: onap/sdnc-ueb-listener-image:2.0.5
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/resources/config/conf/org.opendaylight.aaa.filterchain.cfg b/kubernetes/sdnc/resources/config/conf/org.opendaylight.aaa.filterchain.cfg
new file mode 100755
index 0000000..cffc526
--- /dev/null
+++ b/kubernetes/sdnc/resources/config/conf/org.opendaylight.aaa.filterchain.cfg
@@ -0,0 +1 @@
+customFilterList=org.onap.ccsdk.sli.core.filters.ControllerAuditLogFilter,org.onap.ccsdk.sli.core.filters.ControllerPayloadLoggingFilter
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index cfeed36..91af687 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -282,6 +282,9 @@
- mountPath: {{ .Values.config.odl.etcDir }}/org.opendaylight.controller.cluster.datastore.cfg
name: properties
subPath: org.opendaylight.controller.cluster.datastore.cfg
+ - mountPath: {{ .Values.config.odl.etcDir }}/org.opendaylight.aaa.filterchain.cfg
+ name: properties
+ subPath: org.opendaylight.aaa.filterchain.cfg
- mountPath: {{ .Values.config.odl.binDir }}/setenv
name: properties
subPath: setenv
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 62ea644..aab1edf 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -136,7 +136,7 @@
repository: nexus3.onap.org:10001
pullPolicy: Always
-image: onap/sdnc-image:2.0.4
+image: onap/sdnc-image:2.0.5
busyboxRepository: docker.io
busyboxImage: busybox:1.30
@@ -193,7 +193,7 @@
binDir: /opt/opendaylight/bin
gcLogDir: /opt/opendaylight/data/log
salConfigDir: /opt/opendaylight/system/org/opendaylight/controller/sal-clustering-config
- salConfigVersion: 1.9.1
+ salConfigVersion: 1.10.4
akka:
seedNodeTimeout: 15s
circuitBreaker:
diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index 2bb7d7b..d234e60 100755
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -67,7 +67,7 @@
# Application configuration defaults.
#################################################################
repository: nexus3.onap.org:10001
-image: onap/so/bpmn-infra:1.7.10
+image: onap/so/bpmn-infra:1.7.11
pullPolicy: Always
db:
diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
index b27566d..319d45b 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
@@ -66,7 +66,8 @@
# Application configuration defaults.
#################################################################
repository: nexus3.onap.org:10001
-image: onap/so/catalog-db-adapter:1.7.10
+image: onap/so/catalog-db-adapter:1.7.11
+
pullPolicy: Always
db:
diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index 7cfa75a..31c4935 100755
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -76,7 +76,8 @@
#################################################################
# Application configuration defaults.
#################################################################
-image: onap/so/mso-cnf-adapter:1.7.1
+repository: nexus3.onap.org:10001
+image: onap/so/mso-cnf-adapter:1.7.11
pullPolicy: Always
db:
userName: so_user
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
index 0612f50..cc8d15b 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
@@ -60,7 +60,8 @@
# Application configuration defaults.
#################################################################
repository: nexus3.onap.org:10001
-image: onap/so/so-etsi-nfvo-ns-lcm:1.7.7
+image: onap/so/so-etsi-nfvo-ns-lcm:1.7.11
+
pullPolicy: Always
aai:
diff --git a/kubernetes/so/components/so-monitoring/values.yaml b/kubernetes/so/components/so-monitoring/values.yaml
index 31ad9d0..a4bf6c3 100644
--- a/kubernetes/so/components/so-monitoring/values.yaml
+++ b/kubernetes/so/components/so-monitoring/values.yaml
@@ -71,7 +71,7 @@
# Application configuration defaults.
#################################################################
repository: nexus3.onap.org:10001
-image: onap/so/so-monitoring:1.7.7
+image: onap/so/so-monitoring:1.7.11
pullPolicy: Always
db:
diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml
index 40a55c6..5b629e8 100755
--- a/kubernetes/so/components/so-nssmf-adapter/values.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml
@@ -79,7 +79,8 @@
# Application configuration defaults.
#################################################################
repository: nexus3.onap.org:10001
-image: onap/so/nssmf-adapter:1.7.10
+image: onap/so/nssmf-adapter:1.7.11
+
pullPolicy: Always
db:
diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml
index 6bddf29..2641201 100755
--- a/kubernetes/so/components/so-oof-adapter/values.yaml
+++ b/kubernetes/so/components/so-oof-adapter/values.yaml
@@ -76,8 +76,10 @@
#################################################################
# Application configuration defaults.
#################################################################
+
repository: nexus3.onap.org:10001
-image: onap/so/so-oof-adapter:1.7.4
+image: onap/so/so-oof-adapter:1.7.11
+
pullPolicy: Always
mso:
diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 129ad59..d41904b 100755
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -61,7 +61,7 @@
#################################################################
# Application configuration defaults.
#################################################################
-image: onap/so/openstack-adapter:1.7.10
+image: onap/so/openstack-adapter:1.7.11
pullPolicy: Always
repository: nexus3.onap.org:10001
diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml
index e221870..8cffdb1 100755
--- a/kubernetes/so/components/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/values.yaml
@@ -62,7 +62,8 @@
# Application configuration defaults.
#################################################################
repository: nexus3.onap.org:10001
-image: onap/so/request-db-adapter:1.7.10
+image: onap/so/request-db-adapter:1.7.11
+
pullPolicy: Always
db:
diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index be3be26..865db79 100755
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -62,7 +62,8 @@
# Application configuration defaults.
#################################################################
repository: nexus3.onap.org:10001
-image: onap/so/sdc-controller:1.7.10
+image: onap/so/sdc-controller:1.7.11
+
pullPolicy: Always
db:
diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index cabd60e..d545fd3 100755
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -61,7 +61,7 @@
# Application configuration defaults.
#################################################################
repository: nexus3.onap.org:10001
-image: onap/so/sdnc-adapter:1.7.10
+image: onap/so/sdnc-adapter:1.7.11
pullPolicy: Always
org:
diff --git a/kubernetes/so/components/so-vfc-adapter/values.yaml b/kubernetes/so/components/so-vfc-adapter/values.yaml
index f88e117..5086077 100755
--- a/kubernetes/so/components/so-vfc-adapter/values.yaml
+++ b/kubernetes/so/components/so-vfc-adapter/values.yaml
@@ -61,7 +61,8 @@
# Application configuration defaults.
#################################################################
repository: nexus3.onap.org:10001
-image: onap/so/vfc-adapter:1.7.10
+image: onap/so/vfc-adapter:1.7.11
+
pullPolicy: Always
db:
diff --git a/kubernetes/so/components/so-vnfm-adapter/values.yaml b/kubernetes/so/components/so-vnfm-adapter/values.yaml
index f8fa7c9..ef41c44 100755
--- a/kubernetes/so/components/so-vnfm-adapter/values.yaml
+++ b/kubernetes/so/components/so-vnfm-adapter/values.yaml
@@ -33,7 +33,8 @@
# Application configuration defaults.
#################################################################
repository: nexus3.onap.org:10001
-image: onap/so/vnfm-adapter:1.7.10
+image: onap/so/vnfm-adapter:1.7.11
+
pullPolicy: Always
aaf:
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index a51f21a..bf540da 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -174,8 +174,9 @@
userName: so_user
adminName: so_admin
+
repository: nexus3.onap.org:10001
-image: onap/so/api-handler-infra:1.7.10
+image: onap/so/api-handler-infra:1.7.11
server:
aaf:
diff --git a/tox.ini b/tox.ini
index 60f93a3..c685a3f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,28 @@
[tox]
minversion = 1.6
envlist =
+ docs,
+ docs-linkcheck,
gitlint,
skipsdist=true
+[doc8]
+ignore-path-errors=docs/helm-search.txt;D001
+
+[testenv:doc8]
+deps = -rdocs/requirements-docs.txt
+commands =
+ doc8 docs/
+
+[testenv:docs]
+deps = -rdocs/requirements-docs.txt
+commands =
+ sphinx-build -W -b html -n -W -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
+
+[testenv:docs-linkcheck]
+deps = -rdocs/requirements-docs.txt
+commands = sphinx-build -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck
+
[testenv:gitlint]
basepython = python3
deps =