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

This reverts commit 9ac6bd66af.

Change-Id: I2867598f717b3126071e77a7826f48f6c7584ce2

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.

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"

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" '

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(