From 1e2af1aeb31be7168780d2bc053210a94f5fcc55 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Wed, 13 Jun 2018 06:21:44 +0000 Subject: [PATCH] Revert "Revert "Alter default http boot path for containerized Ironic"" This reverts commit 9ac6bd66af06bfb015a4f903a412b0eadee9e153. Change-Id: I2867598f717b3126071e77a7826f48f6c7584ce2 --- ...ult_ironic_http_boot-4b1d3769635b829f.yaml | 6 +++++ tripleoclient/constants.py | 1 + .../overcloud_image/test_overcloud_image.py | 24 +++++++++---------- tripleoclient/v1/overcloud_image.py | 5 +++- 4 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 releasenotes/notes/default_ironic_http_boot-4b1d3769635b829f.yaml diff --git a/releasenotes/notes/default_ironic_http_boot-4b1d3769635b829f.yaml b/releasenotes/notes/default_ironic_http_boot-4b1d3769635b829f.yaml new file mode 100644 index 000000000..dbf9520fb --- /dev/null +++ b/releasenotes/notes/default_ironic_http_boot-4b1d3769635b829f.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - | + The default value of `--http-boot` changed from `/httpboot` to + `/var/lib/ironic/httpboot` as containerized Ironic services + expect. diff --git a/tripleoclient/constants.py b/tripleoclient/constants.py index f5e58ee72..d4b5d4dd0 100644 --- a/tripleoclient/constants.py +++ b/tripleoclient/constants.py @@ -46,6 +46,7 @@ FFWD_UPGRADE_QUEUE = 'ffwdupgrade' CEPH_UPGRADE_QUEUE = 'cephupgrade' STACK_TIMEOUT = 240 +IRONIC_HTTP_BOOT_BIND_MOUNT = '/var/lib/ironic/httpboot' # The default ffwd upgrade ansible playbooks generated from heat stack output FFWD_UPGRADE_PLAYBOOK = "fast_forward_upgrade_playbook.yaml" diff --git a/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py b/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py index 635ab3b95..70db12daf 100644 --- a/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py +++ b/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py @@ -260,9 +260,9 @@ class TestUploadOvercloudImage(TestPluginV1): self.assertEqual(mock_subprocess_call.call_count, 2) mock_subprocess_call.assert_has_calls([ 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" ' - '"/httpboot/agent.ramdisk"', shell=True) + '"/var/lib/ironic/httpboot/agent.ramdisk"', shell=True) ]) @mock.patch('os.path.isfile', autospec=True) @@ -367,9 +367,9 @@ class TestUploadOvercloudImage(TestPluginV1): self.assertEqual(mock_subprocess_call.call_count, 2) mock_subprocess_call.assert_has_calls([ 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" ' - '"/httpboot/agent.ramdisk"', shell=True) + '"/var/lib/ironic/httpboot/agent.ramdisk"', shell=True) ]) @mock.patch('os.path.isfile') @@ -512,9 +512,9 @@ class TestUploadOvercloudImageFull(TestPluginV1): self.assertEqual(mock_subprocess_call.call_count, 2) mock_subprocess_call.assert_has_calls([ 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" ' - '"/httpboot/agent.ramdisk"', shell=True) + '"/var/lib/ironic/httpboot/agent.ramdisk"', shell=True) ]) @mock.patch('os.path.isfile', autospec=True) @@ -562,9 +562,9 @@ class TestUploadOvercloudImageFull(TestPluginV1): self.assertEqual(mock_subprocess_call.call_count, 2) mock_subprocess_call.assert_has_calls([ 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" ' - '"/httpboot/agent.ramdisk"', shell=True) + '"/var/lib/ironic/httpboot/agent.ramdisk"', shell=True) ]) @mock.patch('os.path.isfile', autospec=True) @@ -723,9 +723,9 @@ class TestUploadOvercloudImageFullMultiArch(TestPluginV1): self.assertEqual(mock_subprocess_call.call_count, 4) mock_subprocess_call.assert_has_calls([ 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" ' - '"/httpboot/agent.ramdisk"', shell=True), + '"/var/lib/ironic/httpboot/agent.ramdisk"', shell=True), mock.call('sudo cp -f "./ironic-python-agent.kernel" ' '"/httpboot/ppc64le/agent.kernel"', shell=True), mock.call('sudo cp -f "./ironic-python-agent.initramfs" ' @@ -819,9 +819,9 @@ class TestUploadOvercloudImageFullMultiArch(TestPluginV1): self.assertEqual(mock_subprocess.call_count, 6) mock_subprocess.assert_has_calls([ 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" ' - '"/httpboot/agent.ramdisk"', shell=True), + '"/var/lib/ironic/httpboot/agent.ramdisk"', shell=True), mock.call('sudo cp -f "./ironic-python-agent.kernel" ' '"/httpboot/ppc64le/agent.kernel"', shell=True), mock.call('sudo cp -f "./ironic-python-agent.initramfs" ' diff --git a/tripleoclient/v1/overcloud_image.py b/tripleoclient/v1/overcloud_image.py index 2959e782b..e1377246d 100644 --- a/tripleoclient/v1/overcloud_image.py +++ b/tripleoclient/v1/overcloud_image.py @@ -28,6 +28,7 @@ from prettytable import PrettyTable from tripleo_common.image import build from tripleoclient import command +from tripleoclient import constants from tripleoclient import utils as plugin_utils @@ -258,7 +259,9 @@ class UploadOvercloudImage(command.Command): ) parser.add_argument( "--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") ) parser.add_argument(