Merge "Add keystone v3 support"
diff --git a/glance/files/default b/glance/files/default
index 7c2d52e..2acfbad 100644
--- a/glance/files/default
+++ b/glance/files/default
@@ -1,4 +1,4 @@
# Generated by Salt.
{% if values.logging.log_appender %}
-DAEMON_ARGS="--log-config-append=/etc/glance/logging/logging-{{ service_name }}.conf"
+DAEMON_ARGS="${DAEMON_ARGS} --log-config-append=/etc/glance/logging/logging-{{ service_name }}.conf"
{% endif %}
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index 7753194..b06af82 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -26,6 +26,15 @@
password: password
region: RegionOne
tenant: service
+ logging:
+ log_appender: false
+ log_handlers:
+ watchedfile:
+ enabled: true
+ fluentd:
+ enabled: false
+ ossyslog:
+ enabled: false
message_queue:
engine: rabbitmq
members:
diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index 94e57aa..a966837 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -25,6 +25,15 @@
region: RegionOne
tenant: service
endpoint_type: internalURL
+ logging:
+ log_appender: false
+ log_handlers:
+ watchedfile:
+ enabled: true
+ fluentd:
+ enabled: false
+ ossyslog:
+ enabled: false
message_queue:
engine: rabbitmq
host: 127.0.0.1
diff --git a/tests/pillar/single_barbican.sls b/tests/pillar/single_barbican.sls
index a54ce12..373a4af 100644
--- a/tests/pillar/single_barbican.sls
+++ b/tests/pillar/single_barbican.sls
@@ -25,6 +25,15 @@
region: RegionOne
tenant: service
endpoint_type: internalURL
+ logging:
+ log_appender: false
+ log_handlers:
+ watchedfile:
+ enabled: true
+ fluentd:
+ enabled: false
+ ossyslog:
+ enabled: false
message_queue:
engine: rabbitmq
host: 127.0.0.1
diff --git a/tests/pillar/single_ceph.sls b/tests/pillar/single_ceph.sls
index 7d6d4e0..a383db3 100644
--- a/tests/pillar/single_ceph.sls
+++ b/tests/pillar/single_ceph.sls
@@ -25,6 +25,15 @@
region: RegionOne
tenant: service
endpoint_type: internalURL
+ logging:
+ log_appender: false
+ log_handlers:
+ watchedfile:
+ enabled: true
+ fluentd:
+ enabled: false
+ ossyslog:
+ enabled: false
message_queue:
engine: rabbitmq
host: 127.0.0.1
diff --git a/tests/pillar/single_image_cache.sls b/tests/pillar/single_image_cache.sls
index 0e1dff8..e9a8288 100644
--- a/tests/pillar/single_image_cache.sls
+++ b/tests/pillar/single_image_cache.sls
@@ -25,6 +25,15 @@
region: RegionOne
tenant: service
endpoint_type: internalURL
+ logging:
+ log_appender: false
+ log_handlers:
+ watchedfile:
+ enabled: true
+ fluentd:
+ enabled: false
+ ossyslog:
+ enabled: false
message_queue:
engine: rabbitmq
host: 127.0.0.1
diff --git a/tests/pillar/single_multiple_backends.sls b/tests/pillar/single_multiple_backends.sls
index 3ca1e4e..8b4fd28 100644
--- a/tests/pillar/single_multiple_backends.sls
+++ b/tests/pillar/single_multiple_backends.sls
@@ -28,6 +28,15 @@
region: RegionOne
tenant: service
endpoint_type: internalURL
+ logging:
+ log_appender: false
+ log_handlers:
+ watchedfile:
+ enabled: true
+ fluentd:
+ enabled: false
+ ossyslog:
+ enabled: false
message_queue:
engine: rabbitmq
host: 127.0.0.1
diff --git a/tests/pillar/single_swift.sls b/tests/pillar/single_swift.sls
index c4ca73b..6cc83e4 100644
--- a/tests/pillar/single_swift.sls
+++ b/tests/pillar/single_swift.sls
@@ -25,6 +25,15 @@
region: RegionOne
tenant: service
endpoint_type: internalURL
+ logging:
+ log_appender: false
+ log_handlers:
+ watchedfile:
+ enabled: true
+ fluentd:
+ enabled: false
+ ossyslog:
+ enabled: false
message_queue:
engine: rabbitmq
host: 127.0.0.1
diff --git a/tests/pillar/single_swift_references.sls b/tests/pillar/single_swift_references.sls
index cdc8797..8c89801 100644
--- a/tests/pillar/single_swift_references.sls
+++ b/tests/pillar/single_swift_references.sls
@@ -25,6 +25,15 @@
region: RegionOne
tenant: service
endpoint_type: internalURL
+ logging:
+ log_appender: false
+ log_handlers:
+ watchedfile:
+ enabled: true
+ fluentd:
+ enabled: false
+ ossyslog:
+ enabled: false
message_queue:
engine: rabbitmq
host: 127.0.0.1