designate with this option must have passwordless sudo access.
* If you are using a container on an authenticated registry that requires
- login, you may add the three arguments:
-
- #. ``--registry-url <url of registry>``
-
- #. ``--registry-username <username of account on registry>``
+ login, you may add the argument:
- #. ``--registry-password <password of account on registry>``
+ * ``--registry-json <path to json file>``
- OR
+ example contents of JSON file with login info::
- * ``--registry-json <json file with login info>``
+ {"url":"REGISTRY_URL", "username":"REGISTRY_USERNAME", "password":"REGISTRY_PASSWORD"}
Cephadm will attempt to log in to this registry so it can pull your container
and then store the login info in its config database. Other hosts added to
- ceph nfs cluster ls | grep foo
- ceph nfs export ls foo --detailed
- rados -p .nfs --all ls -
- - ceph config get mgr mgr/cephadm/migration_current | grep 4
+ - ceph config get mgr mgr/cephadm/migration_current | grep 5
prepare_ssh(ctx, cli, wait_for_mgr_restart)
if ctx.registry_url and ctx.registry_username and ctx.registry_password:
- cli(['config', 'set', 'mgr', 'mgr/cephadm/registry_url', ctx.registry_url, '--force'])
- cli(['config', 'set', 'mgr', 'mgr/cephadm/registry_username', ctx.registry_username, '--force'])
- cli(['config', 'set', 'mgr', 'mgr/cephadm/registry_password', ctx.registry_password, '--force'])
+ registry_credentials = {'url': ctx.registry_url, 'username': ctx.registry_username, 'password': ctx.registry_password}
+ cli(['config-key', 'set', 'mgr/cephadm/registry_credentials', json.dumps(registry_credentials)])
cli(['config', 'set', 'mgr', 'mgr/cephadm/container_init', str(ctx.container_init), '--force'])
if TYPE_CHECKING:
from .module import CephadmOrchestrator
-LAST_MIGRATION = 4
+LAST_MIGRATION = 5
logger = logging.getLogger(__name__)
if self.migrate_3_4():
self.set(4)
+ if self.mgr.migration_current == 4:
+ if self.migrate_4_5():
+ self.set(5)
+
def migrate_0_1(self) -> bool:
"""
Migration 0 -> 1
)
return True
+ def migrate_4_5(self) -> bool:
+ registry_url = self.mgr.get_module_option('registry_url')
+ registry_username = self.mgr.get_module_option('registry_username')
+ registry_password = self.mgr.get_module_option('registry_password')
+ if registry_url and registry_username and registry_password:
+
+ registry_credentials = {'url': registry_url,
+ 'username': registry_username, 'password': registry_password}
+ self.mgr.set_store('registry_credentials', json.dumps(registry_credentials))
+
+ self.mgr.set_module_option('registry_url', None)
+ self.mgr.check_mon_command({
+ 'prefix': 'config rm',
+ 'who': 'mgr',
+ 'key': 'mgr/cephadm/registry_url',
+ })
+ self.mgr.set_module_option('registry_username', None)
+ self.mgr.check_mon_command({
+ 'prefix': 'config rm',
+ 'who': 'mgr',
+ 'key': 'mgr/cephadm/registry_username',
+ })
+ self.mgr.set_module_option('registry_password', None)
+ self.mgr.check_mon_command({
+ 'prefix': 'config rm',
+ 'who': 'mgr',
+ 'key': 'mgr/cephadm/registry_password',
+ })
+
+ self.mgr.log.info('Done migrating registry login info')
+ return True
+
def queue_migrate_nfs_spec(mgr: "CephadmOrchestrator", spec_dict: Dict[Any, Any]) -> None:
"""
default='*',
desc='PlacementSpec describing on which hosts to manage /etc/ceph/ceph.conf',
),
+ # not used anymore
Option(
'registry_url',
type='str',
default=None,
desc='Custom repository password'
),
+ ####
Option(
'registry_insecure',
type='bool',
if not (url and username and password) and (inbuf is None or len(inbuf) == 0):
return -errno.EINVAL, "", ("Invalid arguments. Please provide arguments <url> <username> <password> "
"or -i <login credentials json file>")
- elif not (url and username and password):
+ elif (url and username and password):
+ registry_json = {'url': url, 'username': username, 'password': password}
+ else:
assert isinstance(inbuf, str)
- login_info = json.loads(inbuf)
- if "url" in login_info and "username" in login_info and "password" in login_info:
- url = login_info["url"]
- username = login_info["username"]
- password = login_info["password"]
- else:
+ registry_json = json.loads(inbuf)
+ if "url" not in registry_json or "username" not in registry_json or "password" not in registry_json:
return -errno.EINVAL, "", ("json provided for custom registry login did not include all necessary fields. "
"Please setup json file as\n"
"{\n"
" \"username\": \"REGISTRY_USERNAME\",\n"
" \"password\": \"REGISTRY_PASSWORD\"\n"
"}\n")
+
# verify login info works by attempting login on random host
host = None
for host_name in self.inventory.keys():
break
if not host:
raise OrchestratorError('no hosts defined')
- r = self.wait_async(CephadmServe(self)._registry_login(host, url, username, password))
+ r = self.wait_async(CephadmServe(self)._registry_login(host, registry_json))
if r is not None:
return 1, '', r
# if logins succeeded, store info
self.log.debug("Host logins successful. Storing login info.")
- self.set_module_option('registry_url', url)
- self.set_module_option('registry_username', username)
- self.set_module_option('registry_password', password)
+ self.set_store('registry_credentials', json.dumps(registry_json))
# distribute new login info to all hosts
self.cache.distribute_new_registry_login_info()
return 0, "registry login scheduled", ''
failures.append(r)
self.mgr.cache.metadata_up_to_date[host] = True
- if self.mgr.cache.host_needs_registry_login(host) and self.mgr.registry_url:
+ if self.mgr.cache.host_needs_registry_login(host) and self.mgr.get_store('registry_credentials'):
self.log.debug(f"Logging `{host}` into custom registry")
- r = self.mgr.wait_async(self._registry_login(host, self.mgr.registry_url,
- self.mgr.registry_username, self.mgr.registry_password))
+ r = self.mgr.wait_async(self._registry_login(
+ host, json.loads(str(self.mgr.get_store('registry_credentials')))))
if r:
bad_hosts.append(r)
daemon_spec.extra_args.append('--allow-ptrace')
if self.mgr.cache.host_needs_registry_login(daemon_spec.host) and self.mgr.registry_url:
- await self._registry_login(daemon_spec.host, self.mgr.registry_url,
- self.mgr.registry_username, self.mgr.registry_password)
+ await self._registry_login(daemon_spec.host, json.loads(str(self.mgr.get_store('registry_credentials'))))
self.log.info('%s daemon %s on %s' % (
'Reconfiguring' if reconfig else 'Deploying',
if not host:
raise OrchestratorError('no hosts defined')
if self.mgr.cache.host_needs_registry_login(host) and self.mgr.registry_url:
- await self._registry_login(host, self.mgr.registry_url,
- self.mgr.registry_username, self.mgr.registry_password)
+ await self._registry_login(host, json.loads(str(self.mgr.get_store('registry_credentials'))))
pullargs: List[str] = []
if self.mgr.registry_insecure:
return r
# function responsible for logging single host into custom registry
- async def _registry_login(self, host: str, url: Optional[str], username: Optional[str], password: Optional[str]) -> Optional[str]:
- self.log.debug(f"Attempting to log host {host} into custom registry @ {url}")
+ async def _registry_login(self, host: str, registry_json: Dict[str, str]) -> Optional[str]:
+ self.log.debug(
+ f"Attempting to log host {host} into custom registry @ {registry_json['url']}")
# want to pass info over stdin rather than through normal list of args
- args_str = json.dumps({
- 'url': url,
- 'username': username,
- 'password': password,
- })
out, err, code = await self._run_cephadm(
host, 'mon', 'registry-login',
- ['--registry-json', '-'], stdin=args_str, error_ok=True)
+ ['--registry-json', '-'], stdin=json.dumps(registry_json), error_ok=True)
if code:
- return f"Host {host} failed to login to {url} as {username} with given password"
+ return f"Host {host} failed to login to {registry_json['url']} as {registry_json['username']} with given password"
return None
async def _deploy_cephadm_binary(self, host: str, addr: Optional[str] = None) -> None:
@mock.patch("cephadm.serve.CephadmServe._run_cephadm")
def test_registry_login(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
def check_registry_credentials(url, username, password):
- assert cephadm_module.get_module_option('registry_url') == url
- assert cephadm_module.get_module_option('registry_username') == username
- assert cephadm_module.get_module_option('registry_password') == password
+ assert json.loads(cephadm_module.get_store('registry_credentials')) == {
+ 'url': url, 'username': username, 'password': password}
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
with with_host(cephadm_module, 'test'):
projects / ceph-ci.git / commitdiff