starlingx
/
config
Code Issues Proposed changes

Merge "Incorrect reference to Registry port"

This commit is contained in:
Zuul 2019-07-30 20:28:31 +00:00 committed by Gerrit Code Review
parent 1dc0d8623c c906d244ef
commit 26c3599ba9
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysinv/sysinv/sysinv/sysinv/conductor/manager.py
View File

@ -99,7 +99,6 @@ from sysinv.openstack.common.gettextutils import _
from sysinv.puppet import common as puppet_common
from sysinv.puppet import puppet
from sysinv.helm import helm
from sysinv.helm import common as helm_common
from sysinv.helm import utils as helm_utils
MANAGER_TOPIC = 'sysinv.conductor_manager'
@ -9842,9 +9841,8 @@ class ConductorManager(service.PeriodicService):
config_dict)
# install docker certificate on controllers and workers
registry_full_address = self._get_registry_floating_address() + ":" + helm_common.REGISTRY_PORT
docker_cert_path = os.path.join("/etc/docker/certs.d",
registry_full_address,
constants.DOCKER_REGISTRY_SERVER,
"registry-cert.crt")
personalities = [constants.CONTROLLER,