Rename variables
* Change default path of private key * Rename config group * Rename 'fuel-agent' to 'bareon' Change-Id: Ibaf29ea769bcc9408d41ae94dd6bf9d507fe0564
This commit is contained in:
parent
9133da6104
commit
1d24cf4552
@ -98,7 +98,7 @@ agent_opts = [
|
||||
default=20),
|
||||
cfg.StrOpt('agent_data_driver',
|
||||
default='ironic',
|
||||
help='Fuel-agent data driver'),
|
||||
help='Bareon data driver'),
|
||||
]
|
||||
|
||||
CONF = cfg.CONF
|
||||
@ -114,7 +114,7 @@ OTHER_PROPERTIES = {
|
||||
'mounted at boot time.'),
|
||||
'bareon_username': _('SSH username; default is "root" Optional.'),
|
||||
'bareon_key_filename': _('Name of SSH private key file; default is '
|
||||
'"/etc/ironic/fuel_key". Optional.'),
|
||||
'"/etc/ironic/bareon_key". Optional.'),
|
||||
'bareon_ssh_port': _('SSH port; default is 22. Optional.'),
|
||||
'bareon_deploy_script': _('path to bareon executable entry point; '
|
||||
'default is "provision_ironic" Optional.'),
|
||||
@ -588,7 +588,7 @@ class BareonDeploy(base.DeployInterface):
|
||||
|
||||
d_info['username'] = info.get('bareon_username', 'root')
|
||||
d_info['key_filename'] = info.get('bareon_key_filename',
|
||||
'/etc/ironic/fuel_key')
|
||||
'/etc/ironic/bareon_key')
|
||||
|
||||
if not os.path.isfile(d_info['key_filename']):
|
||||
error_msgs.append(_("SSH key file %s not found.") %
|
||||
@ -1099,7 +1099,7 @@ class DeploymentConfigValidator(object):
|
||||
'deployment config validation'.format(self._min_version))
|
||||
except RuntimeError as e:
|
||||
LOG.warning(
|
||||
'Fail to load fuel-agent data-driver "%s": %s',
|
||||
'Fail to load bareon data-driver "%s": %s',
|
||||
self.driver_name, e)
|
||||
return
|
||||
|
||||
|
@ -53,7 +53,7 @@ def node_data_driver(node):
|
||||
try:
|
||||
driver = node.instance_info['data_driver']
|
||||
except KeyError:
|
||||
driver = CONF.fuel.agent_data_driver
|
||||
driver = CONF.bareon.agent_data_driver
|
||||
return driver
|
||||
|
||||
|
||||
|
@ -15,4 +15,4 @@
|
||||
|
||||
import pbr.version
|
||||
|
||||
version_info = pbr.version.VersionInfo('fuel-agent')
|
||||
version_info = pbr.version.VersionInfo('bareon')
|
||||
|
@ -51,7 +51,7 @@ The ``bare_swift_ipmi`` driver used as example.
|
||||
|
||||
$ KERNEL=<UUID_of_kernel_image_in_Glance>
|
||||
$ INITRD=<UUID_of_initrd_image_in_Glance>
|
||||
$ PRIVATE_KEY_PATH=/tmp/rft_image_build/fuel_key
|
||||
$ PRIVATE_KEY_PATH=/tmp/rft_image_build/bareon_key
|
||||
$ ironic node-update <node uuid> add driver_info/deploy_kernel=$KERNEL \
|
||||
driver_info/deploy_ramdisk=$INITRD \
|
||||
driver_info/bareon_key_filename=$PRIVATE_KEY_PATH
|
||||
|
Loading…
x
Reference in New Issue
Block a user