From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Tue, 14 Apr 2020 06:39:46 +0000 (+0000)
Subject: Merge "dcae version revision"
X-Git-Tag: 6.0.0~158
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a118a66686777aa8b78cf00d3af88973a9351574;hp=9bca3e6c6fff2f9afe31902d1c4c4dc922774840;p=oom.git

Merge "dcae version revision"
---

diff --git a/docs/oom_cloud_setup_guide.rst b/docs/oom_cloud_setup_guide.rst
index e3790f88db..9b3e53467c 100644
--- a/docs/oom_cloud_setup_guide.rst
+++ b/docs/oom_cloud_setup_guide.rst
@@ -2,6 +2,7 @@
 .. International License.
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright 2019 Amdocs, Bell Canada
+.. _oom_cloud_setup_guide:
 
 .. Links
 .. _Microsoft Azure: https://wiki.onap.org/display/DW/Cloud+Native+Deployment#CloudNativeDeployment-MicrosoftAzure
diff --git a/docs/oom_project_description.rst b/docs/oom_project_description.rst
index 7903b709d8..b8c18dc93f 100644
--- a/docs/oom_project_description.rst
+++ b/docs/oom_project_description.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
+.. _oom_project_description:
 
 ONAP Operations Manager Project
 ###############################
diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index 2607805015..928b74d390 100644
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -2,7 +2,7 @@
 .. Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright 2019 Amdocs, Bell Canada
-
+.. _oom_quickstart_guide:
 .. _quick-start-label:
 
 OOM Quick Start Guide
diff --git a/docs/oom_user_guide.rst b/docs/oom_user_guide.rst
index 4cc1ab6d22..b0c5d6e49e 100644
--- a/docs/oom_user_guide.rst
+++ b/docs/oom_user_guide.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
+.. _oom_user_guide:
 
 .. Links
 .. _Curated applications for Kubernetes: https://github.com/kubernetes/charts
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 782160b67b..ae859cfaa0 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
@@ -85,7 +85,7 @@ spec:
           image: "{{ include "common.repository" . }}/{{ .Values.global.image.optf_has }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           command: ["/bin/bash","-c"]
-          args: ["nginx && /usr/local/bin/uwsgi -s /run/conductor/uwsgi.sock --chmod-socket=777 --wsgi-file /etc/nginx/conductor.wsgi --callable application --set port=80 --die-on-term --exit-on-reload --logto /opt/conductor-uwsgi.log --pidfile /run/conductor/conductor-uwsgi.pid --enable-threads --workers 6 --master --vacuum --single-interpreter --socket-timeout 10 --max-worker-lifetime 300 --max-requests 100 --no-defer-accept --logfile-chown --logfile-chmod 664 --protocol=uwsgi --socket 0.0.0.0:80"]
+          args: ["nginx && /usr/local/bin/uwsgi -s /run/conductor/uwsgi.sock --chmod-socket=777 --wsgi-file /etc/nginx/conductor.wsgi --callable application --set port=80 --die-on-term --exit-on-reload --logto /var/log/conductor-uwsgi.log --pidfile /run/conductor/conductor-uwsgi.pid --enable-threads --workers 6 --master --vacuum --single-interpreter --socket-timeout 10 --max-worker-lifetime 300 --max-requests 100 --no-defer-accept --logfile-chown --logfile-chmod 664 --protocol=uwsgi --socket 0.0.0.0:80"]
           ports:
           - containerPort: {{ .Values.liveness.periodSeconds }}
           # disable liveness probe when breakpoints set in debugger
diff --git a/kubernetes/oof/charts/oof-has/resources/config/log.conf b/kubernetes/oof/charts/oof-has/resources/config/log.conf
index 0fb963e674..9e4e29a1ba 100755
--- a/kubernetes/oof/charts/oof-has/resources/config/log.conf
+++ b/kubernetes/oof/charts/oof-has/resources/config/log.conf
@@ -33,31 +33,31 @@ args=(sys.stdout,)
 class=handlers.TimedRotatingFileHandler
 level=NOTSET
 formatter=generic
-args=('application.log','midnight', 1, 10)
+args=('/var/log/application.log','midnight', 1, 10)
 
 [handler_audithand]
 class=handlers.TimedRotatingFileHandler
 level=INFO
 formatter=audit
-args=('audit.log', 'midnight', 1, 10)
+args=('/var/log/audit.log', 'midnight', 1, 10)
 
 [handler_metrichand]
 class=handlers.TimedRotatingFileHandler
 level=INFO
 formatter=metric
-args=('metric.log','midnight', 1, 10)
+args=('/var/log/metric.log','midnight', 1, 10)
 
 [handler_errhand]
 class=handlers.TimedRotatingFileHandler
 level=ERROR
 formatter=error
-args=('error.log','midnight', 1, 10)
+args=('/var/log/error.log','midnight', 1, 10)
 
 [handler_debughand]
 class=handlers.TimedRotatingFileHandler
 level=DEBUG
 formatter=generic
-args=('debug.log','midnight', 1, 10)
+args=('/var/log/debug.log','midnight', 1, 10)
 
 [formatters]
 keys=generic,audit,metric,error