Alter default http boot path for containerized Ironic
Containerization is a default choice from now on. Alter the --http-boot path defaults from /httpboot to /var/lib/ironic/httpboot as it is configured via puppet and t-h-t. Change-Id: I9ec403eba10488a51ac40348e76dd47c1b7b9c2b Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
parent
8d26f89ebd
commit
b66ce82f86
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The default value of `--http-boot` changed from `/httpboot` to
|
||||||
|
`/var/lib/ironic/httpboot` as containerized Ironic services
|
||||||
|
expect.
|
@ -42,6 +42,7 @@ UPGRADE_QUEUE = 'upgrade'
|
|||||||
FFWD_UPGRADE_QUEUE = 'ffwdupgrade'
|
FFWD_UPGRADE_QUEUE = 'ffwdupgrade'
|
||||||
STACK_TIMEOUT = 240
|
STACK_TIMEOUT = 240
|
||||||
|
|
||||||
|
IRONIC_HTTP_BOOT_BIND_MOUNT = '/var/lib/ironic/httpboot'
|
||||||
|
|
||||||
# The default ffwd upgrade ansible playbooks generated from heat stack output
|
# The default ffwd upgrade ansible playbooks generated from heat stack output
|
||||||
FFWD_UPGRADE_PLAYBOOK = "fast_forward_upgrade_playbook.yaml"
|
FFWD_UPGRADE_PLAYBOOK = "fast_forward_upgrade_playbook.yaml"
|
||||||
|
@ -256,9 +256,11 @@ class TestUploadOvercloudImage(TestPluginV1):
|
|||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
mock_subprocess_call.call_args_list, [
|
mock_subprocess_call.call_args_list, [
|
||||||
mock.call('sudo cp -f "./ironic-python-agent.kernel" '
|
mock.call('sudo cp -f "./ironic-python-agent.kernel" '
|
||||||
'"/httpboot/agent.kernel"', shell=True),
|
'"/var/lib/ironic/httpboot/agent.kernel"',
|
||||||
|
shell=True),
|
||||||
mock.call('sudo cp -f "./ironic-python-agent.initramfs" '
|
mock.call('sudo cp -f "./ironic-python-agent.initramfs" '
|
||||||
'"/httpboot/agent.ramdisk"', shell=True)
|
'"/var/lib/ironic/httpboot/agent.ramdisk"',
|
||||||
|
shell=True)
|
||||||
])
|
])
|
||||||
|
|
||||||
@mock.patch('os.path.isfile', autospec=True)
|
@mock.patch('os.path.isfile', autospec=True)
|
||||||
@ -311,9 +313,11 @@ class TestUploadOvercloudImage(TestPluginV1):
|
|||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
mock_subprocess_call.call_args_list, [
|
mock_subprocess_call.call_args_list, [
|
||||||
mock.call('sudo cp -f "./ironic-python-agent.kernel" '
|
mock.call('sudo cp -f "./ironic-python-agent.kernel" '
|
||||||
'"/httpboot/agent.kernel"', shell=True),
|
'"/var/lib/ironic/httpboot/agent.kernel"',
|
||||||
|
shell=True),
|
||||||
mock.call('sudo cp -f "./ironic-python-agent.initramfs" '
|
mock.call('sudo cp -f "./ironic-python-agent.initramfs" '
|
||||||
'"/httpboot/agent.ramdisk"', shell=True)
|
'"/var/lib/ironic/httpboot/agent.ramdisk"',
|
||||||
|
shell=True)
|
||||||
])
|
])
|
||||||
|
|
||||||
@mock.patch('os.path.isfile')
|
@mock.patch('os.path.isfile')
|
||||||
@ -459,9 +463,11 @@ class TestUploadOvercloudImageFull(TestPluginV1):
|
|||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
mock_subprocess_call.call_args_list, [
|
mock_subprocess_call.call_args_list, [
|
||||||
mock.call('sudo cp -f "./ironic-python-agent.kernel" '
|
mock.call('sudo cp -f "./ironic-python-agent.kernel" '
|
||||||
'"/httpboot/agent.kernel"', shell=True),
|
'"/var/lib/ironic/httpboot/agent.kernel"',
|
||||||
|
shell=True),
|
||||||
mock.call('sudo cp -f "./ironic-python-agent.initramfs" '
|
mock.call('sudo cp -f "./ironic-python-agent.initramfs" '
|
||||||
'"/httpboot/agent.ramdisk"', shell=True)
|
'"/var/lib/ironic/httpboot/agent.ramdisk"',
|
||||||
|
shell=True)
|
||||||
])
|
])
|
||||||
|
|
||||||
@mock.patch('os.path.isfile', autospec=True)
|
@mock.patch('os.path.isfile', autospec=True)
|
||||||
|
@ -28,6 +28,7 @@ from prettytable import PrettyTable
|
|||||||
from tripleo_common.image import build
|
from tripleo_common.image import build
|
||||||
|
|
||||||
from tripleoclient import command
|
from tripleoclient import command
|
||||||
|
from tripleoclient import constants
|
||||||
from tripleoclient import utils as plugin_utils
|
from tripleoclient import utils as plugin_utils
|
||||||
|
|
||||||
|
|
||||||
@ -258,7 +259,9 @@ class UploadOvercloudImage(command.Command):
|
|||||||
)
|
)
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
"--http-boot",
|
"--http-boot",
|
||||||
default=self._get_environment_var('HTTP_BOOT', '/httpboot'),
|
default=self._get_environment_var(
|
||||||
|
'HTTP_BOOT',
|
||||||
|
constants.IRONIC_HTTP_BOOT_BIND_MOUNT),
|
||||||
help=_("Root directory for the introspection image")
|
help=_("Root directory for the introspection image")
|
||||||
)
|
)
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
|
Loading…
Reference in New Issue
Block a user