Merge "Pike: duplicate image_cache params for glance-cache"
diff --git a/README.rst b/README.rst
index a692ba0..2a6206f 100644
--- a/README.rst
+++ b/README.rst
@@ -345,8 +345,9 @@
That is possible to enable per-binary logging.conf with new variables:
* openstack_log_appender - set it to true to enable log_config_append for all OpenStack services;
* openstack_fluentd_handler_enabled - set to true to enable FluentHandler for all Openstack services.
+ * openstack_ossyslog_handler_enabled - set to true to enable OSSysLogHandler for all Openstack services.
-Only WatchedFileHandler and FluentHandler are available.
+Only WatchedFileHandler, OSSysLogHandler and FluentHandler are available.
Also it is possible to configure this with pillar:
@@ -361,6 +362,8 @@
enabled: true
fluentd:
enabled: true
+ ossyslog:
+ enabled: true
Usage
=====
diff --git a/glance/files/grafana_dashboards/glance_prometheus.json b/glance/files/grafana_dashboards/glance_prometheus.json
index fe3ad38..0ff8930 100755
--- a/glance/files/grafana_dashboards/glance_prometheus.json
+++ b/glance/files/grafana_dashboards/glance_prometheus.json
@@ -1461,7 +1461,7 @@
"sharedCrosshair": true,
"style": "dark",
"tags": [
- "glance"
+ "openstack"
],
"templating": {
"list": [
diff --git a/glance/files/grafana_dashboards/glance_prometheus_fluentd.json b/glance/files/grafana_dashboards/glance_prometheus_fluentd.json
index b37cc23..c7ab77b 100755
--- a/glance/files/grafana_dashboards/glance_prometheus_fluentd.json
+++ b/glance/files/grafana_dashboards/glance_prometheus_fluentd.json
@@ -1461,7 +1461,7 @@
"sharedCrosshair": true,
"style": "dark",
"tags": [
- "glance"
+ "openstack"
],
"templating": {
"list": [
diff --git a/glance/files/logging.conf b/glance/files/logging.conf
index bc81c09..3854e7f 100644
--- a/glance/files/logging.conf
+++ b/glance/files/logging.conf
@@ -11,7 +11,7 @@
keys = {{ log_handlers | join(", ") }}
[formatters]
-keys = context, default, fluentd
+keys = context, default{% if values.logging.log_handlers.get('fluentd', {}).get('enabled', False) %}, fluentd{% endif %}
[logger_root]
level = WARNING
@@ -65,6 +65,14 @@
formatter = context
{%- endif %}
+{% if values.logging.log_handlers.get('ossyslog', {}).get('enabled', False) -%}
+{%- set ossyslog_args = values.logging.log_handlers.ossyslog.get('args', {}) -%}
+[handler_ossyslog]
+class = oslo_log.handlers.OSSysLogHandler
+args = ( handlers.SysLogHandler.{{ ossyslog_args.get('facility', 'LOG_USER') }}, )
+formatter = context
+{%- endif %}
+
[formatter_context]
class = oslo_log.formatters.ContextFormatter
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 857f2e9..076f639 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -7,6 +7,7 @@
keystone_glance_endpoint_type: internalURL
openstack_log_appender: false
openstack_fluentd_handler_enabled: false
+ openstack_ossyslog_handler_enabled: false
glance:
server:
enabled: true
@@ -43,6 +44,8 @@
enabled: true
fluentd:
enabled: ${_param:openstack_fluentd_handler_enabled}
+ ossyslog:
+ enabled: ${_param:openstack_ossyslog_handler_enabled}
message_queue:
engine: rabbitmq
host: ${_param:cluster_vip_address}
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index a0858c3..30bfed8 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -7,6 +7,7 @@
keystone_glance_endpoint_type: internalURL
openstack_log_appender: false
openstack_fluentd_handler_enabled: false
+ openstack_ossyslog_handler_enabled: false
glance:
server:
enabled: true
@@ -41,6 +42,8 @@
enabled: true
fluentd:
enabled: ${_param:openstack_fluentd_handler_enabled}
+ ossyslog:
+ enabled: ${_param:openstack_ossyslog_handler_enabled}
message_queue:
engine: rabbitmq
host: ${_param:single_address}
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index db89554..a600206 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -37,7 +37,7 @@
log_info "Setting up Python virtualenv"
virtualenv $VENV_DIR
source ${VENV_DIR}/bin/activate
- pip install salt${PIP_SALT_VERSION}
+ python -m pip install salt${PIP_SALT_VERSION}
}
setup_pillar() {
@@ -114,7 +114,7 @@
salt_run() {
[ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
- salt-call ${SALT_OPTS} $*
+ python $(which salt-call) ${SALT_OPTS} $*
}
prepare() {