Browse code

Merge "cinder: configure backup_swift_url in subnodes"

Zuul authored on 2018/08/06 22:51:46
Showing 1 changed files
... ...
@@ -268,7 +268,12 @@ function configure_cinder {
268 268
         configure_cinder_image_volume_cache
269 269
     fi
270 270
 
271
-    if is_service_enabled swift; then
271
+    if is_service_enabled c-bak; then
272
+        # NOTE(mriedem): The default backup driver uses swift and if we're
273
+        # on a subnode we might not know if swift is enabled, but chances are
274
+        # good that it is on the controller so configure the backup service
275
+        # to use it. If we want to configure the backup service to use
276
+        # a non-swift driver, we'll likely need environment variables.
272 277
         iniset $CINDER_CONF DEFAULT backup_swift_url "$SWIFT_SERVICE_PROTOCOL://$SERVICE_HOST:$SWIFT_DEFAULT_BIND_PORT/v1/AUTH_"
273 278
     fi
274 279