diff --git a/ironic_python_agent/inspector.py b/ironic_python_agent/inspector.py
index 7d9dc0733..485795aa1 100644
--- a/ironic_python_agent/inspector.py
+++ b/ironic_python_agent/inspector.py
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from http import client as http_client
 import json
 import os
 import time
@@ -165,7 +166,8 @@ def call_inspector(data, failures):
 else:
 break
 
- if inspector_resp.status_code>= 500:
+ if (inspector_resp.status_code>= 500
+ or inspector_resp.status_code == http_client.CONFLICT):
 raise requests.exceptions.HTTPError(response=inspector_resp)
 
 return inspector_resp
diff --git a/ironic_python_agent/tests/unit/test_inspector.py b/ironic_python_agent/tests/unit/test_inspector.py
index 5f05fed79..a0611c9af 100644
--- a/ironic_python_agent/tests/unit/test_inspector.py
+++ b/ironic_python_agent/tests/unit/test_inspector.py
@@ -236,7 +236,7 @@ class TestCallInspector(base.IronicAgentTest):
 @mock.patch.object(inspector, '_RETRY_ATTEMPTS', 3)
 def test_inspector_retries_on_50X_error(self, mock_post):
 mock_post.side_effect = [mock.Mock(status_code=500),
- mock.Mock(status_code=501),
+ mock.Mock(status_code=409),
 mock.Mock(status_code=502)]
 failures = utils.AccumulatedFailures()
 data = collections.OrderedDict(data=42)
@@ -247,15 +247,16 @@ class TestCallInspector(base.IronicAgentTest):
 
 @mock.patch.object(inspector, '_RETRY_WAIT', 0.01)
 @mock.patch.object(inspector, '_RETRY_WAIT_MAX', 1)
- @mock.patch.object(inspector, '_RETRY_ATTEMPTS', 2)
+ @mock.patch.object(inspector, '_RETRY_ATTEMPTS', 3)
 def test_inspector_retry_on_50X_and_succeed(self, mock_post):
 mock_post.side_effect = [mock.Mock(status_code=503),
+ mock.Mock(status_code=409),
 mock.Mock(status_code=200)]
 
 failures = utils.AccumulatedFailures()
 data = collections.OrderedDict(data=42)
 inspector.call_inspector(data, failures)
- self.assertEqual(2, mock_post.call_count)
+ self.assertEqual(3, mock_post.call_count)
 mock_post.assert_called_with('url',
 cert=None, verify=True,
 data='{"data": 42, "error": null}',
diff --git a/releasenotes/notes/inspection-409-69d5bd6c2a49d2ec.yaml b/releasenotes/notes/inspection-409-69d5bd6c2a49d2ec.yaml
new file mode 100644
index 000000000..8673be075
--- /dev/null
+++ b/releasenotes/notes/inspection-409-69d5bd6c2a49d2ec.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Inspection is now retried on HTTP 409 (conflict), which can be returned
+ by the new implementation in Ironic.
</div><div class="naked_ctrl">
<form action="/index.cgi/speech" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/ironic-python-agent/commit/c3e3cf2aefd798a66d2aeff7b9af975d368c179b.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/ironic-python-agent/commit/c3e3cf2aefd798a66d2aeff7b9af975d368c179b.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech" selected="selected">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>