openstack
/
ironic-python-agent-builder
Code Issues Proposed changes

Merge "DIB: do not mention dhcp-all-interfaces explicitly"

This commit is contained in:
Zuul 2019-10-09 18:45:25 +00:00 committed by Gerrit Code Review
parent 59e683cfd7 ee436f1478
commit 2380586d2f
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/source/admin/dib.rst
View File

@ -16,19 +16,17 @@ To build an image using diskimage-builder_, run:
ironic-python-agent-builder <distribution, e.g. ubuntu>
You can add other diskimage-builder_ elements via the ``-e`` flag. For example,
dhcp-all-interfaces_ is required for automatic DHCP on some operating systems
(e.g. CentOS 7):
You can add other diskimage-builder_ elements via the ``-e`` flag:
.. code-block:: shell
ironic-python-agent-builder -e dhcp-all-interfaces centos7
ironic-python-agent-builder -e <extra-element> centos7
You can specify the base name of the target images:
.. code-block:: shell
ironic-python-agent-builder -o my-ipa -e dhcp-all-interfaces centos7
ironic-python-agent-builder -o my-ipa centos7
... with diskimage-builder
~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -112,6 +110,5 @@ The *devuser* element allows creating a user at build time, for example:
disk-image-create debian ironic-python-agent-ramdisk devuser
.. _diskimage-builder: https://docs.openstack.org/diskimage-builder
.. _dhcp-all-interfaces: https://docs.openstack.org/diskimage-builder/latest/elements/dhcp-all-interfaces/README.html
.. _dynamic-login: https://docs.openstack.org/diskimage-builder/latest/elements/dynamic-login/README.html
.. _devuser: https://docs.openstack.org/diskimage-builder/latest/elements/devuser/README.html

2
roles/ipa-build-dib-image/tasks/main.yaml
View File

@ -4,7 +4,7 @@
- name: Build a DIB image
command: |
ironic-python-agent-builder -e dhcp-all-interfaces -o {{ image_name }} {{ image_distro }}
ironic-python-agent-builder -o {{ image_name }} {{ image_distro }}
environment:
# Use repositories checked out by Zuul
DIB_REPOLOCATION_ironic_python_agent: '{{ ipa_source_path }}'