openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use openstack/requirements for ironic"

Browse Source
This commit is contained in:
Jenkins 2015-10-15 15:01:00 +00:00 committed by Gerrit Code Review
commit f218233290
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/ironic/ironic-base/Dockerfile.j2
View File

@ -19,7 +19,7 @@ RUN yum -y install \
ADD ironic-base-archive /ironic-base-source
RUN ln -s ironic-base-source/* ironic \
&& useradd --user-group ironic \
&& pip --no-cache-dir install /ironic \
&& pip --no-cache-dir install -c requirements/upper-constraints.txt /ironic \
&& mkdir -p /etc/ironic /var/log/ironic /home/ironic \
&& cp -r /ironic/etc/* /etc/ironic/ \
&& chown -R ironic: /etc/ironic /var/log/ironic /home/ironic

2
docker/ironic/ironic-discoverd/Dockerfile.j2
View File

@ -4,7 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN pip install ironic-discoverd
RUN pip install -c requirements/upper-constraints.txt ironic-discoverd
# discoverd no longer in delorean 9/28/2015, switch to inspector on TODO
#RUN yum -y install \
# openstack-ironic-discoverd \