diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-10-08 20:35:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-08 20:35:17 +0000 |
| commit | e1c125496077fe9b693c80ad0ab9e345f1d2f438 (patch) | |
| tree | 2a2d995dd60081d089973ed44e1a61252823915e /apex | |
| parent | 0a78f21e06900fdacc51087c8c764027b750a95f (diff) | |
| parent | 99b41501961f3da0775e102d69f8018c89d10988 (diff) | |
Merge "Adding support for containerized undercloud"
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/tests/test_apex_undercloud.py | 4 | ||||
| -rw-r--r-- | apex/undercloud/undercloud.py | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/apex/tests/test_apex_undercloud.py b/apex/tests/test_apex_undercloud.py index 5c33bf03..2d0dffcb 100644 --- a/apex/tests/test_apex_undercloud.py +++ b/apex/tests/test_apex_undercloud.py @@ -276,7 +276,8 @@ class TestUndercloud(unittest.TestCase): {'--upload': '/root/.ssh/id_rsa.pub:/root/.ssh/authorized_keys'}, {'--run-command': 'chmod 600 /root/.ssh/authorized_keys'}, - {'--run-command': 'restorecon /root/.ssh/authorized_keys'}, + {'--run-command': 'restorecon ' + '-R -v /root/.ssh'}, {'--run-command': 'cp /root/.ssh/authorized_keys /home/stack/.ssh/'}, {'--run-command': @@ -293,6 +294,7 @@ class TestUndercloud(unittest.TestCase): ns_dict = { 'apex': MagicMock(), 'dns-domain': 'dns', + 'ntp': 'pool.ntp.org', 'networks': {'admin': {'cidr': ipaddress.ip_network('192.0.2.0/24'), 'installer_vm': {'ip': '192.0.2.1', 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'] = [ |