Merge "Bring in SFC support"
diff --git a/_states/neutronv2.py b/_states/neutronv2.py
index 0ab8248..b4fd30d 100644
--- a/_states/neutronv2.py
+++ b/_states/neutronv2.py
@@ -43,7 +43,7 @@
try:
method_name = '{}_update'.format(resource)
resp = _neutronv2_call(
- method_name, name=name, cloud_name=cloud_name, **to_update
+ method_name, name, cloud_name=cloud_name, **to_update
)
except Exception as e:
log.exception('Neutron {0} update failed with {1}'.format(resource, e))
diff --git a/neutron/gateway.sls b/neutron/gateway.sls
index c5650ca..9c67327 100644
--- a/neutron/gateway.sls
+++ b/neutron/gateway.sls
@@ -90,6 +90,25 @@
- name: python-fluent-logger
{%- endif %}
+neutron_gateway_logging_conf:
+ file.managed:
+ - name: /etc/neutron/logging.conf
+ - source: salt://oslo_templates/files/logging/_logging.conf
+ - template: jinja
+ - makedirs: True
+ - defaults:
+ service_name: neutron
+ _data: {{ gateway.logging }}
+ - user: neutron
+ - group: neutron
+ - require:
+ - pkg: neutron_gateway_packages
+{%- if gateway.logging.log_handlers.get('fluentd', {}).get('enabled', False) %}
+ - pkg: neutron_gateway_fluentd_logger_package
+{%- endif %}
+ - watch_in:
+ - service: neutron_gateway_services
+
{% for service_name in gateway.services %}
{{ service_name }}_logging_conf:
file.managed: