Merge "Revert "Alter default http boot path for containerized Ironic""

releasenotes/notes/default_ironic_http_boot-4b1d3769635b829f.yaml

@@ -1,6 +0,0 @@
----
-deprecations:
-  - |
-    The default value of `--http-boot` changed from `/httpboot` to
-    `/var/lib/ironic/httpboot` as containerized Ironic services
-    expect.

tripleoclient/constants.py

@@ -43,7 +43,6 @@ 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"

tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py

@@ -256,11 +256,9 @@ class TestUploadOvercloudImage(TestPluginV1):
         self.assertEqual(
             mock_subprocess_call.call_args_list, [
                 mock.call('sudo cp -f "./ironic-python-agent.kernel" '
-                          '"/var/lib/ironic/httpboot/agent.kernel"',
-                          shell=True),
+                          '"/httpboot/agent.kernel"', shell=True),
                 mock.call('sudo cp -f "./ironic-python-agent.initramfs" '
-                          '"/var/lib/ironic/httpboot/agent.ramdisk"',
-                          shell=True)
+                          '"/httpboot/agent.ramdisk"', shell=True)
             ])
 
     @mock.patch('os.path.isfile', autospec=True)
@@ -313,11 +311,9 @@ class TestUploadOvercloudImage(TestPluginV1):
         self.assertEqual(
             mock_subprocess_call.call_args_list, [
                 mock.call('sudo cp -f "./ironic-python-agent.kernel" '
-                          '"/var/lib/ironic/httpboot/agent.kernel"',
-                          shell=True),
+                          '"/httpboot/agent.kernel"', shell=True),
                 mock.call('sudo cp -f "./ironic-python-agent.initramfs" '
-                          '"/var/lib/ironic/httpboot/agent.ramdisk"',
-                          shell=True)
+                          '"/httpboot/agent.ramdisk"', shell=True)
             ])
 
     @mock.patch('os.path.isfile')
@@ -463,11 +459,9 @@ class TestUploadOvercloudImageFull(TestPluginV1):
         self.assertEqual(
             mock_subprocess_call.call_args_list, [
                 mock.call('sudo cp -f "./ironic-python-agent.kernel" '
-                          '"/var/lib/ironic/httpboot/agent.kernel"',
-                          shell=True),
+                          '"/httpboot/agent.kernel"', shell=True),
                 mock.call('sudo cp -f "./ironic-python-agent.initramfs" '
-                          '"/var/lib/ironic/httpboot/agent.ramdisk"',
-                          shell=True)
+                          '"/httpboot/agent.ramdisk"', shell=True)
             ])
 
     @mock.patch('os.path.isfile', autospec=True)

tripleoclient/v1/overcloud_image.py

@@ -28,7 +28,6 @@ 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
 
 
@@ -259,9 +258,7 @@ class UploadOvercloudImage(command.Command):
         )
         parser.add_argument(
             "--http-boot",
-            default=self._get_environment_var(
-                'HTTP_BOOT',
-                constants.IRONIC_HTTP_BOOT_BIND_MOUNT),
+            default=self._get_environment_var('HTTP_BOOT', '/httpboot'),
             help=_("Root directory for the introspection image")
         )
         parser.add_argument(