diff options
| author | Zuul <zuul@review.opendev.org> | 2022-07-20 12:20:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-07-20 12:20:18 +0000 |
| commit | 6039500738b9db364b8cb42f07103e0b17aecfc1 (patch) | |
| tree | 34537aaf4f26bf721a54e17d8c1850a44c2b0fdc | |
| parent | 876de8ee5a407acf45e6df8fb029693de0bc3535 (diff) | |
| parent | 893c4b7aad773d08ac578bfd403df7fe28bbe4a5 (diff) | |
| download | trove-6039500738b9db364b8cb42f07103e0b17aecfc1.tar.gz | |
Merge "Adds a configuration to use a local docker registry"
| -rw-r--r-- | trove/common/cfg.py | 2 | ||||
| -rw-r--r-- | trove/instance/models.py | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/trove/common/cfg.py b/trove/common/cfg.py index 6270d96d..58dd3af6 100644 --- a/trove/common/cfg.py +++ b/trove/common/cfg.py @@ -449,6 +449,8 @@ common_opts = [ 'the datastores supported by Trove.'), cfg.StrOpt('docker_bridge_network_ip', default=None, help='Docker bridge network IP.'), + cfg.StrOpt('docker_insecure_registries', default=[], + help='Docker insecure registries for image development.'), cfg.StrOpt('template_path', default='/etc/trove/templates/', help='Path which leads to datastore templates.'), cfg.BoolOpt('sql_query_logging', default=False, diff --git a/trove/instance/models.py b/trove/instance/models.py index 28570445..8469f174 100644 --- a/trove/instance/models.py +++ b/trove/instance/models.py @@ -1044,6 +1044,9 @@ class BaseInstance(SimpleInstance): # default range(172.17.0.0/16) of bridge network if CONF.docker_bridge_network_ip: docker_daemon_values["bip"] = CONF.docker_bridge_network_ip + if CONF.docker_insecure_registries: + docker_daemon_values["insecure-registries"] = \ + CONF.docker_insecure_registries.split(',') if docker_daemon_values: files['/etc/docker/daemon.json'] = ( |