diff --git a/releasenotes/notes/undercloud-overcloud-consistent-names-07210c5e1e82ffbc.yaml b/releasenotes/notes/undercloud-overcloud-consistent-names-07210c5e1e82ffbc.yaml new file mode 100644 index 000000000..a63430dc0 --- /dev/null +++ b/releasenotes/notes/undercloud-overcloud-consistent-names-07210c5e1e82ffbc.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + For containerized undercloud deploy, a new option `--local_domain` + allows to override undercloud domain name and endpoints' FQDNs, which + default to 'undercloud'. diff --git a/tripleoclient/v1/undercloud_deploy.py b/tripleoclient/v1/undercloud_deploy.py index 6391da3e1..0c20e0046 100644 --- a/tripleoclient/v1/undercloud_deploy.py +++ b/tripleoclient/v1/undercloud_deploy.py @@ -126,9 +126,9 @@ class DeployUndercloud(command.Command): return pw_file - def _generate_hosts_parameters(self): + def _generate_hosts_parameters(self, parsed_args): hostname = self._get_hostname() - domain = 'undercloud' + domain = parsed_args.local_domain data = { 'CloudName': hostname, @@ -252,7 +252,7 @@ class DeployUndercloud(command.Command): environments.extend(parsed_args.environment_files) with tempfile.NamedTemporaryFile(delete=False) as tmp_env_file: - tmp_env = self._generate_hosts_parameters() + tmp_env = self._generate_hosts_parameters(parsed_args) ip_nw = netaddr.IPNetwork(parsed_args.local_ip) ip = str(ip_nw.ip) @@ -431,6 +431,12 @@ class DeployUndercloud(command.Command): dest='local_ip', help=_('Local IP/CIDR for undercloud traffic. Required.') ) + parser.add_argument( + '--local-domain', metavar='', + dest='local_domain', + default='undercloud', + help=_('Local domain for undercloud and its API endpoints') + ) parser.add_argument( '-k', '--keep-running',