Merge pull request #146 from openstack/stable/victoria

Sync upstream - Stable/victoria

Author: bbezak

.ansible-lint

@@ -1,17 +1,21 @@
+---
 use_default_rules: true
 skip_list:
-# [E701] galaxy_info missing in metadata
+  # [E701] galaxy_info missing in metadata
   - '701'
-# [E602] https://github.com/ansible/ansible-lint/issues/457
+  # [E602] https://github.com/ansible/ansible-lint/issues/457
   - '602'
-# [E301] Commands should not change things if nothing needs doing
-# TODO(mnasiadka): Fix tasks that fail this check in a later iteration
+  # [E301] Commands should not change things if nothing needs doing
+  # TODO(mnasiadka): Fix tasks that fail this check in a later iteration
   - '301'
-# [E503] Tasks that run when changed should likely be handlers
-# TODO(mnasiadka): Rework baremetal role to do handlers instead of when: *.changed
+  # [E503] Tasks that run when changed should likely be handlers
+  # TODO(mnasiadka): Rework baremetal role to do handlers instead of when: *.changed
   - '503'
-# [E106] Role name {} does not match ``^[a-z][a-z0-9_]+$`` pattern
+  # [E106] Role name {} does not match ``^[a-z][a-z0-9_]+$`` pattern
   - '106'
-# [E208] permissions not mentioned
-# FIXME(mnasiadka): Rework file/template to include permissions
+  # [E208] permissions not mentioned
+  # FIXME(mnasiadka): Rework file/template to include permissions
   - '208'
+  # [unnamed-task] All tasks should be named
+  # FIXME(mgoddard): Add names to all tasks
+  - unnamed-task

ansible/action_plugins/merge_configs.py

@@ -46,6 +46,12 @@
     default: None
     required: True
     type: str
+  whitespace:
+    description:
+      - Whether whitespace characters should be used around equal signs
+    default: True
+    required: False
+    type: bool
 author: Sam Yaple
 '''
 
@@ -67,10 +73,11 @@
 
 class OverrideConfigParser(iniparser.BaseParser):
 
-    def __init__(self):
+    def __init__(self, whitespace=True):
         self._cur_sections = collections.OrderedDict()
         self._sections = collections.OrderedDict()
         self._cur_section = None
+        self._whitespace = ' ' if whitespace else ''
 
     def assignment(self, key, value):
         if self._cur_section is None:
@@ -107,12 +114,20 @@ def write(self, fp):
         def write_key_value(key, values):
             for v in values:
                 if not v:
-                    fp.write('{} =\n'.format(key))
+                    fp.write('{key}{ws}=\n'.format(
+                        key=key, ws=self._whitespace))
                 for index, value in enumerate(v):
                     if index == 0:
-                        fp.write('{} = {}\n'.format(key, value))
+                        fp.write('{key}{ws}={ws}{value}\n'.format(
+                            key=key,
+                            ws=self._whitespace,
+                            value=value))
                     else:
-                        fp.write('{}   {}\n'.format(len(key) * ' ', value))
+                        indent_size = len(key) + len(self._whitespace) * 2 + 1
+                        ws_indent = ' ' * indent_size
+                        fp.write('{ws_indent}{value}\n'.format(
+                            ws_indent=ws_indent,
+                            value=value))
 
         def write_section(section):
             for key, values in section.items():
@@ -158,7 +173,8 @@ def run(self, tmp=None, task_vars=None):
         if not isinstance(sources, list):
             sources = [sources]
 
-        config = OverrideConfigParser()
+        config = OverrideConfigParser(
+            whitespace=self._task.args.get('whitespace', True))
 
         for source in sources:
             self.read_config(source, config)
@@ -179,6 +195,7 @@ def run(self, tmp=None, task_vars=None):
 
             new_task = self._task.copy()
             new_task.args.pop('sources', None)
+            new_task.args.pop('whitespace', None)
 
             new_task.args.update(
                 dict(

ansible/roles/cinder/templates/cinder-wsgi.conf.j2

@@ -25,7 +25,7 @@ LogLevel info
     <IfVersion >= 2.4>
       ErrorLogFormat "%{cu}t %M"
     </IfVersion>
-    ErrorLog /var/log/kolla/cinder/cinder-api.log
+    ErrorLog /var/log/kolla/cinder/cinder-api-error.log
     LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
     CustomLog /var/log/kolla/cinder/cinder-api-access.log logformat
 {% if cinder_enable_tls_backend | bool %}

ansible/roles/cinder/templates/cinder.conf.j2

@@ -2,6 +2,9 @@
 debug = {{ cinder_logging_debug }}
 
 log_dir = /var/log/kolla/cinder
+{% if service_name == "cinder-api" %}
+log_file = cinder-api.log
+{% endif %}
 use_forwarded_for = true
 
 # Set use_stderr to False or the logs will also be sent to stderr

ansible/roles/neutron/templates/eswitchd.conf renamed to ansible/roles/neutron/templates/eswitchd.conf.j2

@@ -415,6 +415,7 @@ haproxy_nova_serialconsole_proxy_tunnel_timeout: "10m"
 ####################
 
 nova_logging_debug: "{{ openstack_logging_debug }}"
+nova_libvirt_logging_debug: "{{ nova_logging_debug }}"
 
 openstack_nova_auth: "{{ openstack_auth }}"
 

ansible/roles/nova-cell/defaults/main.yml

@@ -136,6 +136,7 @@
       enabled: "{{ cinder_backend_ceph }}"
   notify:
     - Restart nova-libvirt container
+  no_log: True
 
 - name: Ensuring config directory has correct owner and permission
   become: true

ansible/roles/nova-cell/tasks/external_ceph.yml

@@ -12,7 +12,7 @@ auth_tcp = "none"
 tcp_port = "{{ nova_libvirt_port }}"
 ca_file = ""
 {% endif %}
-{% if nova_logging_debug | bool %}
+{% if nova_libvirt_logging_debug | bool %}
 log_level = 1
 log_outputs = "1:file:/var/log/kolla/libvirt/libvirtd.log"
 {% else %}

ansible/roles/nova-cell/templates/libvirtd.conf.j2

@@ -237,4 +237,4 @@ octavia_amp_network:
     enable_dhcp: yes
 
 # Octavia management network subnet CIDR.
-octavia_amp_network_cidr: 10.0.0.0/24
+octavia_amp_network_cidr: 10.1.0.0/24

ansible/roles/octavia/defaults/main.yml

@@ -5,16 +5,6 @@
   register: timedatectl_status
   changed_when: false
 
-- name: Fail if no (S)NTP service is running
-  fail:
-    msg: >-
-      timedatectl does not see any (S)NTP service running.
-      Please ensure you have (S)NTP client working.
-  when:
-    - "'service: active' not in timedatectl_status.stdout"
-    # Ubuntu Bionic (18.04)
-    - "'service active: yes' not in timedatectl_status.stdout"
-
 - name: Fail if the clock is not synchronized
   fail:
     msg: >-