Merge "Fix trailing slashes in bind-mounts and linting" into stable/w…

…allaby

deployment/cinder/cinder-common-container-puppet.yaml

@@ -358,7 +358,7 @@ outputs:
             - - 'ro'
           - /lib/modules:/lib/modules:ro
           - /dev:/dev
-          - /run/:/run/
+          - /run:/run
           - /sys:/sys
           - /var/lib/cinder:/var/lib/cinder:z
           - /var/lib/iscsi:/var/lib/iscsi:z
@@ -404,7 +404,7 @@ outputs:
             - - '/var/lib/kolla/config_files/src-ceph'
             - - 'ro'
           - /dev:/dev
-          - /run/:/run/
+          - /run:/run
           - /sys:/sys
           - /lib/modules:/lib/modules:ro
           - /var/lib/cinder:/var/lib/cinder:z

deployment/database/mysql-container-puppet.yaml

@@ -254,7 +254,7 @@ outputs:
           config_image: *mysql_config_image
           volumes:
             list_concat:
-            - - /var/lib/mysql:/var/lib/mysql/:rw
+            - - /var/lib/mysql:/var/lib/mysql:rw
               - /var/log/containers/mysql:/var/log/mariadb
               - /var/lib/config-data/puppet-generated/mysql/root:/root:rw #provides .my.cnf for puppet, changed on password update
             - if:

deployment/deprecated/multipathd-container.yaml

@@ -141,7 +141,7 @@ outputs:
                   - /var/lib/config-data/puppet-generated/multipathd:/var/lib/kolla/config_files/src:ro
                   - /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
                   - /dev:/dev
-                  - /run/:/run/
+                  - /run:/run
                   - /sys:/sys
                   - /lib/modules:/lib/modules:ro
                   - /var/lib/iscsi:/var/lib/iscsi:z

deployment/logging/stdout/barbican-api.yaml

@@ -51,7 +51,7 @@ outputs:
             test: '[ -p /var/log/httpd/error_log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/error_log && mkfifo /var/log/httpd/error_log && while true; do cat /var/log/httpd/error_log; done']
           volumes:
-            - BarbicanApiLogs:/var/log/
+            - BarbicanApiLogs:/var/log
         barbican_api_apache_access_logs:
           start_order: 1
           image: {get_attr: [RoleParametersValue, value, ContainerBarbicanApiImage]}
@@ -62,7 +62,7 @@ outputs:
             test: '[ -p /var/log/httpd/access.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/access.log && mkfifo /var/log/httpd/access.log && while true; do cat /var/log/httpd/access.log; done']
           volumes:
-            - BarbicanApiLogs:/var/log/
+            - BarbicanApiLogs:/var/log
         barbican_api_logs:
           start_order: 2
           image: {get_attr: [RoleParametersValue, value, ContainerBarbicanApiImage]}
@@ -73,11 +73,11 @@ outputs:
             test: '[ -p /var/log/barbican/main.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/barbican && rm -f /var/log/barbican/main.log && mkfifo /var/log/barbican/main.log && while true; do cat /var/log/barbican/main.log; done']
           volumes:
-            - BarbicanApiLogs:/var/log/
+            - BarbicanApiLogs:/var/log
   volumes:
     description: The volumes needed to log to stdout or a sidecar container.
     value:
-      - BarbicanApiLogs:/var/log/
+      - BarbicanApiLogs:/var/log
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value: null

deployment/logging/stdout/haproxy.yaml

@@ -45,13 +45,13 @@ outputs:
           volumes:
             - /var/lib/kolla/config_files/rsyslog_sidecar.json:/var/lib/kolla/config_files/config.json:ro
             - /var/lib/config-data/puppet-generated/rsyslog_sidecar:/var/lib/kolla/config_files/src:ro
-            - HAProxyLogs:/sockets/
+            - HAProxyLogs:/sockets
           environment:
             KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
   volumes:
     description: The volumes needed to log to stdout or a sidecar container.
     value:
-      - HAProxyLogs:/sockets/
+      - HAProxyLogs:/sockets
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value: null

deployment/logging/stdout/heat-api-cfn.yaml

@@ -48,7 +48,7 @@ outputs:
             test: '[ -p /var/log/httpd/error_log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/error_log && mkfifo /var/log/httpd/error_log && while true; do cat /var/log/httpd/error_log; done']
           volumes:
-            - HeatApiCfnLogs:/var/log/
+            - HeatApiCfnLogs:/var/log
         heat_api_cfn_apache_access_logs:
           start_order: 1
           image: {get_attr: [RoleParametersValue, value, ContainerHeatApiCfnImage]}
@@ -59,7 +59,7 @@ outputs:
             test: '[ -p /var/log/httpd/access.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/access.log && mkfifo /var/log/httpd/access.log && while true; do cat /var/log/httpd/access.log; done']
           volumes:
-            - HeatApiCfnLogs:/var/log/
+            - HeatApiCfnLogs:/var/log
         heat_api_cfn_logs:
           start_order: 2
           image: {get_attr: [RoleParametersValue, value, ContainerHeatApiCfnImage]}
@@ -70,11 +70,11 @@ outputs:
             test: '[ -p /var/log/heat/heat_api_cfn.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/heat && rm -f /var/log/heat/heat_api_cfn.log && mkfifo /var/log/heat/heat_api_cfn.log && while true; do cat /var/log/heat/heat_api_cfn.log; done']
           volumes:
-            - HeatApiCfnLogs:/var/log/
+            - HeatApiCfnLogs:/var/log
   volumes:
     description: The volumes needed to log to stdout or a sidecar container.
     value:
-      - HeatApiCfnLogs:/var/log/
+      - HeatApiCfnLogs:/var/log
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value: null

deployment/logging/stdout/heat-api.yaml

@@ -48,7 +48,7 @@ outputs:
             test: '[ -p /var/log/httpd/error_log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/error_log && mkfifo /var/log/httpd/error_log && while true; do cat /var/log/httpd/error_log; done']
           volumes:
-            - HeatApiLogs:/var/log/
+            - HeatApiLogs:/var/log
         heat_api_apache_access_logs:
           start_order: 1
           image: {get_attr: [RoleParametersValue, value, ContainerHeatApiImage]}
@@ -59,7 +59,7 @@ outputs:
             test: '[ -p /var/log/httpd/access.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/access.log && mkfifo /var/log/httpd/access.log && while true; do cat /var/log/httpd/access.log; done']
           volumes:
-            - HeatApiLogs:/var/log/
+            - HeatApiLogs:/var/log
         heat_api_logs:
           start_order: 2
           image: {get_attr: [RoleParametersValue, value, ContainerHeatApiImage]}
@@ -70,11 +70,11 @@ outputs:
             test: '[ -p /var/log/heat/heat_api.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/heat && rm -f /var/log/heat/heat_api.log && mkfifo /var/log/heat/heat_api.log && while true; do cat /var/log/heat/heat_api.log; done']
           volumes:
-            - HeatApiLogs:/var/log/
+            - HeatApiLogs:/var/log
   volumes:
     description: The volumes needed to log to stdout or a sidecar container.
     value:
-      - HeatApiLogs:/var/log/
+      - HeatApiLogs:/var/log
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value: null

deployment/logging/stdout/keystone.yaml

@@ -48,7 +48,7 @@ outputs:
             test: '[ -p /var/log/httpd/error_log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/error_log && mkfifo /var/log/httpd/error_log && while true; do cat /var/log/httpd/error_log; done']
           volumes:
-            - KeystoneLogs:/var/log/
+            - KeystoneLogs:/var/log
         keystone_apache_access_logs:
           start_order: 1
           image: {get_attr: [RoleParametersValue, value, ContainerKeystoneImage]}
@@ -59,7 +59,7 @@ outputs:
             test: '[ -p /var/log/httpd/access.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/access.log && mkfifo /var/log/httpd/access.log && while true; do cat /var/log/httpd/access.log; done']
           volumes:
-            - KeystoneLogs:/var/log/
+            - KeystoneLogs:/var/log
         keystone_logs:
           start_order: 2
           image: {get_attr: [RoleParametersValue, value, ContainerKeystoneImage]}
@@ -70,15 +70,15 @@ outputs:
             test: '[ -p /var/log/keystone/keystone.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/keystone && rm -f /var/log/keystone/keystone.log && mkfifo /var/log/keystone/keystone.log && while true; do cat /var/log/keystone/keystone.log; done']
           volumes:
-            - KeystoneLogs:/var/log/
+            - KeystoneLogs:/var/log
   environment:
     description: Extra environment variables needed for the service to log to stdout.
     value:
       EXTRA_KEYSTONE_MANAGE_ARGS: '--log-dir= --log-file='
   volumes:
     description: The volumes needed to log to stdout or a sidecar container.
     value:
-      - KeystoneLogs:/var/log/
+      - KeystoneLogs:/var/log
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value: null

deployment/logging/stdout/nova-api.yaml

@@ -37,7 +37,7 @@ outputs:
   volumes:
     description: The volumes needed to log to stdout or a sidecar container.
     value:
-      - NovaApiLogs:/var/log/
+      - NovaApiLogs:/var/log
   docker_config:
     description: Extra containers needed for logging to stdout or a sidecar container.
     value:
@@ -52,7 +52,7 @@ outputs:
             test: '[ -p /var/log/httpd/error_log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/error_log && mkfifo /var/log/httpd/error_log && while true; do cat /var/log/httpd/error_log; done']
           volumes:
-            - NovaApiLogs:/var/log/
+            - NovaApiLogs:/var/log
         nova_api_apache_access_logs:
           start_order: 1
           image: {get_attr: [RoleParametersValue, value, ContainerNovaApiImage]}
@@ -63,7 +63,7 @@ outputs:
             test: '[ -p /var/log/httpd/access.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/access.log && mkfifo /var/log/httpd/access.log && while true; do cat /var/log/httpd/access.log; done']
           volumes:
-            - NovaApiLogs:/var/log/
+            - NovaApiLogs:/var/log
         nova_api_logs:
           start_order: 2
           image: {get_attr: [RoleParametersValue, value, ContainerNovaApiImage]}
@@ -74,7 +74,7 @@ outputs:
             test: '[ -p /var/log/nova/nova-api.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/nova && rm -f /var/log/nova/nova-api.log && mkfifo /var/log/nova/nova-api.log && while true; do cat /var/log/nova/nova-api.log; done']
           volumes:
-            - NovaApiLogs:/var/log/
+            - NovaApiLogs:/var/log
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value: null

deployment/logging/stdout/nova-metadata.yaml

@@ -37,7 +37,7 @@ outputs:
   volumes:
     description: The volumes needed to log to stdout or a sidecar container.
     value:
-      - NovaMetadataLogs:/var/log/
+      - NovaMetadataLogs:/var/log
   docker_config:
     description: Extra containers needed for logging to stdout or a sidecar container.
     value:
@@ -52,7 +52,7 @@ outputs:
             test: '[ -p /var/log/httpd/error_log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/error_log && mkfifo /var/log/httpd/error_log && while true; do cat /var/log/httpd/error_log; done']
           volumes:
-            - NovaMetadataLogs:/var/log/
+            - NovaMetadataLogs:/var/log
         nova_metadata_apache_access_logs:
           start_order: 1
           image: {get_attr: [RoleParametersValue, value, ContainerNovaMetadataImage]}
@@ -63,7 +63,7 @@ outputs:
             test: '[ -p /var/log/httpd/access.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/access.log && mkfifo /var/log/httpd/access.log && while true; do cat /var/log/httpd/access.log; done']
           volumes:
-            - NovaMetadataLogs:/var/log/
+            - NovaMetadataLogs:/var/log
         nova_metadata_logs:
           start_order: 2
           image: {get_attr: [RoleParametersValue, value, ContainerNovaMetadataImage]}
@@ -74,7 +74,7 @@ outputs:
             test: '[ -p /var/log/nova/nova-metadata-api.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/nova && rm -f /var/log/nova/nova-metadata-api.log && mkfifo /var/log/nova/nova-metadata-api.log && while true; do cat /var/log/nova/nova-metadata-api.log; done']
           volumes:
-            - NovaMetadataLogs:/var/log/
+            - NovaMetadataLogs:/var/log
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value: null

deployment/logging/stdout/placement-api.yaml

@@ -37,7 +37,7 @@ outputs:
   volumes:
     description: The volumes needed to log to stdout or a sidecar container.
     value:
-      - PlacementLogs:/var/log/
+      - PlacementLogs:/var/log
   docker_config:
     description: Extra containers needed for logging to stdout or a sidecar container.
     value:
@@ -52,7 +52,7 @@ outputs:
             test: '[ -p /var/log/httpd/error_log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/error_log && mkfifo /var/log/httpd/error_log && while true; do cat /var/log/httpd/error_log; done']
           volumes:
-            - PlacementLogs:/var/log/
+            - PlacementLogs:/var/log
         placement_apache_access_logs:
           start_order: 1
           image: {get_attr: [RoleParametersValue, value, ContainerPlacementImage]}
@@ -63,7 +63,7 @@ outputs:
             test: '[ -p /var/log/httpd/access.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd && rm -f /var/log/httpd/access.log && mkfifo /var/log/httpd/access.log && while true; do cat /var/log/httpd/access.log; done']
           volumes:
-            - PlacementLogs:/var/log/
+            - PlacementLogs:/var/log
         placement_logs:
           start_order: 2
           image: {get_attr: [RoleParametersValue, value, ContainerPlacementImage]}
@@ -74,7 +74,7 @@ outputs:
             test: '[ -p /var/log/placement/placement-api.log ]'
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/placement && rm -f /var/log/placement/placement-api.log && mkfifo /var/log/placement/placement-api.log && while true; do cat /var/log/placement/placement-api.log; done']
           volumes:
-            - PlacementLogs:/var/log/
+            - PlacementLogs:/var/log
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value: null

deployment/manila/manila-share-common.yaml

@@ -62,7 +62,7 @@ outputs:
             - - '/var/lib/kolla/config_files/src-ceph'
             - - 'ro'
           - /dev:/dev
-          - /run/:/run/
+          - /run:/run
           - /sys:/sys
           - /lib/modules:/lib/modules:ro
           - /var/lib/manila:/var/lib/manila:z

deployment/metrics/collectd-container-ansible.yaml

@@ -428,7 +428,7 @@ outputs:
                   - /var/lib/containers/storage/overlay-containers:/var/lib/containers/storage/overlay-containers:ro
                   - /var/lib/config-data/ansible-generated/collectd:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/collectd:/var/log/collectd:rw,z
-                  - /var/run/:/var/run:rw
+                  - /var/run:/var/run:rw
                   - /sys/fs/cgroup:/sys/fs/cgroup:ro
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

deployment/neutron/neutron-ovs-agent-container-puppet.yaml

@@ -379,7 +379,7 @@ outputs:
                   -
                     if:
                       - docker_puppet_mount_host
-                      - /usr/share/openstack-puppet/modules/:/usr/share/openstack-puppet/modules/:ro
+                      - /usr/share/openstack-puppet/modules:/usr/share/openstack-puppet/modules:ro
                       - ''
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

deployment/nova/nova-compute-container-puppet.yaml

@@ -1427,7 +1427,7 @@ outputs:
                           - /var/lib/kolla/config_files/nova_compute_wait_for_compute_service.json:/var/lib/kolla/config_files/config.json:ro
                           - /var/lib/config-data/puppet-generated/nova_libvirt:/var/lib/kolla/config_files/src:ro
                           - /var/log/containers/nova:/var/log/nova
-                          - /var/lib/container-config-scripts/:/container-config-scripts/
+                          - /var/lib/container-config-scripts:/container-config-scripts
                     user: nova
                     environment:
                       KOLLA_CONFIG_STRATEGY: COPY_ALWAYS

deployment/rabbitmq/rabbitmq-container-puppet.yaml

@@ -384,7 +384,7 @@ outputs:
           step_config: 'include tripleo::profile::base::rabbitmq'
           config_image: *rabbitmq_config_image
           volumes:
-            - /var/lib/config-data/puppet-generated/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
+            - /var/lib/config-data/puppet-generated/rabbitmq/etc/rabbitmq:/etc/rabbitmq:ro
             - /var/lib/rabbitmq:/var/lib/rabbitmq
       metadata_settings:
         if:

deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml

@@ -277,7 +277,7 @@ outputs:
           step_config: 'include tripleo::profile::base::rabbitmq'
           config_image: *rabbitmq_config_image
           volumes:
-            - /var/lib/config-data/puppet-generated/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
+            - /var/lib/config-data/puppet-generated/rabbitmq/etc/rabbitmq:/etc/rabbitmq:ro
             - /var/lib/rabbitmq:/var/lib/rabbitmq:z
       metadata_settings:
         if:

deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml

@@ -277,7 +277,7 @@ outputs:
           step_config: 'include tripleo::profile::base::rabbitmq'
           config_image: *rabbitmq_config_image
           volumes:
-            - /var/lib/config-data/puppet-generated/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/:ro
+            - /var/lib/config-data/puppet-generated/rabbitmq/etc/rabbitmq:/etc/rabbitmq:ro
             - /var/lib/rabbitmq:/var/lib/rabbitmq:z
       metadata_settings:
         if:

deployment/unbound/unbound-container-ansible.yaml

@@ -179,7 +179,7 @@ outputs:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
-                  - /run/:/run/
+                  - /run:/run
                   - /var/lib/kolla/config_files/unbound.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/log/containers/unbound:/var/log/unbound:z
                   - /var/lib/config-data/ansible-generated/unbound:/var/lib/kolla/config_files/src:ro