diff --git a/ansible/group_vars/all/ipa b/ansible/group_vars/all/ipa index 1ed548e2a8d2dbca7c7f18bb3e9e3973268e178c..0d88e4dfe64f11bf7580315d5d84d71e3a2b79fc 100644 --- a/ansible/group_vars/all/ipa +++ b/ansible/group_vars/all/ipa @@ -47,6 +47,7 @@ ipa_build_dib_env_default: DIB_RELEASE: "8-stream" DIB_REPOLOCATION_ironic_python_agent: "{{ ipa_build_source_url }}" DIB_REPOREF_ironic_python_agent: "{{ ipa_build_source_version }}" + DIB_REPOREF_requirements: "{{ openstack_branch }}" # Dictionary of additional environment variables to provide to Diskimage # Builder (DIB) during IPA image build. diff --git a/doc/source/configuration/reference/ironic-python-agent.rst b/doc/source/configuration/reference/ironic-python-agent.rst index e60c372619028a92e8e8833f8cb8a758dffdf08a..da2936e400b963d03844ad1e7b5c5bfb84ef2361 100644 --- a/doc/source/configuration/reference/ironic-python-agent.rst +++ b/doc/source/configuration/reference/ironic-python-agent.rst @@ -58,9 +58,10 @@ image build``. ``ipa_build_dib_env_default`` Dictionary of default environment variables to provide to Diskimage Builder (DIB) during IPA image build. Default is - ``{"DIB_RELEASE": "8-stream", "DIB_REPOLOCATION_ironic_agent": "{{ - ipa_build_source_url }}", "DIB_REPOREF_ironic_agent": "{{ - ipa_build_source_version }}"}``. + ``{"DIB_RELEASE": "8-stream", "DIB_REPOLOCATION_ironic_python_agent": "{{ + ipa_build_source_url }}", "DIB_REPOREF_ironic_python_agent": "{{ + ipa_build_source_version }}", "DIB_REPOREF_requirements": "{{ + openstack_branch }}"}``. ``ipa_build_dib_env_extra`` Dictionary of additional environment variables to provide to Diskimage Builder (DIB) during IPA image build. Default is empty. diff --git a/releasenotes/notes/specify-requirements-branch-for-ipa-build-c3ca977ec21b58f4.yaml b/releasenotes/notes/specify-requirements-branch-for-ipa-build-c3ca977ec21b58f4.yaml new file mode 100644 index 0000000000000000000000000000000000000000..cc7671c361ef0390c522f0a969bc5d9ac7a6fbb2 --- /dev/null +++ b/releasenotes/notes/specify-requirements-branch-for-ipa-build-c3ca977ec21b58f4.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - | + Deployment image (IPA) build no longer uses master version of + upper-constraints. Instead, it defaults to using the constraints for the + OpenStack release associated with the version of Kayobe being used. See + `story 2009810 <https://storyboard.openstack.org/#!/story/2009810>`__ for + details.