Merge remote-tracking branch 'upstream/master' into python-registry-v2

config.py

@@ -20,7 +20,7 @@ CLIENT_WHITELIST = ['SERVER_HOSTNAME', 'PREFERRED_URL_SCHEME', 'MIXPANEL_KEY',
                     'STRIPE_PUBLISHABLE_KEY', 'ENTERPRISE_LOGO_URL', 'SENTRY_PUBLIC_DSN',
                     'AUTHENTICATION_TYPE', 'REGISTRY_TITLE', 'REGISTRY_TITLE_SHORT',
                     'CONTACT_INFO', 'AVATAR_KIND', 'LOCAL_OAUTH_HANDLER', 'DOCUMENTATION_LOCATION',
-                    'DOCUMENTATION_METADATA']
+                    'DOCUMENTATION_METADATA', 'SETUP_COMPLETE']
 
 
 def frontend_visible_config(config_dict):
@@ -129,6 +129,7 @@ class DefaultConfig(object):
   NOTIFICATION_QUEUE_NAME = 'notification'
   DIFFS_QUEUE_NAME = 'imagediff'
   DOCKERFILE_BUILD_QUEUE_NAME = 'dockerfilebuild'
+  REPLICATION_QUEUE_NAME = 'imagestoragereplication'
 
   # Super user config. Note: This MUST BE an empty list for the default config.
   SUPER_USERS = []
@@ -179,6 +180,9 @@ class DefaultConfig(object):
   # basic auth.
   FEATURE_REQUIRE_ENCRYPTED_BASIC_AUTH = False
 
+  # Feature Flag: Whether to automatically replicate between storage engines.
+  FEATURE_STORAGE_REPLICATION = False
+
   BUILD_MANAGER = ('enterprise', {})
 
   DISTRIBUTED_STORAGE_CONFIG = {
@@ -187,6 +191,7 @@ class DefaultConfig(object):
   }
 
   DISTRIBUTED_STORAGE_PREFERENCE = ['local_us']
+  DISTRIBUTED_STORAGE_DEFAULT_LOCATIONS = ['local_us']
 
   # Health checker.
   HEALTH_CHECKER = ('LocalHealthCheck', {})