openstack
/
trove
Code Issues Proposed changes

Merge "Fix docker start failed in guest-agent"

This commit is contained in:
Zuul 2022-08-13 09:47:08 +00:00 committed by Gerrit Code Review
parent 8ea76a145a 54c2579a35
commit 06773322c5
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
releasenotes/notes/fix-docker-start-failed-160e79b6e5494edd.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fix docker start failed in trove guest-agent when
docker_insecure_registries is not set.

4
trove/common/cfg.py
View File

@ -449,8 +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.ListOpt('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,

2
trove/instance/models.py
View File

@ -1046,7 +1046,7 @@ class BaseInstance(SimpleInstance):
docker_daemon_values["bip"] = CONF.docker_bridge_network_ip
if CONF.docker_insecure_registries:
docker_daemon_values["insecure-registries"] = \
CONF.docker_insecure_registries.split(',')
CONF.docker_insecure_registries
if docker_daemon_values:
files['/etc/docker/daemon.json'] = (

7
trove/tests/unittests/taskmanager/test_models.py
View File

@ -11,6 +11,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import json
import os
from tempfile import NamedTemporaryFile
@ -257,6 +258,8 @@ class FreshInstanceTasksTest(BaseFreshInstanceTasksTest):
cfg.CONF.set_override('guest_config', self.guestconfig)
cfg.CONF.set_override('guest_info', 'guest_info.conf')
cfg.CONF.set_override('injected_config_location', '/etc/trove/conf.d')
cfg.CONF.set_override('docker_insecure_registries',
'127.0.0.1:4000,127.0.0.1:5000')
# execute
files = self.freshinstancetasks.get_injected_files("test", 'test')
@ -268,6 +271,9 @@ class FreshInstanceTasksTest(BaseFreshInstanceTasksTest):
self.assertEqual(
self.guestconfig_content,
files['/etc/trove/conf.d/trove-guestagent.conf'])
deamon_json = json.loads(files.get('/etc/docker/daemon.json'))
self.assertIn('127.0.0.1:4000', deamon_json.get('insecure-registries'))
self.assertIn('127.0.0.1:5000', deamon_json.get('insecure-registries'))
@patch.object(DBInstance, 'get_by')
def test_create_instance_guestconfig_compat(self, patch_get_by):
@ -285,6 +291,7 @@ class FreshInstanceTasksTest(BaseFreshInstanceTasksTest):
self.assertEqual(
self.guestconfig_content,
files['/etc/trove-guestagent.conf'])
self.assertFalse(files.get('/etc/docker/daemon.json'))
def test_create_instance_with_az_kwarg(self):
# execute