Merge "Fix injecting password into image error"

This commit is contained in:
Jenkins 2017-07-19 08:51:05 +00:00 committed by Gerrit Code Review
commit e44122c782

View File

@ -16,6 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'nfs-utils', 'nfs-utils',
'openstack-nova-compute', 'openstack-nova-compute',
'openvswitch', 'openvswitch',
'python-libguestfs',
'python-oslo-vmware', 'python-oslo-vmware',
'python-rtslib', 'python-rtslib',
'sysfsutils', 'sysfsutils',
@ -37,6 +38,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openvswitch-switch', 'openvswitch-switch',
'open-iscsi', 'open-iscsi',
'python-ironicclient', 'python-ironicclient',
'python-libguestfs',
'python-oslo.vmware', 'python-oslo.vmware',
'sysfsutils' 'sysfsutils'
] %} ] %}
@ -72,6 +74,7 @@ RUN rm -f /etc/nova/nova-compute.conf
'libosinfo', 'libosinfo',
'nfs-utils', 'nfs-utils',
'openvswitch', 'openvswitch',
'python-libguestfs',
'python-rtslib', 'python-rtslib',
'qemu-img', 'qemu-img',
'sysfsutils', 'sysfsutils',
@ -89,6 +92,7 @@ RUN rm -f /etc/nova/nova-compute.conf
'libvirt-dev', 'libvirt-dev',
'nfs-common', 'nfs-common',
'open-iscsi', 'open-iscsi',
'python-libguestfs',
'qemu-utils' 'qemu-utils'
] %} ] %}