diff --git a/ganeti/Dockerfile b/ganeti/Dockerfile index 213d75b..63e9d54 100644 --- a/ganeti/Dockerfile +++ b/ganeti/Dockerfile @@ -1,14 +1,13 @@ FROM debian:jessie RUN apt-get update -q2 && DEBIAN_FRONTEND=noninteractive apt-get install --quiet --no-install-recommends --yes ganeti ganeti-instance-debootstrap patch qemu-kvm -# SNF-IMAGE install -#echo "deb http://apt.dev.grnet.gr jessie/" >> /etc/apt/sources.list.d/snf-image.list -#curl https://dev.grnet.gr/files/apt-grnetdev.pub | apt-key add - - +# Patch for ganeti-instance-debootsrap to work with Jessie +# losetup doesn't support short option -s anymore. COPY gnt_deboo_losetup.patch / +# Exposes the rapi port EXPOSE 5080 COPY entrypoint.sh / ENTRYPOINT ["/entrypoint.sh"] diff --git a/ganeti/entrypoint.sh b/ganeti/entrypoint.sh index dcbaf33..4d589ac 100755 --- a/ganeti/entrypoint.sh +++ b/ganeti/entrypoint.sh @@ -1,19 +1,23 @@ #!/bin/bash echo "172.17.0.230 ganeti.example.com" >> /etc/hosts cd /usr/share/ganeti/os/debootstrap/ && patch < /gnt_deboo_losetup.patch > /dev/null mkdir /srv/ganeti && echo "/srv/ganeti" > /etc/ganeti/file-storage-paths sed -i "s/RAPI_ARGS=\"-b 127.0.0.1 --require-authentication\"/RAPI_ARGs=\"--require-authentication\"/" /etc/default/ganeti #sed -i "s/WCONFD_ARGS=\"\"/WCONFD_ARGS=\"-f\"/" /etc/default/ganeti mkdir /var/lib/ganeti/rapi/ chown gnt-rapi:gnt-masterd /var/lib/ganeti/rapi/ echo "ganeti test write" >> /var/lib/ganeti/rapi/users /usr/sbin/gnt-cluster init --enabled-hypervisors=kvm --enabled-disk-templates=file --file-storage-dir=/srv/ganeti --master-netdev=eth0 --no-ssh-init --no-etc-hosts -H kvm:kernel_path='' ganeti.example.com +brctl addbr private_bridge +gnt-network add --network=10.0.0.0/24 --gateway=10.0.0.1 private_bridge +gnt-network connect --nic-parameters mode=bridged,link=private_bridge private_bridge + mkdir /var/run/sshd /usr/sbin/sshd -D