From 9ac6bd66af06bfb015a4f903a412b0eadee9e153 Mon Sep 17 00:00:00 2001
From: yatin <ykarel@redhat.com>
Date: Wed, 25 Apr 2018 04:29:27 +0000
Subject: [PATCH] Revert "Alter default http boot path for containerized
 Ironic"

overcloud_prep_images in fs035 is broken with it. It might be affecting other places as well.

This reverts commit b66ce82f8654f708c3de0ba7ae98f7267304442e.

Change-Id: I5f68b0392644fe28c85ff1e2a2a3766b6c897d9e
---
 ...ault_ironic_http_boot-4b1d3769635b829f.yaml |  6 ------
 tripleoclient/constants.py                     |  1 -
 .../v1/overcloud_image/test_overcloud_image.py | 18 ++++++------------
 tripleoclient/v1/overcloud_image.py            |  5 +----
 4 files changed, 7 insertions(+), 23 deletions(-)
 delete 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
deleted file mode 100644
index dbf9520fb..000000000
--- a/releasenotes/notes/default_ironic_http_boot-4b1d3769635b829f.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-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 676b99d90..fee4a9a7a 100644
--- a/tripleoclient/constants.py
+++ b/tripleoclient/constants.py
@@ -42,7 +42,6 @@ UPGRADE_QUEUE = 'upgrade'
 FFWD_UPGRADE_QUEUE = 'ffwdupgrade'
 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 d324ef985..fd5dc49ff 100644
--- a/tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py
+++ b/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)
diff --git a/tripleoclient/v1/overcloud_image.py b/tripleoclient/v1/overcloud_image.py
index 2f18d88be..98f91f002 100644
--- a/tripleoclient/v1/overcloud_image.py
+++ b/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(