Merge "Add build from source for Nova"

50 files changed, 173 insertions, 0 deletions

diff --git a/docker/centos/source/base/Dockerfile b/docker/centos/source/base/Dockerfile
index 49078c81e..fad567713 100644
--- a/docker/centos/source/base/Dockerfile
+++ b/docker/centos/source/base/Dockerfile
@@ -10,10 +10,12 @@ RUN yum install -y \
     libxml2-devel \
     libxslt-devel \
     mariadb \
+    mariadb-devel \
     mysql-devel \
     MySQL-python \
     openssl \
     openssl-devel \
+    postgresql \
     postgresql-devel \
     python-devel \
     python-oslo-policy \
diff --git a/docker/centos/source/nova/nova-api/Dockerfile b/docker/centos/source/nova/nova-api/Dockerfile
new file mode 100644
index 000000000..1373c7b6d
--- /dev/null
+++ b/docker/centos/source/nova/nova-api/Dockerfile
@@ -0,0 +1,9 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./start.sh /start.sh
+ADD ./check.sh /check.sh
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-api/build b/docker/centos/source/nova/nova-api/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/nova/nova-api/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-api/check.sh b/docker/centos/source/nova/nova-api/check.sh
new file mode 120000
index 000000000..980c32476
--- /dev/null
+++ b/docker/centos/source/nova/nova-api/check.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-api/check.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-api/config-external.sh b/docker/centos/source/nova/nova-api/config-external.sh
new file mode 120000
index 000000000..fa9d355fe
--- /dev/null
+++ b/docker/centos/source/nova/nova-api/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-api/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-api/config-internal.sh b/docker/centos/source/nova/nova-api/config-internal.sh
new file mode 120000
index 000000000..7a2866993
--- /dev/null
+++ b/docker/centos/source/nova/nova-api/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-api/start.sh b/docker/centos/source/nova/nova-api/start.sh
new file mode 120000
index 000000000..12fd6f028
--- /dev/null
+++ b/docker/centos/source/nova/nova-api/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-base/.buildinfo b/docker/centos/source/nova/nova-base/.buildinfo
new file mode 100644
index 000000000..9c548476f
--- /dev/null
+++ b/docker/centos/source/nova/nova-base/.buildinfo
@@ -0,0 +1,11 @@
+# Build info specific to this image. All values can be overridden in .buildconf
+
+SOURCE_INSTALL_METHOD=curl
+COMPONENT=nova
+SOURCE_INSTALL_AVAILABLE=1
+
+# Used for git install method
+: ${CLONE_FROM:=https://github.com/openstack/nova}
+
+# Used for curl install method
+: ${TARBALL_URI:=http://tarballs.openstack.org/nova/nova-master.tar.gz}
diff --git a/docker/centos/source/nova/nova-base/Dockerfile b/docker/centos/source/nova/nova-base/Dockerfile
new file mode 100644
index 000000000..f9aca91f0
--- /dev/null
+++ b/docker/centos/source/nova/nova-base/Dockerfile
@@ -0,0 +1,26 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN yum -y install \
+        bridge-utils \
+    && yum clean all
+
+RUN pip install \
+    python-cinderclient \
+    python-keystoneclient
+
+ADD ./nova.tar /
+RUN ln -s /nova-* /nova
+
+RUN cd /nova \
+    && useradd --user-group nova \
+    && pip install -r requirements.txt \
+    && pip install /nova \
+    && tox -egenconfig \
+    && mkdir /etc/nova /var/log/nova \
+    && cp /nova/etc/nova/nova.conf.sample /etc/nova/nova.conf \
+    && cp -r /nova/etc/nova/* /etc/nova/ \
+    && chown -R nova: /etc/nova /var/log/nova \
+    && rm -rf /root/.cache
+
+COPY config-nova.sh /opt/kolla/config-nova.sh
diff --git a/docker/centos/source/nova/nova-base/build b/docker/centos/source/nova/nova-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/nova/nova-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-base/config-nova.sh b/docker/centos/source/nova/nova-base/config-nova.sh
new file mode 120000
index 000000000..c27bef695
--- /dev/null
+++ b/docker/centos/source/nova/nova-base/config-nova.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-base/config-nova.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-compute-data/Dockerfile b/docker/centos/source/nova/nova-compute-data/Dockerfile
new file mode 100644
index 000000000..0af407095
--- /dev/null
+++ b/docker/centos/source/nova/nova-compute-data/Dockerfile
@@ -0,0 +1,10 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+VOLUME [ "/var/lib/nova" ]
+VOLUME [ "/var/lib/libvirt" ]
+VOLUME [ "/etc/libvirt/qemu" ]
+
+# Command needed to start the data container.
+# Note: data containers do not need to be persistent.
+CMD ["/bin/true"]
diff --git a/docker/centos/source/nova/nova-compute-data/build b/docker/centos/source/nova/nova-compute-data/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/nova/nova-compute-data/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-compute/Dockerfile b/docker/centos/source/nova/nova-compute/Dockerfile
new file mode 100644
index 000000000..797764ae0
--- /dev/null
+++ b/docker/centos/source/nova/nova-compute/Dockerfile
@@ -0,0 +1,12 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN yum -y install sysfsutils && yum clean all
+
+COPY ./start.sh /start.sh
+
+COPY config-nova-compute.sh config-internal.sh config-external.sh /opt/kolla/
+
+VOLUME [ "/sys/fs/cgroup" ]
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-compute/build b/docker/centos/source/nova/nova-compute/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/nova/nova-compute/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-compute/config-external.sh b/docker/centos/source/nova/nova-compute/config-external.sh
new file mode 120000
index 000000000..bb13b939c
--- /dev/null
+++ b/docker/centos/source/nova/nova-compute/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-compute/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-compute/config-internal.sh b/docker/centos/source/nova/nova-compute/config-internal.sh
new file mode 120000
index 000000000..8d7449dc7
--- /dev/null
+++ b/docker/centos/source/nova/nova-compute/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-compute/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-compute/config-nova-compute.sh b/docker/centos/source/nova/nova-compute/config-nova-compute.sh
new file mode 120000
index 000000000..f003ee0fc
--- /dev/null
+++ b/docker/centos/source/nova/nova-compute/config-nova-compute.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-compute/config-nova-compute.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-compute/start.sh b/docker/centos/source/nova/nova-compute/start.sh
new file mode 120000
index 000000000..830400f9e
--- /dev/null
+++ b/docker/centos/source/nova/nova-compute/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-compute/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-conductor/Dockerfile b/docker/centos/source/nova/nova-conductor/Dockerfile
new file mode 100644
index 000000000..2affea802
--- /dev/null
+++ b/docker/centos/source/nova/nova-conductor/Dockerfile
@@ -0,0 +1,8 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./start.sh /start.sh
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-conductor/build b/docker/centos/source/nova/nova-conductor/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/nova/nova-conductor/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-conductor/config-external.sh b/docker/centos/source/nova/nova-conductor/config-external.sh
new file mode 120000
index 000000000..d98f3a875
--- /dev/null
+++ b/docker/centos/source/nova/nova-conductor/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-conductor/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-conductor/config-internal.sh b/docker/centos/source/nova/nova-conductor/config-internal.sh
new file mode 120000
index 000000000..f0ba78856
--- /dev/null
+++ b/docker/centos/source/nova/nova-conductor/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-conductor/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-conductor/start.sh b/docker/centos/source/nova/nova-conductor/start.sh
new file mode 120000
index 000000000..0eb07db61
--- /dev/null
+++ b/docker/centos/source/nova/nova-conductor/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-conductor/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-consoleauth/Dockerfile b/docker/centos/source/nova/nova-consoleauth/Dockerfile
new file mode 100644
index 000000000..689daed04
--- /dev/null
+++ b/docker/centos/source/nova/nova-consoleauth/Dockerfile
@@ -0,0 +1,8 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD start.sh /start.sh
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-consoleauth/build b/docker/centos/source/nova/nova-consoleauth/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/nova/nova-consoleauth/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-consoleauth/config-external.sh b/docker/centos/source/nova/nova-consoleauth/config-external.sh
new file mode 120000
index 000000000..b9d573470
--- /dev/null
+++ b/docker/centos/source/nova/nova-consoleauth/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-consoleauth/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-consoleauth/config-internal.sh b/docker/centos/source/nova/nova-consoleauth/config-internal.sh
new file mode 120000
index 000000000..d166c7012
--- /dev/null
+++ b/docker/centos/source/nova/nova-consoleauth/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-consoleauth/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-consoleauth/start.sh b/docker/centos/source/nova/nova-consoleauth/start.sh
new file mode 120000
index 000000000..658be8e2a
--- /dev/null
+++ b/docker/centos/source/nova/nova-consoleauth/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-consoleauth/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-libvirt/Dockerfile b/docker/centos/source/nova/nova-libvirt/Dockerfile
new file mode 100644
index 000000000..fd4829575
--- /dev/null
+++ b/docker/centos/source/nova/nova-libvirt/Dockerfile
@@ -0,0 +1,18 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN yum -y install libvirt-daemon \
+        libguestfs \
+        qemu-system-x86 \
+        libvirt-daemon-driver-nwfilter \
+        libvirt-daemon-config-nwfilter \
+        libvirt-daemon-driver-lxc \
+        && yum clean all
+
+VOLUME [ "/sys/fs/cgroup" ]
+
+COPY ./start.sh /start.sh
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-libvirt/build b/docker/centos/source/nova/nova-libvirt/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/nova/nova-libvirt/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-libvirt/config-external.sh b/docker/centos/source/nova/nova-libvirt/config-external.sh
new file mode 120000
index 000000000..e16a4f542
--- /dev/null
+++ b/docker/centos/source/nova/nova-libvirt/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-libvirt/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-libvirt/config-internal.sh b/docker/centos/source/nova/nova-libvirt/config-internal.sh
new file mode 120000
index 000000000..fbf3f4c4e
--- /dev/null
+++ b/docker/centos/source/nova/nova-libvirt/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-libvirt/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-libvirt/start.sh b/docker/centos/source/nova/nova-libvirt/start.sh
new file mode 120000
index 000000000..63ca58e26
--- /dev/null
+++ b/docker/centos/source/nova/nova-libvirt/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-libvirt/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-network/Dockerfile b/docker/centos/source/nova/nova-network/Dockerfile
new file mode 100644
index 000000000..faadbbe8c
--- /dev/null
+++ b/docker/centos/source/nova/nova-network/Dockerfile
@@ -0,0 +1,10 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN yum -y install initscripts && yum clean all
+
+COPY ./start.sh /start.sh
+
+COPY config-nova-network.sh config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-network/build b/docker/centos/source/nova/nova-network/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/nova/nova-network/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-network/config-external.sh b/docker/centos/source/nova/nova-network/config-external.sh
new file mode 120000
index 000000000..086eac04e
--- /dev/null
+++ b/docker/centos/source/nova/nova-network/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-network/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-network/config-internal.sh b/docker/centos/source/nova/nova-network/config-internal.sh
new file mode 120000
index 000000000..b7112e39d
--- /dev/null
+++ b/docker/centos/source/nova/nova-network/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-network/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-network/config-nova-network.sh b/docker/centos/source/nova/nova-network/config-nova-network.sh
new file mode 120000
index 000000000..0908005d2
--- /dev/null
+++ b/docker/centos/source/nova/nova-network/config-nova-network.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-network/config-nova-network.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-network/start.sh b/docker/centos/source/nova/nova-network/start.sh
new file mode 120000
index 000000000..89c974d80
--- /dev/null
+++ b/docker/centos/source/nova/nova-network/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-network/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-novncproxy/Dockerfile b/docker/centos/source/nova/nova-novncproxy/Dockerfile
new file mode 100644
index 000000000..14cbf7059
--- /dev/null
+++ b/docker/centos/source/nova/nova-novncproxy/Dockerfile
@@ -0,0 +1,13 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN yum -y install \
+        https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \
+        novnc \
+    && yum clean all
+
+COPY start.sh /start.sh
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-novncproxy/build b/docker/centos/source/nova/nova-novncproxy/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/nova/nova-novncproxy/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-novncproxy/config-external.sh b/docker/centos/source/nova/nova-novncproxy/config-external.sh
new file mode 120000
index 000000000..8d2a91810
--- /dev/null
+++ b/docker/centos/source/nova/nova-novncproxy/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-novncproxy/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-novncproxy/config-internal.sh b/docker/centos/source/nova/nova-novncproxy/config-internal.sh
new file mode 120000
index 000000000..d6e4e45ec
--- /dev/null
+++ b/docker/centos/source/nova/nova-novncproxy/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-novncproxy/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-novncproxy/start.sh b/docker/centos/source/nova/nova-novncproxy/start.sh
new file mode 120000
index 000000000..b57c6a318
--- /dev/null
+++ b/docker/centos/source/nova/nova-novncproxy/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-novncproxy/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-scheduler/Dockerfile b/docker/centos/source/nova/nova-scheduler/Dockerfile
new file mode 100644
index 000000000..89051a371
--- /dev/null
+++ b/docker/centos/source/nova/nova-scheduler/Dockerfile
@@ -0,0 +1,8 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY ./start.sh /start.sh
+
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/nova/nova-scheduler/build b/docker/centos/source/nova/nova-scheduler/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/nova/nova-scheduler/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-scheduler/config-external.sh b/docker/centos/source/nova/nova-scheduler/config-external.sh
new file mode 120000
index 000000000..ef9c60c29
--- /dev/null
+++ b/docker/centos/source/nova/nova-scheduler/config-external.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-scheduler/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-scheduler/config-internal.sh b/docker/centos/source/nova/nova-scheduler/config-internal.sh
new file mode 120000
index 000000000..1752f44a7
--- /dev/null
+++ b/docker/centos/source/nova/nova-scheduler/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-scheduler/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/nova/nova-scheduler/start.sh b/docker/centos/source/nova/nova-scheduler/start.sh
new file mode 120000
index 000000000..b73e07a6a
--- /dev/null
+++ b/docker/centos/source/nova/nova-scheduler/start.sh
@@ -0,0 +1 @@
+../../../../common/nova/nova-scheduler/start.sh
\ No newline at end of file