Merge "Do not log errors on non-existing container"

[apex-tripleo-heat-templates.git] / docker / services / swift-storage.yaml

diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index 301ef69..cccddb4 100644 (file)
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -115,7 +115,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_account_auditor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -131,7 +130,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_account_reaper.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -146,7 +144,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_account_replicator.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -161,7 +158,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_account_server.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -179,7 +175,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_container_auditor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -194,7 +189,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_container_replicator.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -209,7 +203,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_container_updater.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -224,7 +217,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_container_server.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -242,7 +234,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_object_auditor.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -257,7 +248,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_object_expirer.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -272,7 +262,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_object_replicator.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -287,7 +276,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_object_updater.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
@@ -302,7 +290,6 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/swift_object_server.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift/:/var/lib/kolla/config_files/src:ro
               - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro