openstack
/
instack-undercloud
Code Issues Proposed changes

Update Dockerfile

This commit is contained in:
James Slagle 2014-06-18 07:17:41 -04:00
parent 9a9f68f52e
commit cd2e291bee
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
docker/instack-virt/Dockerfile
View File

@ -6,7 +6,6 @@ RUN yum -y install supervisor
RUN yum -y install openssh-server
RUN echo root | passwd --stdin root
EXPOSE 22
COPY sshd.ini /etc/supervisord.d/sshd.ini
RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
RUN yum -y install libvirt libvirt-daemon-kvm
@ -14,9 +13,6 @@ COPY libvirtd.ini /etc/supervisord.d/libvirtd.ini
RUN yum -y install openvswitch
COPY start.sh /start.sh
RUN chmod 0755 /start.sh
CMD /start.sh
RUN useradd stack
RUN echo stack | passwd --stdin stack
@ -25,16 +21,23 @@ RUN chmod 0440 /etc/sudoers.d/stack
RUN echo 'export LIBVIRT_DEFAULT_URI="qemu:///system"' >> /home/stack/.bashrc
RUN yum install -y http://rdo.fedorapeople.org/openstack-icehouse/rdo-release-icehouse.rpm
RUN yum install -y instack-undercloud
RUN yum install -y libguestfs-tools
RUN groupadd libvirtd
RUN usermod -a -G libvirtd stack
RUN groupadd libvirtd; usermod -a -G libvirtd stack
RUN sed -i "s/^#unix_sock_group.*/unix_sock_group = \"libvirtd\"/g" /etc/libvirt/libvirtd.conf; \
sed -i 's/^#auth_unix_rw.*/auth_unix_rw = "none"/g' /etc/libvirt/libvirtd.conf; \
sed -i 's/^#unix_sock_rw_perms.*/unix_sock_rw_perms = "0770"/g' /etc/libvirt/libvirtd.conf
RUN yum -y install libvirt-python
RUN yum clean all
COPY sshd.ini /etc/supervisord.d/sshd.ini
COPY baremetal_0.xml /etc/libvirt/qemu/baremetal_0.xml
COPY baremetal_1.xml /etc/libvirt/qemu/baremetal_1.xml
COPY baremetal_2.xml /etc/libvirt/qemu/baremetal_2.xml
COPY baremetal_3.xml /etc/libvirt/qemu/baremetal_3.xml
COPY instack.xml /etc/libvirt/qemu/instack.xml
COPY default.xml /etc/libvirt/qemu/networks/default.xml
COPY brbm.xml /etc/libvirt/qemu/networks/brbm.xml
COPY instack.qcow2 /var/lib/libvirt/base-images/instack.qcow2
COPY start.sh /start.sh
RUN chmod 0755 /start.sh
CMD /start.sh

12
docker/instack-virt/start.sh
View File

@ -1,4 +1,16 @@
#!/bin/bash
for i in $(seq 0 4); do
if [ ! -f /var/lib/libvirt/images/baremetal_$i.qcow2 ]; then
qemu-img create -f qcow2 /var/lib/libvirt/images/baremetal_$i.qcow2 31G
fi
done
if [ ! -f /var/lib/libvirt/images/instack.qcow2 ]; then
qemu-img create -f qcow2 -b /var/lib/libvirt/base-images/instack.qcow2 /var/lib/libvirt/images/instack.qcow2
fi
/usr/share/openvswitch/scripts/ovs-ctl start --system-id=random
ovs-vsctl list-br | grep brbm || ovs-vsctl add-br brbm
supervisord -n