diff options
| author |   Ricardo Noriega <rnoriega@redhat.com> | 2018-09-18 16:11:15 +0200 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2018-10-08 14:55:55 -0400 |
| commit | 99b41501961f3da0775e102d69f8018c89d10988 (patch) | |
| tree | 6c5d119d29628a39a74b9d5231acad49dbac5d64 /apex/undercloud | |
| parent | 82bf9da27ea0c973068720d440e3391084e8a9d9 (diff) | |
Adding support for containerized undercloud
Master code only supports containerized undercloud now, so this
migration is needed.
- Containerized services in undercloud
We can still apply patches to THT and other non-docker services, but
we will need to add support for patching openstack services on
undercloud.
Change-Id: I1ca4c6108f144efef7b5889503af265ef0fff8b2
Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/undercloud')
| -rw-r--r-- | apex/undercloud/undercloud.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/apex/undercloud/undercloud.py b/apex/undercloud/undercloud.py index 56087695..1658801d 100644 --- a/apex/undercloud/undercloud.py +++ b/apex/undercloud/undercloud.py @@ -199,7 +199,7 @@ class Undercloud: '/root/.ssh/id_rsa.pub:/root/.ssh/authorized_keys'}) run_cmds = [ 'chmod 600 /root/.ssh/authorized_keys', - 'restorecon /root/.ssh/authorized_keys', + 'restorecon -R -v /root/.ssh', 'cp /root/.ssh/authorized_keys /home/stack/.ssh/', 'chown stack:stack /home/stack/.ssh/authorized_keys', 'chmod 600 /home/stack/.ssh/authorized_keys' @@ -234,12 +234,16 @@ class Undercloud: "undercloud_hostname undercloud.{}".format(ns['dns-domain']), "local_ip {}/{}".format(str(ns_admin['installer_vm']['ip']), str(ns_admin['cidr']).split('/')[1]), - "network_gateway {}".format(str(ns_admin['installer_vm']['ip'])), - "network_cidr {}".format(str(ns_admin['cidr'])), + "generate_service_certificate false", + "undercloud_ntp_servers {}".format(str(ns['ntp'][0])) + ] + + config['undercloud_network_config'] = [ + "gateway {}".format(str(ns_admin['installer_vm']['ip'])), + "cidr {}".format(str(ns_admin['cidr'])), "dhcp_start {}".format(str(ns_admin['dhcp_range'][0])), "dhcp_end {}".format(str(ns_admin['dhcp_range'][1])), "inspection_iprange {}".format(','.join(intro_range)), - "generate_service_certificate false" ] config['ironic_config'] = [ |