x
/
ramdisk-func-test
Code Issues Proposed changes

Using predefined ssh key pair to access vm 

Change-Id: I24b4c5d4846bf5f0bf7e25453cb8fca8f116c0cf
This commit is contained in:
Dmitry Bogun 2016-12-12 18:51:12 +02:00 committed by Andrii Ostapenko
parent 5bb7d8fd3c
commit c912791aa1
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ramdisk_func_test/environment.py
View File

@ -49,7 +49,7 @@ CONF.register_opts([
default='initramfs',
help='Name of ramdisk image'),
cfg.StrOpt('ramdisk_key',
default='fuel_key',
default='bareon_key',
help='Name of private ssh key to access ramdisk'),
# NOTE(oberezovskyi): path from Centos 7 taken as default
cfg.StrOpt('pxelinux',
@ -144,7 +144,7 @@ class Environment(object):
utils.copy_file(os.path.join(img_build, CONF.ramdisk), tftp_root)
def add_pxe_config_for_current_node(self):
LOG.info("Setting up PXE configuration file fo node {0}".format(
LOG.info("Setting up PXE configuration file for node {0}".format(
self.node.name))
tftp_root = self.network.tftp_root
@ -154,9 +154,8 @@ class Environment(object):
kernel=CONF.kernel,
ramdisk=CONF.ramdisk,
deployment_id=self.node.name,
api_url="http://{0}:{1}".format(self.network.address,
CONF.stub_webserver_port)
)
network=self.network,
stub_server_port=CONF.stub_webserver_port)
pxe_path = os.path.join(tftp_root, "pxelinux.cfg")
utils.ensure_tree(pxe_path)

4
ramdisk_func_test/templates/bareon_config.template
View File

@ -1,5 +1,5 @@
default deploy
label deploy
kernel {{ kernel }}
append initrd={{ ramdisk }} rootdelay=15 text nofb nomodeset vga=normal deployment_id={{ deployment_id }} api-url={{ api_url }}
ipappend 2
append initrd={{ ramdisk }} deployment_id={{ deployment_id }} api-url=http://{{ network.address }}:{{ stub_server_port }} rootdelay=15 text nofb nomodeset vga=normal
ipappend 2