diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 19:23:49 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:30 -0700 |
| commit | f895ee07cc5c1030e32854cf9a4e91bbeaf4de12 (patch) | |
| tree | cc7d17c2c63bf83f6a983553b8729f67abeac58d | |
| parent | 5c82e0c90ce0fedf523b11b0b933f2276edf8f46 (diff) | |
| download | kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.tar.gz kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.zip | |
Remove docker directory
Remove the docker directory (yay) and old build tools.
This will result in an f21 failing gate - however, I have a patch
submission to remove that gate from our project configuration.
Change-Id: I3c461cedb6906422c8076f60c470e773d6cdcf33
Partially-Implements: blueprint remove-docker-dir
614 files changed, 0 insertions, 3207 deletions
diff --git a/README.rst b/README.rst index 2d6ad79e7..5bab37cf5 100644 --- a/README.rst +++ b/README.rst @@ -71,9 +71,6 @@ Directories Ansible. - demos - Contains a few demos to use with Kolla. - devenv - Contains an OpenStack-Heat based development environment. -- docker - Contains a normal Dockerfile based set of artifacts for - building docker. This is planned for removal when docker\_templates - is completed. - docs - Contains documentation. - etc - Contains a reference etc directory structure which requires configuration of a small number of configuration variables to achieve diff --git a/docker/centos/binary/base/Dockerfile b/docker/centos/binary/base/Dockerfile deleted file mode 100644 index 31b2566f7..000000000 --- a/docker/centos/binary/base/Dockerfile +++ /dev/null @@ -1,118 +0,0 @@ -FROM centos -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Set up repositories -# This repository provides all dependencies used by RDO OpenStack -RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm -# This repository provides latest packages built from trunk master into RPMs -RUN curl http://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean-current.repo -# This repository turns off auth in PAM so we can operate on Ubuntu 14.04 -RUN curl https://copr.fedoraproject.org/coprs/sdake/pam.noaudit/repo/epel-7/sdake-pam.noaudit-epel-7.repo -o /etc/yum.repos.d/sdake-pam.noaudit-epel-7.repo - -# CentOS 7.1 workaround for conflicting packages with libvirt -RUN rpm -e --nodeps systemd-container systemd-container-libs -RUN rpm -e --nodeps yum-plugin-fastestmirror -RUN yum -d 10 -y install systemd systemd-libs systemd-devel && yum clean all - -RUN yum install -y epel-release && yum clean all - -# Update packages -RUN yum update -y && yum clean all - -# Install base packages -RUN yum install -y \ - mariadb \ - mariadb-libs \ - openssl \ - openstack-utils \ - pyparsing \ - python-alembic \ - python-amqp \ - python-amqplib \ - python-anyjson \ - python-boto \ - python-cheetah \ - python-cliff \ - python-cmd2 \ - python-croniter \ - python-crypto \ - python-d2to1 \ - python-docutils \ - python-dogpile-cache \ - python-dogpile-core \ - python-empy \ - python-eventlet \ - python-flask \ - python-futures \ - python-greenlet \ - python-httplib2 \ - python-iso8601 \ - python-itsdangerous \ - python-jinja2 \ - python-jsonpatch \ - python-jsonpath-rw \ - python-jsonpointer \ - python-jsonschema \ - python-keyring \ - python-kombu \ - python-ldap \ - python-lesscpy \ - python-lockfile \ - python-lxml \ - python-markdown \ - python-memcached \ - python-migrate \ - python-msgpack \ - python-netifaces \ - python-networkx \ - python-oauthlib \ - python-oslo-config \ - python-oslo-messaging \ - python-oslo-rootwrap \ - python-oslo-policy \ - python-paramiko \ - python-passlib \ - python-paste-deploy \ - python-pbr \ - python-pecan \ - python-pip \ - python-ply \ - python-prettytable \ - python-psutil \ - python-pycadf \ - python-pygments \ - python-pymongo \ - python-qpid \ - python-repoze-lru \ - python-requests \ - python-routes \ - python-simplegeneric \ - python-simplejson \ - python-singledispatch \ - python-six \ - python-sqlalchemy \ - python-stevedore \ - python-taskflow \ - python-versiontools \ - python-warlock \ - python-webob \ - python-websockify \ - python-webtest \ - python-werkzeug \ - python-wsme \ - && yum clean all - -# TODO(inc0): when oslo_service lands in delorean, change pip to yum -# necessary until https://bugzilla.redhat.com/show_bug.cgi?id=1229477 is fixed - -# This is dirty like zebra. This works around a bug in Ubuntu 14.04 LTS. The -# --net=host option does not work on ubuntu 14.04 because of a kernel bug. One -# workaround is to buid pam without authentication. -# See: -# https://registry.hub.docker.com/u/sequenceiq/pam/ -# -RUN rpm -e --nodeps pam -RUN yum -y install pam+noaudit && yum clean all -# End dirty like zebra - -COPY kolla-common.sh /opt/kolla/ diff --git a/docker/centos/binary/base/build b/docker/centos/binary/base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/base/kolla-common.sh b/docker/centos/binary/base/kolla-common.sh deleted file mode 120000 index c265c62f7..000000000 --- a/docker/centos/binary/base/kolla-common.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/kolla-common.sh
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile deleted file mode 100644 index 92ba970ac..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y openstack-ceilometer-alarm && yum clean all - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/build b/docker/centos/binary/ceilometer/ceilometer-alarm/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-alarm/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-alarm/config-external.sh deleted file mode 120000 index 0a48ebf52..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-alarm/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-alarm/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/start.sh b/docker/centos/binary/ceilometer/ceilometer-alarm/start.sh deleted file mode 120000 index ed3ac528d..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-alarm/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-alarm/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile deleted file mode 100644 index 56cb0fb87..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y openstack-ceilometer-api && yum clean all - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ -CMD ["/start.sh"] diff --git a/docker/centos/binary/ceilometer/ceilometer-api/build b/docker/centos/binary/ceilometer/ceilometer-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-api/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-api/config-external.sh deleted file mode 120000 index 4ea59dad7..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-api/start.sh b/docker/centos/binary/ceilometer/ceilometer-api/start.sh deleted file mode 120000 index 7acfa2cba..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-api/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile deleted file mode 100644 index 30c8fbae3..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) diff --git a/docker/centos/binary/ceilometer/ceilometer-base/build b/docker/centos/binary/ceilometer/ceilometer-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile deleted file mode 100644 index f48a68d74..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y openstack-ceilometer-central && yum clean all - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/ceilometer/ceilometer-central/build b/docker/centos/binary/ceilometer/ceilometer-central/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-central/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-central/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-central/config-external.sh deleted file mode 120000 index cfc69e75d..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-central/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-central/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-central/start.sh b/docker/centos/binary/ceilometer/ceilometer-central/start.sh deleted file mode 120000 index 8df383cd1..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-central/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-central/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile deleted file mode 100644 index ed9b54011..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y openstack-ceilometer-collector && yum clean all - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/build b/docker/centos/binary/ceilometer/ceilometer-collector/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-collector/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-collector/config-external.sh deleted file mode 120000 index e16dcecc1..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-collector/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-collector/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/start.sh b/docker/centos/binary/ceilometer/ceilometer-collector/start.sh deleted file mode 120000 index bea2eb09c..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-collector/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-collector/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile deleted file mode 100644 index 50a6b7bf6..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-pecan \ - && yum clean all - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/build b/docker/centos/binary/ceilometer/ceilometer-compute/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-compute/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-compute/config-external.sh deleted file mode 120000 index 1d0c728e5..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-compute/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-compute/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/start.sh b/docker/centos/binary/ceilometer/ceilometer-compute/start.sh deleted file mode 120000 index 1118b9552..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-compute/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-compute/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile deleted file mode 100644 index 7314d7bd0..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y openstack-ceilometer-notification && yum clean all - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/build b/docker/centos/binary/ceilometer/ceilometer-notification/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-notification/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-notification/config-external.sh deleted file mode 120000 index 12d98d9ee..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-notification/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-notification/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/start.sh b/docker/centos/binary/ceilometer/ceilometer-notification/start.sh deleted file mode 120000 index 8e6d4e337..000000000 --- a/docker/centos/binary/ceilometer/ceilometer-notification/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-notification/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder/cinder-api/Dockerfile b/docker/centos/binary/cinder/cinder-api/Dockerfile deleted file mode 100644 index 7eed0b311..000000000 --- a/docker/centos/binary/cinder/cinder-api/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y python-keystone && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/cinder/cinder-api/build b/docker/centos/binary/cinder/cinder-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/cinder/cinder-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/cinder/cinder-api/config-external.sh b/docker/centos/binary/cinder/cinder-api/config-external.sh deleted file mode 120000 index 0e9409e98..000000000 --- a/docker/centos/binary/cinder/cinder-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder/cinder-api/start.sh b/docker/centos/binary/cinder/cinder-api/start.sh deleted file mode 120000 index 4b6c5f104..000000000 --- a/docker/centos/binary/cinder/cinder-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-api/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder/cinder-backup/Dockerfile b/docker/centos/binary/cinder/cinder-backup/Dockerfile deleted file mode 100644 index 70b8d8202..000000000 --- a/docker/centos/binary/cinder/cinder-backup/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/cinder/cinder-backup/build b/docker/centos/binary/cinder/cinder-backup/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/cinder/cinder-backup/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/cinder/cinder-backup/config-external.sh b/docker/centos/binary/cinder/cinder-backup/config-external.sh deleted file mode 120000 index 4c6f65d40..000000000 --- a/docker/centos/binary/cinder/cinder-backup/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-backup/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder/cinder-backup/start.sh b/docker/centos/binary/cinder/cinder-backup/start.sh deleted file mode 120000 index 62ae41b03..000000000 --- a/docker/centos/binary/cinder/cinder-backup/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-backup/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder/cinder-base/Dockerfile b/docker/centos/binary/cinder/cinder-base/Dockerfile deleted file mode 100644 index 6b699dae5..000000000 --- a/docker/centos/binary/cinder/cinder-base/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-cinder \ - python-automaton \ - && sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \ - && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf \ - && yum clean all - -# NOTE(sdake): The sed operations make LVM tools work inside a container - see -# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw diff --git a/docker/centos/binary/cinder/cinder-base/build b/docker/centos/binary/cinder/cinder-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/cinder/cinder-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/cinder/cinder-scheduler/Dockerfile b/docker/centos/binary/cinder/cinder-scheduler/Dockerfile deleted file mode 100644 index 70b8d8202..000000000 --- a/docker/centos/binary/cinder/cinder-scheduler/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/cinder/cinder-scheduler/build b/docker/centos/binary/cinder/cinder-scheduler/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/cinder/cinder-scheduler/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/cinder/cinder-scheduler/config-external.sh b/docker/centos/binary/cinder/cinder-scheduler/config-external.sh deleted file mode 120000 index f6d26aba5..000000000 --- a/docker/centos/binary/cinder/cinder-scheduler/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-scheduler/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder/cinder-scheduler/start.sh b/docker/centos/binary/cinder/cinder-scheduler/start.sh deleted file mode 120000 index 0953c6457..000000000 --- a/docker/centos/binary/cinder/cinder-scheduler/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-scheduler/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder/cinder-volume/Dockerfile b/docker/centos/binary/cinder/cinder-volume/Dockerfile deleted file mode 100644 index 17412fefa..000000000 --- a/docker/centos/binary/cinder/cinder-volume/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Install required packages -RUN yum install -y lvm2 scsi-target-utils && yum clean all - -# Add start scripts -COPY config-external.sh /opt/kolla/ -COPY start.sh /start.sh - -CMD ["/start.sh"] diff --git a/docker/centos/binary/cinder/cinder-volume/build b/docker/centos/binary/cinder/cinder-volume/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/cinder/cinder-volume/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/cinder/cinder-volume/config-external.sh b/docker/centos/binary/cinder/cinder-volume/config-external.sh deleted file mode 120000 index abcdd6bc4..000000000 --- a/docker/centos/binary/cinder/cinder-volume/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-volume/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/cinder/cinder-volume/start.sh b/docker/centos/binary/cinder/cinder-volume/start.sh deleted file mode 120000 index 471a5ebd7..000000000 --- a/docker/centos/binary/cinder/cinder-volume/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-volume/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/data/Dockerfile b/docker/centos/binary/data/Dockerfile deleted file mode 100644 index 635918540..000000000 --- a/docker/centos/binary/data/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM centos -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -CMD /bin/sleep infinity diff --git a/docker/centos/binary/data/build b/docker/centos/binary/data/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-api/Dockerfile b/docker/centos/binary/designate/designate-api/Dockerfile deleted file mode 100644 index 34011aca2..000000000 --- a/docker/centos/binary/designate/designate-api/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y \ - openstack-designate-api \ - && yum clean all - -COPY start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/designate/designate-api/build b/docker/centos/binary/designate/designate-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/designate/designate-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-api/config-external.sh b/docker/centos/binary/designate/designate-api/config-external.sh deleted file mode 120000 index da641a600..000000000 --- a/docker/centos/binary/designate/designate-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-api/start.sh b/docker/centos/binary/designate/designate-api/start.sh deleted file mode 120000 index f96fe1a34..000000000 --- a/docker/centos/binary/designate/designate-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-api/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-backend-bind9/Dockerfile b/docker/centos/binary/designate/designate-backend-bind9/Dockerfile deleted file mode 100644 index 172645f8c..000000000 --- a/docker/centos/binary/designate/designate-backend-bind9/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y bind \ - && yum clean all \ - && cp -pr /var/named /opt/kolla/var-named - -COPY start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/designate/designate-backend-bind9/build b/docker/centos/binary/designate/designate-backend-bind9/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/designate/designate-backend-bind9/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-backend-bind9/config-external.sh b/docker/centos/binary/designate/designate-backend-bind9/config-external.sh deleted file mode 120000 index 98eabc775..000000000 --- a/docker/centos/binary/designate/designate-backend-bind9/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-backend-bind9/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-backend-bind9/start.sh b/docker/centos/binary/designate/designate-backend-bind9/start.sh deleted file mode 120000 index 918411fa1..000000000 --- a/docker/centos/binary/designate/designate-backend-bind9/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-backend-bind9/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-base/Dockerfile b/docker/centos/binary/designate/designate-base/Dockerfile deleted file mode 100644 index 1b4ebe9ec..000000000 --- a/docker/centos/binary/designate/designate-base/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Install designate-api because of /etc/designate/policy.json, which -# is needed in all services. This is probably a packaging bug. We do -# need the complete policy file because of some of the containers' -# requiring it. Remove the package when the file is moved though. -RUN yum install -y \ - MySQL-python \ - openstack-designate-api \ - openstack-designate-common \ - python-tooz \ - && yum clean all \ - && cp /etc/designate/policy.json /tmp/ \ - && rpm -e openstack-designate-api \ - && mv /tmp/policy.json /etc/designate/ diff --git a/docker/centos/binary/designate/designate-base/build b/docker/centos/binary/designate/designate-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/designate/designate-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-central/Dockerfile b/docker/centos/binary/designate/designate-central/Dockerfile deleted file mode 100644 index 480f60513..000000000 --- a/docker/centos/binary/designate/designate-central/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y \ - openstack-designate-central \ - && yum clean all - -COPY start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/designate/designate-central/build b/docker/centos/binary/designate/designate-central/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/designate/designate-central/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-central/config-external.sh b/docker/centos/binary/designate/designate-central/config-external.sh deleted file mode 120000 index abe5bcd39..000000000 --- a/docker/centos/binary/designate/designate-central/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-central/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-central/start.sh b/docker/centos/binary/designate/designate-central/start.sh deleted file mode 120000 index 9e0a8c484..000000000 --- a/docker/centos/binary/designate/designate-central/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-central/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-mdns/Dockerfile b/docker/centos/binary/designate/designate-mdns/Dockerfile deleted file mode 100644 index befdc14e6..000000000 --- a/docker/centos/binary/designate/designate-mdns/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y openstack-designate-mdns \ - && yum clean all - -COPY start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/designate/designate-mdns/build b/docker/centos/binary/designate/designate-mdns/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/designate/designate-mdns/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-mdns/config-external.sh b/docker/centos/binary/designate/designate-mdns/config-external.sh deleted file mode 120000 index e450238fc..000000000 --- a/docker/centos/binary/designate/designate-mdns/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-mdns/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-mdns/start.sh b/docker/centos/binary/designate/designate-mdns/start.sh deleted file mode 120000 index f7bf747fc..000000000 --- a/docker/centos/binary/designate/designate-mdns/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-mdns/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-poolmanager/Dockerfile b/docker/centos/binary/designate/designate-poolmanager/Dockerfile deleted file mode 100644 index 2a1851060..000000000 --- a/docker/centos/binary/designate/designate-poolmanager/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# The bind9 package here is only to provide the rndc binary. -RUN yum install -y \ - openstack-designate-pool-manager \ - bind \ - && yum clean all - -COPY start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/designate/designate-poolmanager/build b/docker/centos/binary/designate/designate-poolmanager/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/designate/designate-poolmanager/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-poolmanager/config-external.sh b/docker/centos/binary/designate/designate-poolmanager/config-external.sh deleted file mode 120000 index 461acb12a..000000000 --- a/docker/centos/binary/designate/designate-poolmanager/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-poolmanager/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-poolmanager/start.sh b/docker/centos/binary/designate/designate-poolmanager/start.sh deleted file mode 120000 index cc428b4fe..000000000 --- a/docker/centos/binary/designate/designate-poolmanager/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-poolmanager/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-sink/Dockerfile b/docker/centos/binary/designate/designate-sink/Dockerfile deleted file mode 100644 index e2f3b6026..000000000 --- a/docker/centos/binary/designate/designate-sink/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y \ - openstack-designate-sink \ - python-designateclient \ - && yum clean all - -COPY start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/designate/designate-sink/build b/docker/centos/binary/designate/designate-sink/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/designate/designate-sink/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-sink/config-external.sh b/docker/centos/binary/designate/designate-sink/config-external.sh deleted file mode 120000 index edc94e6e4..000000000 --- a/docker/centos/binary/designate/designate-sink/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-sink/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/designate/designate-sink/start.sh b/docker/centos/binary/designate/designate-sink/start.sh deleted file mode 120000 index 751b58345..000000000 --- a/docker/centos/binary/designate/designate-sink/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-sink/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/galera/Dockerfile b/docker/centos/binary/galera/Dockerfile deleted file mode 100644 index 9a21c3440..000000000 --- a/docker/centos/binary/galera/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN echo "[mariadb]" > /etc/yum.repos.d/MariaDB.repo && \ - echo "name = MariaDB" >> /etc/yum.repos.d/MariaDB.repo && \ - echo "baseurl = http://yum.mariadb.org/10.0/centos7-amd64" >> /etc/yum.repos.d/MariaDB.repo && \ - echo "gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB" >> /etc/yum.repos.d/MariaDB.repo && \ - echo "gpgcheck=1" >> /etc/yum.repos.d/MariaDB.repo && \ - yum install -y \ - http://www.percona.com/redir/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm && \ - sed -i 's|$releasever|centos/latest|g' /etc/yum.repos.d/percona-release.repo && \ - yum install -y \ - MariaDB-Galera-server \ - MariaDB-client \ - rsync \ - galera \ - socat \ - hostname \ - percona-xtrabackup \ - pv \ - tar \ - expect \ - && rm -rf /var/lib/mysql/* - -COPY config-galera.sh /opt/kolla/config/ -COPY config-external.sh /opt/kolla/ -COPY start.sh / - -CMD ["/start.sh"] diff --git a/docker/centos/binary/galera/build b/docker/centos/binary/galera/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/galera/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/galera/config-external.sh b/docker/centos/binary/galera/config-external.sh deleted file mode 120000 index 72a04836e..000000000 --- a/docker/centos/binary/galera/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/galera/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/galera/config-galera.sh b/docker/centos/binary/galera/config-galera.sh deleted file mode 120000 index f6782bb87..000000000 --- a/docker/centos/binary/galera/config-galera.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/galera/config-galera.sh
\ No newline at end of file diff --git a/docker/centos/binary/galera/start.sh b/docker/centos/binary/galera/start.sh deleted file mode 120000 index 1fa9a143d..000000000 --- a/docker/centos/binary/galera/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/galera/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/glance/glance-api/Dockerfile b/docker/centos/binary/glance/glance-api/Dockerfile deleted file mode 100644 index c3c0fd9d1..000000000 --- a/docker/centos/binary/glance/glance-api/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/glance/glance-api/build b/docker/centos/binary/glance/glance-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/glance/glance-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/glance/glance-api/config-external.sh b/docker/centos/binary/glance/glance-api/config-external.sh deleted file mode 120000 index 46a22b7b3..000000000 --- a/docker/centos/binary/glance/glance-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/glance/glance-api/start.sh b/docker/centos/binary/glance/glance-api/start.sh deleted file mode 120000 index 6740e1fe9..000000000 --- a/docker/centos/binary/glance/glance-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-api/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/glance/glance-base/Dockerfile b/docker/centos/binary/glance/glance-base/Dockerfile deleted file mode 100644 index 38e63c761..000000000 --- a/docker/centos/binary/glance/glance-base/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-glance python-oslo-i18n && yum clean all diff --git a/docker/centos/binary/glance/glance-base/build b/docker/centos/binary/glance/glance-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/glance/glance-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/glance/glance-registry/Dockerfile b/docker/centos/binary/glance/glance-registry/Dockerfile deleted file mode 100644 index 11b584eed..000000000 --- a/docker/centos/binary/glance/glance-registry/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY config-external.sh /opt/kolla/ - -COPY ./start.sh /start.sh -CMD ["/start.sh"] diff --git a/docker/centos/binary/glance/glance-registry/build b/docker/centos/binary/glance/glance-registry/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/glance/glance-registry/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/glance/glance-registry/config-external.sh b/docker/centos/binary/glance/glance-registry/config-external.sh deleted file mode 120000 index cfcbd1391..000000000 --- a/docker/centos/binary/glance/glance-registry/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-registry/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/glance/glance-registry/start.sh b/docker/centos/binary/glance/glance-registry/start.sh deleted file mode 120000 index 1295cdc31..000000000 --- a/docker/centos/binary/glance/glance-registry/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-registry/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile deleted file mode 100644 index eee474e37..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-api/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y openstack-gnocchi-api \ - openstack-gnocchi-carbonara \ - openstack-gnocchi-indexer-sqlalchemy \ - && yum clean all - -COPY start.sh / - -CMD ["/start.sh"] diff --git a/docker/centos/binary/gnocchi/gnocchi-api/build b/docker/centos/binary/gnocchi/gnocchi-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-api/config-external.sh b/docker/centos/binary/gnocchi/gnocchi-api/config-external.sh deleted file mode 120000 index 471d03664..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-api/start.sh b/docker/centos/binary/gnocchi/gnocchi-api/start.sh deleted file mode 120000 index 99320c6d0..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-api/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile deleted file mode 100644 index 30c8fbae3..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-base/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) diff --git a/docker/centos/binary/gnocchi/gnocchi-base/build b/docker/centos/binary/gnocchi/gnocchi-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile b/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile deleted file mode 100644 index 354c312d0..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-statsd/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y openstack-gnocchi-statsd && yum clean all - -COPY start.sh / - -CMD ["/start.sh"] diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/build b/docker/centos/binary/gnocchi/gnocchi-statsd/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-statsd/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/config-external.sh b/docker/centos/binary/gnocchi/gnocchi-statsd/config-external.sh deleted file mode 120000 index fe516e42c..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-statsd/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-statsd/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/gnocchi/gnocchi-statsd/start.sh b/docker/centos/binary/gnocchi/gnocchi-statsd/start.sh deleted file mode 120000 index ad961553e..000000000 --- a/docker/centos/binary/gnocchi/gnocchi-statsd/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-statsd/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/haproxy/Dockerfile b/docker/centos/binary/haproxy/Dockerfile deleted file mode 100755 index 8e1a05f18..000000000 --- a/docker/centos/binary/haproxy/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - haproxy \ - && yum clean all - -COPY start.sh / -COPY config-external.sh ensure_latest_config.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/haproxy/build b/docker/centos/binary/haproxy/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/haproxy/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/haproxy/config-external.sh b/docker/centos/binary/haproxy/config-external.sh deleted file mode 120000 index 75dc2b408..000000000 --- a/docker/centos/binary/haproxy/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/haproxy/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/haproxy/ensure_latest_config.sh b/docker/centos/binary/haproxy/ensure_latest_config.sh deleted file mode 120000 index 80c50f32a..000000000 --- a/docker/centos/binary/haproxy/ensure_latest_config.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/haproxy/ensure_latest_config.sh
\ No newline at end of file diff --git a/docker/centos/binary/haproxy/start.sh b/docker/centos/binary/haproxy/start.sh deleted file mode 120000 index 9b9c71e73..000000000 --- a/docker/centos/binary/haproxy/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/haproxy/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-api-cfn/Dockerfile b/docker/centos/binary/heat/heat-api-cfn/Dockerfile deleted file mode 100644 index bfd2fe0bc..000000000 --- a/docker/centos/binary/heat/heat-api-cfn/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-heat-api-cfn \ - python-openstackclient \ - && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/heat/heat-api-cfn/build b/docker/centos/binary/heat/heat-api-cfn/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/heat/heat-api-cfn/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-api-cfn/config-external.sh b/docker/centos/binary/heat/heat-api-cfn/config-external.sh deleted file mode 120000 index d1d084800..000000000 --- a/docker/centos/binary/heat/heat-api-cfn/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api-cfn/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-api-cfn/start.sh b/docker/centos/binary/heat/heat-api-cfn/start.sh deleted file mode 120000 index a71201d4b..000000000 --- a/docker/centos/binary/heat/heat-api-cfn/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api-cfn/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-api/Dockerfile b/docker/centos/binary/heat/heat-api/Dockerfile deleted file mode 100644 index 6f7718683..000000000 --- a/docker/centos/binary/heat/heat-api/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# TODO: configure cfn and cloudwatch -# TODO: remove python-openstackclient once crux feature is added in start.sh -RUN yum -y install \ - openstack-heat-api \ - python-openstackclient \ - && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/heat/heat-api/build b/docker/centos/binary/heat/heat-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/heat/heat-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-api/config-external.sh b/docker/centos/binary/heat/heat-api/config-external.sh deleted file mode 120000 index bfc23ba35..000000000 --- a/docker/centos/binary/heat/heat-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-api/start.sh b/docker/centos/binary/heat/heat-api/start.sh deleted file mode 120000 index cf3eb022c..000000000 --- a/docker/centos/binary/heat/heat-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-base/Dockerfile b/docker/centos/binary/heat/heat-base/Dockerfile deleted file mode 100644 index f66e130e3..000000000 --- a/docker/centos/binary/heat/heat-base/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - python-oslo-reports \ - && yum clean all diff --git a/docker/centos/binary/heat/heat-base/build b/docker/centos/binary/heat/heat-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/heat/heat-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-engine/Dockerfile b/docker/centos/binary/heat/heat-engine/Dockerfile deleted file mode 100644 index 37cf7fb2c..000000000 --- a/docker/centos/binary/heat/heat-engine/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - # until http://pkgs.fedoraproject.org/cgit/openstack-heat.git/tree/openstack-heat.spec#n248 \ - # is updated, the clients must remain here: \ - python-barbicanclient \ - python-zaqarclient \ - openstack-heat-engine \ - && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/heat/heat-engine/build b/docker/centos/binary/heat/heat-engine/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/heat/heat-engine/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-engine/config-external.sh b/docker/centos/binary/heat/heat-engine/config-external.sh deleted file mode 120000 index a620c9e5b..000000000 --- a/docker/centos/binary/heat/heat-engine/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-engine/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/heat/heat-engine/start.sh b/docker/centos/binary/heat/heat-engine/start.sh deleted file mode 120000 index d660bc5d1..000000000 --- a/docker/centos/binary/heat/heat-engine/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-engine/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/horizon/Dockerfile b/docker/centos/binary/horizon/Dockerfile deleted file mode 100644 index dfd0f0ff0..000000000 --- a/docker/centos/binary/horizon/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-dashboard \ - httpd \ - mod_wsgi \ - && yum clean all \ - && chown -R apache:apache /usr/share/openstack-dashboard/static - -# The chown is required because of this packaging bug: -# https://bugzilla.redhat.com/show_bug.cgi?id=1219006 - -COPY config-external.sh /opt/kolla/ -COPY start.sh / - -CMD ["/start.sh"] diff --git a/docker/centos/binary/horizon/build b/docker/centos/binary/horizon/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/horizon/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/horizon/config-external.sh b/docker/centos/binary/horizon/config-external.sh deleted file mode 120000 index 19b799f7b..000000000 --- a/docker/centos/binary/horizon/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/horizon/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/horizon/start.sh b/docker/centos/binary/horizon/start.sh deleted file mode 120000 index 3c793e4f9..000000000 --- a/docker/centos/binary/horizon/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/horizon/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/keepalived/Dockerfile b/docker/centos/binary/keepalived/Dockerfile deleted file mode 100644 index 3e2e4fa46..000000000 --- a/docker/centos/binary/keepalived/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - hostname \ - keepalived \ - socat \ - && yum clean all - -COPY start.sh check_alive.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/keepalived/build b/docker/centos/binary/keepalived/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/keepalived/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/keepalived/check_alive.sh b/docker/centos/binary/keepalived/check_alive.sh deleted file mode 120000 index e9bfd9d1f..000000000 --- a/docker/centos/binary/keepalived/check_alive.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keepalived/check_alive.sh
\ No newline at end of file diff --git a/docker/centos/binary/keepalived/config-external.sh b/docker/centos/binary/keepalived/config-external.sh deleted file mode 120000 index 08cebbe79..000000000 --- a/docker/centos/binary/keepalived/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keepalived/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/keepalived/start.sh b/docker/centos/binary/keepalived/start.sh deleted file mode 120000 index 05b222220..000000000 --- a/docker/centos/binary/keepalived/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keepalived/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/keystone/Dockerfile b/docker/centos/binary/keystone/Dockerfile deleted file mode 100644 index 11cef4d8f..000000000 --- a/docker/centos/binary/keystone/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-keystone \ - python-keystoneclient \ - python-openstackclient \ - httpd \ - mod_wsgi \ - && yum clean all - -RUN mkdir -p /var/www/cgi-bin/keystone /var/log/keystone -RUN cp -a /usr/share/keystone/wsgi-keystone.conf /etc/httpd/conf.d -RUN sed -i 's,/var/log/apache2,/var/log/httpd,' /etc/httpd/conf.d/wsgi-keystone.conf -RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf -RUN cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/main -RUN cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin -RUN chown -R keystone: /var/www/cgi-bin/keystone -RUN chmod 755 /var/www/cgi-bin/keystone/* - -# Add start-up and check scripts -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -# Run the Keystone start script -CMD ["/start.sh"] diff --git a/docker/centos/binary/keystone/build b/docker/centos/binary/keystone/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/keystone/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/keystone/config-external.sh b/docker/centos/binary/keystone/config-external.sh deleted file mode 120000 index ae5be7eea..000000000 --- a/docker/centos/binary/keystone/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keystone/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/keystone/start.sh b/docker/centos/binary/keystone/start.sh deleted file mode 120000 index ae34844ea..000000000 --- a/docker/centos/binary/keystone/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keystone/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/kolla-ansible/Dockerfile b/docker/centos/binary/kolla-ansible/Dockerfile deleted file mode 100644 index dab386109..000000000 --- a/docker/centos/binary/kolla-ansible/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - git \ - gcc \ - libffi-devel \ - libxml2-devel \ - libxslt-devel \ - MySQL-python \ - openssl-devel \ - python-devel \ - openssh-clients \ - && yum clean all - -RUN pip install -U pip wheel \ - && pip install python-openstackclient shade - -RUN git clone --depth 1 https://github.com/ansible/ansible.git \ - && cd ansible \ - && git submodule update --init --recursive \ - && pip install . - -RUN mkdir -p /etc/ansible /usr/share/ansible \ - && echo 'localhost ansible_connection=local' > /etc/ansible/hosts - -COPY kolla_keystone_service.py kolla_keystone_user.py /usr/share/ansible/ diff --git a/docker/centos/binary/kolla-ansible/build b/docker/centos/binary/kolla-ansible/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/kolla-ansible/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/kolla-ansible/kolla_keystone_service.py b/docker/centos/binary/kolla-ansible/kolla_keystone_service.py deleted file mode 120000 index 835cfdf1b..000000000 --- a/docker/centos/binary/kolla-ansible/kolla_keystone_service.py +++ /dev/null @@ -1 +0,0 @@ -../../../common/kolla-ansible/kolla_keystone_service.py
\ No newline at end of file diff --git a/docker/centos/binary/kolla-ansible/kolla_keystone_user.py b/docker/centos/binary/kolla-ansible/kolla_keystone_user.py deleted file mode 120000 index e1070edaf..000000000 --- a/docker/centos/binary/kolla-ansible/kolla_keystone_user.py +++ /dev/null @@ -1 +0,0 @@ -../../../common/kolla-ansible/kolla_keystone_user.py
\ No newline at end of file diff --git a/docker/centos/binary/magnum/magnum-api/Dockerfile b/docker/centos/binary/magnum/magnum-api/Dockerfile deleted file mode 100644 index 580ceacc8..000000000 --- a/docker/centos/binary/magnum/magnum-api/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%magnum-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-magnum-api \ - && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/magnum/magnum-api/build b/docker/centos/binary/magnum/magnum-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/magnum/magnum-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/magnum/magnum-api/config-external.sh b/docker/centos/binary/magnum/magnum-api/config-external.sh deleted file mode 120000 index 746e2aa58..000000000 --- a/docker/centos/binary/magnum/magnum-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/magnum/magnum-api/start.sh b/docker/centos/binary/magnum/magnum-api/start.sh deleted file mode 120000 index 58cc9e37c..000000000 --- a/docker/centos/binary/magnum/magnum-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-api/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/magnum/magnum-base/Dockerfile b/docker/centos/binary/magnum/magnum-base/Dockerfile deleted file mode 100644 index 9928bec88..000000000 --- a/docker/centos/binary/magnum/magnum-base/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Magnum is not yet in upstream RDO packaging - -RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7/sdake-openstack-magnum-epel-7.repo -o /etc/yum.repos.d/sdake-openstack-magnum-epel-7.repo diff --git a/docker/centos/binary/magnum/magnum-base/build b/docker/centos/binary/magnum/magnum-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/magnum/magnum-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/magnum/magnum-conductor/Dockerfile b/docker/centos/binary/magnum/magnum-conductor/Dockerfile deleted file mode 100644 index 093ca5003..000000000 --- a/docker/centos/binary/magnum/magnum-conductor/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%magnum-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-magnum-conductor \ - tar \ - && yum clean all - -# Install kubectl binary (ugh) -RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl && rm -rf /tmp/kubernetes - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/magnum/magnum-conductor/build b/docker/centos/binary/magnum/magnum-conductor/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/magnum/magnum-conductor/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/magnum/magnum-conductor/config-external.sh b/docker/centos/binary/magnum/magnum-conductor/config-external.sh deleted file mode 120000 index 2d3f514d5..000000000 --- a/docker/centos/binary/magnum/magnum-conductor/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-conductor/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/magnum/magnum-conductor/start.sh b/docker/centos/binary/magnum/magnum-conductor/start.sh deleted file mode 120000 index 681863036..000000000 --- a/docker/centos/binary/magnum/magnum-conductor/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-conductor/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/memcached/Dockerfile b/docker/centos/binary/memcached/Dockerfile deleted file mode 100644 index 0e9cf86b3..000000000 --- a/docker/centos/binary/memcached/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install memcached && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/memcached/build b/docker/centos/binary/memcached/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/memcached/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/memcached/config-external.sh b/docker/centos/binary/memcached/config-external.sh deleted file mode 120000 index 1b684c65a..000000000 --- a/docker/centos/binary/memcached/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../docker/common/memcached/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/memcached/start.sh b/docker/centos/binary/memcached/start.sh deleted file mode 120000 index 93a7705bb..000000000 --- a/docker/centos/binary/memcached/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/memcached/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/mongodb/Dockerfile b/docker/centos/binary/mongodb/Dockerfile deleted file mode 100644 index e05047f02..000000000 --- a/docker/centos/binary/mongodb/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install mongodb mongodb-server && yum clean all - -RUN mkdir -p /data/db - -VOLUME /data/db -VOLUME /var/log/mongodb - -ENTRYPOINT exec /bin/mongod --dbpath /data/db --logpath /var/log/mongodb/mongo.log --noprealloc --smallfiles diff --git a/docker/centos/binary/mongodb/build b/docker/centos/binary/mongodb/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/mongodb/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/Dockerfile b/docker/centos/binary/neutron/neutron-agents/Dockerfile deleted file mode 100644 index 546c2a210..000000000 --- a/docker/centos/binary/neutron/neutron-agents/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Install supervisor -RUN easy_install supervisor - -# Install supervisor-stdout -RUN pip install supervisor-stdout - -# Configure supervisord -RUN mkdir -p /var/log/supervisor/ -COPY supervisord.conf /etc/ - -# TODO: SamYaple FWaaS is part of the l3-agent, not a seperate agent that is -# why this file is needed. To support FWaaS we cannot have a seperate container -# I need to figure out the best way to make this work together -# -# This file _does_ _not_ need to exist, you must remove referencing it from the -# exec line in the start script. Also all these config options can exist in the -# main neutron.conf if we wish -COPY fwaas_driver.ini /etc/neutron/ - -COPY neutron-dhcp-agent/ /opt/kolla/neutron-dhcp-agent -COPY neutron-l3-agent/ /opt/kolla/neutron-l3-agent -COPY neutron-metadata-agent/ /opt/kolla/neutron-metadata-agent - -CMD ["/usr/bin/supervisord"] diff --git a/docker/centos/binary/neutron/neutron-agents/build b/docker/centos/binary/neutron/neutron-agents/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/neutron/neutron-agents/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/fwaas_driver.ini b/docker/centos/binary/neutron/neutron-agents/fwaas_driver.ini deleted file mode 120000 index 0e016223c..000000000 --- a/docker/centos/binary/neutron/neutron-agents/fwaas_driver.ini +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-l3-agent/fwaas_driver.ini
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh b/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh deleted file mode 120000 index 680eee875..000000000 --- a/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-dhcp-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/start.sh b/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/start.sh deleted file mode 120000 index 63dad958d..000000000 --- a/docker/centos/binary/neutron/neutron-agents/neutron-dhcp-agent/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-dhcp-agent/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-external.sh b/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-external.sh deleted file mode 120000 index f4530afd9..000000000 --- a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-l3-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini b/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini deleted file mode 120000 index 8ea67959c..000000000 --- a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-l3-agent/fwaas_driver.ini
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/start.sh b/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/start.sh deleted file mode 120000 index fa70dec8b..000000000 --- a/docker/centos/binary/neutron/neutron-agents/neutron-l3-agent/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-l3-agent/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-external.sh b/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-external.sh deleted file mode 120000 index a5c3ac24a..000000000 --- a/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-metadata-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/start.sh b/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/start.sh deleted file mode 120000 index 0de2452ee..000000000 --- a/docker/centos/binary/neutron/neutron-agents/neutron-metadata-agent/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-metadata-agent/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-agents/supervisord.conf b/docker/centos/binary/neutron/neutron-agents/supervisord.conf deleted file mode 120000 index a7f24cb77..000000000 --- a/docker/centos/binary/neutron/neutron-agents/supervisord.conf +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-agents/supervisord.conf
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-base/Dockerfile b/docker/centos/binary/neutron/neutron-base/Dockerfile deleted file mode 100644 index b5a0639b4..000000000 --- a/docker/centos/binary/neutron/neutron-base/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-neutron \ - openstack-neutron-ml2 \ - openvswitch \ - && yum clean all - -# TODO (sdake): remove once RDO adds to the openstack-neutron package -RUN pip install oslo.versionedobjects - -COPY config-sudoers.sh /opt/kolla/ diff --git a/docker/centos/binary/neutron/neutron-base/build b/docker/centos/binary/neutron/neutron-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/neutron/neutron-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-base/config-sudoers.sh b/docker/centos/binary/neutron/neutron-base/config-sudoers.sh deleted file mode 120000 index 08e65f4d7..000000000 --- a/docker/centos/binary/neutron/neutron-base/config-sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-base/config-sudoers.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-linuxbridge-agent/Dockerfile b/docker/centos/binary/neutron/neutron-linuxbridge-agent/Dockerfile deleted file mode 100644 index 5d482f515..000000000 --- a/docker/centos/binary/neutron/neutron-linuxbridge-agent/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Install required packages -RUN yum install -y ebtables openstack-neutron-linuxbridge && \ - yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/neutron/neutron-linuxbridge-agent/build b/docker/centos/binary/neutron/neutron-linuxbridge-agent/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/neutron/neutron-linuxbridge-agent/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-linuxbridge-agent/config-external.sh b/docker/centos/binary/neutron/neutron-linuxbridge-agent/config-external.sh deleted file mode 120000 index 6bd77d67d..000000000 --- a/docker/centos/binary/neutron/neutron-linuxbridge-agent/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-linuxbridge-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-linuxbridge-agent/start.sh b/docker/centos/binary/neutron/neutron-linuxbridge-agent/start.sh deleted file mode 120000 index 9d51d3d6a..000000000 --- a/docker/centos/binary/neutron/neutron-linuxbridge-agent/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-linuxbridge-agent/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-openvswitch-agent/Dockerfile b/docker/centos/binary/neutron/neutron-openvswitch-agent/Dockerfile deleted file mode 100644 index 762f6b189..000000000 --- a/docker/centos/binary/neutron/neutron-openvswitch-agent/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Install required packages -RUN yum install -y openstack-neutron-openvswitch \ - openvswitch \ - && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/neutron/neutron-openvswitch-agent/build b/docker/centos/binary/neutron/neutron-openvswitch-agent/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/neutron/neutron-openvswitch-agent/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-openvswitch-agent/config-external.sh b/docker/centos/binary/neutron/neutron-openvswitch-agent/config-external.sh deleted file mode 120000 index 14354b71a..000000000 --- a/docker/centos/binary/neutron/neutron-openvswitch-agent/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-openvswitch-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-openvswitch-agent/start.sh b/docker/centos/binary/neutron/neutron-openvswitch-agent/start.sh deleted file mode 120000 index c14edb0ad..000000000 --- a/docker/centos/binary/neutron/neutron-openvswitch-agent/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-openvswitch-agent/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-server/Dockerfile b/docker/centos/binary/neutron/neutron-server/Dockerfile deleted file mode 100644 index de80f4ff8..000000000 --- a/docker/centos/binary/neutron/neutron-server/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Install required packages -RUN yum install -y which && \ - yum clean all - -# See bug: https://bugs.launchpad.net/kolla/+bug/1483667 -# TODO(SamYaple): Check in on this and remove once unneccesary -RUN pip install oslo.messaging==2.2.0 - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/neutron/neutron-server/build b/docker/centos/binary/neutron/neutron-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/neutron/neutron-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-server/config-external.sh b/docker/centos/binary/neutron/neutron-server/config-external.sh deleted file mode 120000 index b8d7792ce..000000000 --- a/docker/centos/binary/neutron/neutron-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/neutron/neutron-server/start.sh b/docker/centos/binary/neutron/neutron-server/start.sh deleted file mode 120000 index a11ea7703..000000000 --- a/docker/centos/binary/neutron/neutron-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-server/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-api/Dockerfile b/docker/centos/binary/nova/nova-api/Dockerfile deleted file mode 100644 index 751e574c3..000000000 --- a/docker/centos/binary/nova/nova-api/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-nova-api && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-api/build b/docker/centos/binary/nova/nova-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-api/config-external.sh b/docker/centos/binary/nova/nova-api/config-external.sh deleted file mode 120000 index fa9d355fe..000000000 --- a/docker/centos/binary/nova/nova-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-api/start.sh b/docker/centos/binary/nova/nova-api/start.sh deleted file mode 120000 index 12fd6f028..000000000 --- a/docker/centos/binary/nova/nova-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-api/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-base/Dockerfile b/docker/centos/binary/nova/nova-base/Dockerfile deleted file mode 100644 index ea56129b8..000000000 --- a/docker/centos/binary/nova/nova-base/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-nova-common \ - python-keystoneclient \ - python-cinderclient \ - python-nova \ - bridge-utils && yum clean all diff --git a/docker/centos/binary/nova/nova-base/build b/docker/centos/binary/nova/nova-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-compute/Dockerfile b/docker/centos/binary/nova/nova-compute/Dockerfile deleted file mode 100644 index 495e66b84..000000000 --- a/docker/centos/binary/nova/nova-compute/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-nova-compute \ - openvswitch \ - sysfsutils && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -VOLUME [ "/sys/fs/cgroup" ] - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-compute/build b/docker/centos/binary/nova/nova-compute/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-compute/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-compute/config-external.sh b/docker/centos/binary/nova/nova-compute/config-external.sh deleted file mode 120000 index bb13b939c..000000000 --- a/docker/centos/binary/nova/nova-compute/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-compute/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-compute/start.sh b/docker/centos/binary/nova/nova-compute/start.sh deleted file mode 120000 index 830400f9e..000000000 --- a/docker/centos/binary/nova/nova-compute/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-compute/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-conductor/Dockerfile b/docker/centos/binary/nova/nova-conductor/Dockerfile deleted file mode 100644 index b29362dc0..000000000 --- a/docker/centos/binary/nova/nova-conductor/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-nova-conductor && yum clean all - -COPY start.sh / - -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-conductor/build b/docker/centos/binary/nova/nova-conductor/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-conductor/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-conductor/config-external.sh b/docker/centos/binary/nova/nova-conductor/config-external.sh deleted file mode 120000 index d98f3a875..000000000 --- a/docker/centos/binary/nova/nova-conductor/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-conductor/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-conductor/start.sh b/docker/centos/binary/nova/nova-conductor/start.sh deleted file mode 120000 index 0eb07db61..000000000 --- a/docker/centos/binary/nova/nova-conductor/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-conductor/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-consoleauth/Dockerfile b/docker/centos/binary/nova/nova-consoleauth/Dockerfile deleted file mode 100644 index 48c5a866c..000000000 --- a/docker/centos/binary/nova/nova-consoleauth/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-nova-console && yum clean all - -COPY start.sh / - -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-consoleauth/build b/docker/centos/binary/nova/nova-consoleauth/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-consoleauth/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-consoleauth/config-external.sh b/docker/centos/binary/nova/nova-consoleauth/config-external.sh deleted file mode 120000 index b9d573470..000000000 --- a/docker/centos/binary/nova/nova-consoleauth/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-consoleauth/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-consoleauth/start.sh b/docker/centos/binary/nova/nova-consoleauth/start.sh deleted file mode 120000 index 658be8e2a..000000000 --- a/docker/centos/binary/nova/nova-consoleauth/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-consoleauth/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-libvirt/Dockerfile b/docker/centos/binary/nova/nova-libvirt/Dockerfile deleted file mode 100644 index 856cab73e..000000000 --- a/docker/centos/binary/nova/nova-libvirt/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -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 / - -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-libvirt/build b/docker/centos/binary/nova/nova-libvirt/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-libvirt/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-libvirt/config-external.sh b/docker/centos/binary/nova/nova-libvirt/config-external.sh deleted file mode 120000 index e16a4f542..000000000 --- a/docker/centos/binary/nova/nova-libvirt/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-libvirt/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-libvirt/start.sh b/docker/centos/binary/nova/nova-libvirt/start.sh deleted file mode 120000 index 63ca58e26..000000000 --- a/docker/centos/binary/nova/nova-libvirt/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-libvirt/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-network/Dockerfile b/docker/centos/binary/nova/nova-network/Dockerfile deleted file mode 100644 index 86cb3ccf8..000000000 --- a/docker/centos/binary/nova/nova-network/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-nova-network \ - bridge-utils initscripts && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-network/build b/docker/centos/binary/nova/nova-network/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-network/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-network/config-external.sh b/docker/centos/binary/nova/nova-network/config-external.sh deleted file mode 120000 index 086eac04e..000000000 --- a/docker/centos/binary/nova/nova-network/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-network/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-network/start.sh b/docker/centos/binary/nova/nova-network/start.sh deleted file mode 120000 index 89c974d80..000000000 --- a/docker/centos/binary/nova/nova-network/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-network/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-novncproxy/Dockerfile b/docker/centos/binary/nova/nova-novncproxy/Dockerfile deleted file mode 100644 index 9ca170a88..000000000 --- a/docker/centos/binary/nova/nova-novncproxy/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - novnc openstack-nova-novncproxy && \ - yum clean all - -COPY start.sh / - -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-novncproxy/build b/docker/centos/binary/nova/nova-novncproxy/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-novncproxy/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-novncproxy/config-external.sh b/docker/centos/binary/nova/nova-novncproxy/config-external.sh deleted file mode 120000 index 8d2a91810..000000000 --- a/docker/centos/binary/nova/nova-novncproxy/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-novncproxy/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-novncproxy/start.sh b/docker/centos/binary/nova/nova-novncproxy/start.sh deleted file mode 120000 index b57c6a318..000000000 --- a/docker/centos/binary/nova/nova-novncproxy/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-novncproxy/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-scheduler/Dockerfile b/docker/centos/binary/nova/nova-scheduler/Dockerfile deleted file mode 100644 index db7c11769..000000000 --- a/docker/centos/binary/nova/nova-scheduler/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-nova-scheduler && yum clean all - -COPY start.sh / - -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/nova/nova-scheduler/build b/docker/centos/binary/nova/nova-scheduler/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/nova/nova-scheduler/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-scheduler/config-external.sh b/docker/centos/binary/nova/nova-scheduler/config-external.sh deleted file mode 120000 index ef9c60c29..000000000 --- a/docker/centos/binary/nova/nova-scheduler/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-scheduler/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/nova/nova-scheduler/start.sh b/docker/centos/binary/nova/nova-scheduler/start.sh deleted file mode 120000 index b73e07a6a..000000000 --- a/docker/centos/binary/nova/nova-scheduler/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-scheduler/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-base/Dockerfile b/docker/centos/binary/openvswitch/ovs-base/Dockerfile deleted file mode 100644 index 7d4ade54c..000000000 --- a/docker/centos/binary/openvswitch/ovs-base/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y openvswitch \ - && yum clean all diff --git a/docker/centos/binary/openvswitch/ovs-base/build b/docker/centos/binary/openvswitch/ovs-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/openvswitch/ovs-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile b/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile deleted file mode 100644 index 8dcc5dc67..000000000 --- a/docker/centos/binary/openvswitch/ovs-db-server/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ovs-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/openvswitch/ovs-db-server/build b/docker/centos/binary/openvswitch/ovs-db-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/openvswitch/ovs-db-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh b/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh deleted file mode 120000 index 36670d77d..000000000 --- a/docker/centos/binary/openvswitch/ovs-db-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-db-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-db-server/start.sh b/docker/centos/binary/openvswitch/ovs-db-server/start.sh deleted file mode 120000 index 145b2426f..000000000 --- a/docker/centos/binary/openvswitch/ovs-db-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-db-server/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile b/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile deleted file mode 100644 index bb7ec8c67..000000000 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ovs-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY ovs_ensure_configured.sh config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/build b/docker/centos/binary/openvswitch/ovs-vswitchd/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh deleted file mode 120000 index 39b5c7dd6..000000000 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-vswitchd/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh deleted file mode 120000 index 19efaf06a..000000000 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh
\ No newline at end of file diff --git a/docker/centos/binary/openvswitch/ovs-vswitchd/start.sh b/docker/centos/binary/openvswitch/ovs-vswitchd/start.sh deleted file mode 120000 index c1038c338..000000000 --- a/docker/centos/binary/openvswitch/ovs-vswitchd/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/openvswitch/ovs-vswitchd/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/rabbitmq/Dockerfile b/docker/centos/binary/rabbitmq/Dockerfile deleted file mode 100644 index 88894c3c7..000000000 --- a/docker/centos/binary/rabbitmq/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - hostname \ - rabbitmq-server && \ - yum clean all && \ - /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management \ - && rm -rf /var/lib/rabbitmq/* - -COPY config-rabbit.sh config-external.sh /opt/kolla/ -COPY start.sh / - -CMD ["/start.sh"] diff --git a/docker/centos/binary/rabbitmq/build b/docker/centos/binary/rabbitmq/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/rabbitmq/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/rabbitmq/config-external.sh b/docker/centos/binary/rabbitmq/config-external.sh deleted file mode 120000 index e02e664c8..000000000 --- a/docker/centos/binary/rabbitmq/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/rabbitmq/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/rabbitmq/config-rabbit.sh b/docker/centos/binary/rabbitmq/config-rabbit.sh deleted file mode 120000 index 6feee2aba..000000000 --- a/docker/centos/binary/rabbitmq/config-rabbit.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/rabbitmq/config-rabbit.sh
\ No newline at end of file diff --git a/docker/centos/binary/rabbitmq/start.sh b/docker/centos/binary/rabbitmq/start.sh deleted file mode 120000 index 035f55e26..000000000 --- a/docker/centos/binary/rabbitmq/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/rabbitmq/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-account-server/Dockerfile b/docker/centos/binary/swift/swift-account-server/Dockerfile deleted file mode 100644 index 3ceac3a63..000000000 --- a/docker/centos/binary/swift/swift-account-server/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-swift-account \ - && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-account-server/build b/docker/centos/binary/swift/swift-account-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/swift/swift-account-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-account-server/config-external.sh b/docker/centos/binary/swift/swift-account-server/config-external.sh deleted file mode 120000 index 93a15ca3b..000000000 --- a/docker/centos/binary/swift/swift-account-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-account-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-account-server/start.sh b/docker/centos/binary/swift/swift-account-server/start.sh deleted file mode 120000 index acf6b18d7..000000000 --- a/docker/centos/binary/swift/swift-account-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-account-server/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-base/Dockerfile b/docker/centos/binary/swift/swift-base/Dockerfile deleted file mode 100644 index d31f9ebf6..000000000 --- a/docker/centos/binary/swift/swift-base/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-swift && yum clean all - -COPY config-swift.sh build-swift-ring.py /opt/kolla/ - -RUN mkdir /opt/swift diff --git a/docker/centos/binary/swift/swift-base/build b/docker/centos/binary/swift/swift-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/swift/swift-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-base/config-swift.sh b/docker/centos/binary/swift/swift-base/config-swift.sh deleted file mode 120000 index fb883f482..000000000 --- a/docker/centos/binary/swift/swift-base/config-swift.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-base/config-swift.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-container-server/Dockerfile b/docker/centos/binary/swift/swift-container-server/Dockerfile deleted file mode 100644 index c370032d1..000000000 --- a/docker/centos/binary/swift/swift-container-server/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-swift-container \ - && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-container-server/build b/docker/centos/binary/swift/swift-container-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/swift/swift-container-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-container-server/config-external.sh b/docker/centos/binary/swift/swift-container-server/config-external.sh deleted file mode 120000 index 8fa814ca7..000000000 --- a/docker/centos/binary/swift/swift-container-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-container-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-container-server/start.sh b/docker/centos/binary/swift/swift-container-server/start.sh deleted file mode 120000 index b7d3cd9fc..000000000 --- a/docker/centos/binary/swift/swift-container-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-container-server/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-auditor/Dockerfile b/docker/centos/binary/swift/swift-object-auditor/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/binary/swift/swift-object-auditor/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-object-auditor/build b/docker/centos/binary/swift/swift-object-auditor/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/swift/swift-object-auditor/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-auditor/config-external.sh b/docker/centos/binary/swift/swift-object-auditor/config-external.sh deleted file mode 120000 index 1adf26bcb..000000000 --- a/docker/centos/binary/swift/swift-object-auditor/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-auditor/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-auditor/start.sh b/docker/centos/binary/swift/swift-object-auditor/start.sh deleted file mode 120000 index 5ef316559..000000000 --- a/docker/centos/binary/swift/swift-object-auditor/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-auditor/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-base/Dockerfile b/docker/centos/binary/swift/swift-object-base/Dockerfile deleted file mode 100644 index c41502e6c..000000000 --- a/docker/centos/binary/swift/swift-object-base/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-swift-object \ - && yum clean all - -COPY config-swift-object.sh /opt/kolla/ diff --git a/docker/centos/binary/swift/swift-object-base/build b/docker/centos/binary/swift/swift-object-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/swift/swift-object-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-base/config-swift-object.sh b/docker/centos/binary/swift/swift-object-base/config-swift-object.sh deleted file mode 120000 index a289b4d0d..000000000 --- a/docker/centos/binary/swift/swift-object-base/config-swift-object.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-base/config-swift-object.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-expirer/Dockerfile b/docker/centos/binary/swift/swift-object-expirer/Dockerfile deleted file mode 100644 index 3f3b941c7..000000000 --- a/docker/centos/binary/swift/swift-object-expirer/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - openstack-swift-proxy \ - openstack-swift-container \ - && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-object-expirer/build b/docker/centos/binary/swift/swift-object-expirer/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/swift/swift-object-expirer/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-expirer/config-external.sh b/docker/centos/binary/swift/swift-object-expirer/config-external.sh deleted file mode 120000 index 7f8d3e37e..000000000 --- a/docker/centos/binary/swift/swift-object-expirer/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-expirer/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-expirer/start.sh b/docker/centos/binary/swift/swift-object-expirer/start.sh deleted file mode 120000 index 3b9a9c3ee..000000000 --- a/docker/centos/binary/swift/swift-object-expirer/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-expirer/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-replicator/Dockerfile b/docker/centos/binary/swift/swift-object-replicator/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/binary/swift/swift-object-replicator/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-object-replicator/build b/docker/centos/binary/swift/swift-object-replicator/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/swift/swift-object-replicator/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-replicator/config-external.sh b/docker/centos/binary/swift/swift-object-replicator/config-external.sh deleted file mode 120000 index 69e793df4..000000000 --- a/docker/centos/binary/swift/swift-object-replicator/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-replicator/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-replicator/start.sh b/docker/centos/binary/swift/swift-object-replicator/start.sh deleted file mode 120000 index da27b6312..000000000 --- a/docker/centos/binary/swift/swift-object-replicator/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-replicator/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-server/Dockerfile b/docker/centos/binary/swift/swift-object-server/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/binary/swift/swift-object-server/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-object-server/build b/docker/centos/binary/swift/swift-object-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/swift/swift-object-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-server/config-external.sh b/docker/centos/binary/swift/swift-object-server/config-external.sh deleted file mode 120000 index a9213fffa..000000000 --- a/docker/centos/binary/swift/swift-object-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-server/start.sh b/docker/centos/binary/swift/swift-object-server/start.sh deleted file mode 120000 index 7e47f8018..000000000 --- a/docker/centos/binary/swift/swift-object-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-server/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-updater/Dockerfile b/docker/centos/binary/swift/swift-object-updater/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/binary/swift/swift-object-updater/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-object-updater/build b/docker/centos/binary/swift/swift-object-updater/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/swift/swift-object-updater/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-updater/config-external.sh b/docker/centos/binary/swift/swift-object-updater/config-external.sh deleted file mode 120000 index 94ba9e60c..000000000 --- a/docker/centos/binary/swift/swift-object-updater/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-updater/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-object-updater/start.sh b/docker/centos/binary/swift/swift-object-updater/start.sh deleted file mode 120000 index 2e78e5c09..000000000 --- a/docker/centos/binary/swift/swift-object-updater/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-updater/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-proxy-server/Dockerfile b/docker/centos/binary/swift/swift-proxy-server/Dockerfile deleted file mode 100644 index 2cc54e938..000000000 --- a/docker/centos/binary/swift/swift-proxy-server/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-swift-proxy && yum clean all - -COPY ./start.sh /start.sh - -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/swift/swift-proxy-server/build b/docker/centos/binary/swift/swift-proxy-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/binary/swift/swift-proxy-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-proxy-server/config-external.sh b/docker/centos/binary/swift/swift-proxy-server/config-external.sh deleted file mode 120000 index 178516af5..000000000 --- a/docker/centos/binary/swift/swift-proxy-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-proxy-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/swift/swift-proxy-server/start.sh b/docker/centos/binary/swift/swift-proxy-server/start.sh deleted file mode 120000 index 63d0ec91a..000000000 --- a/docker/centos/binary/swift/swift-proxy-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-proxy-server/start.sh
\ No newline at end of file diff --git a/docker/centos/binary/zaqar/Dockerfile b/docker/centos/binary/zaqar/Dockerfile deleted file mode 100644 index cb6217d26..000000000 --- a/docker/centos/binary/zaqar/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install openstack-zaqar && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/binary/zaqar/build b/docker/centos/binary/zaqar/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/binary/zaqar/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/binary/zaqar/config-external.sh b/docker/centos/binary/zaqar/config-external.sh deleted file mode 120000 index 38fff40d1..000000000 --- a/docker/centos/binary/zaqar/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/zaqar/config-external.sh
\ No newline at end of file diff --git a/docker/centos/binary/zaqar/start.sh b/docker/centos/binary/zaqar/start.sh deleted file mode 120000 index 48134a044..000000000 --- a/docker/centos/binary/zaqar/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/zaqar/start.sh
\ No newline at end of file diff --git a/docker/centos/rdo b/docker/centos/rdo deleted file mode 120000 index cab89b7b4..000000000 --- a/docker/centos/rdo +++ /dev/null @@ -1 +0,0 @@ -binary
\ No newline at end of file diff --git a/docker/centos/source/base/Dockerfile b/docker/centos/source/base/Dockerfile deleted file mode 100644 index 43e8d1a76..000000000 --- a/docker/centos/source/base/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -FROM centos -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Dependencies required for building/installing source components -RUN yum install -y \ - epel-release \ - gcc \ - gcc-c++ \ - git \ - libffi-devel \ - libxml2-devel \ - libxslt-devel \ - mariadb \ - mariadb-devel \ - mysql-devel \ - MySQL-python \ - openldap-devel \ - openssl \ - openssl-devel \ - postgresql \ - postgresql-devel \ - python-devel \ - python-oslo-policy \ - sqlite-devel \ - tar \ - && yum clean all - -RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ - && python get-pip.py \ - && rm get-pip.py - -RUN pip install --upgrade \ - cachetools \ - crudini \ - pip \ - tox - -COPY kolla-common.sh /opt/kolla/ diff --git a/docker/centos/source/base/build b/docker/centos/source/base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/source/base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/base/kolla-common.sh b/docker/centos/source/base/kolla-common.sh deleted file mode 120000 index c265c62f7..000000000 --- a/docker/centos/source/base/kolla-common.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/kolla-common.sh
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile deleted file mode 100644 index 86cf40d92..000000000 --- a/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/build b/docker/centos/source/ceilometer/ceilometer-alarm/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-alarm/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/config-external.sh b/docker/centos/source/ceilometer/ceilometer-alarm/config-external.sh deleted file mode 120000 index 0a48ebf52..000000000 --- a/docker/centos/source/ceilometer/ceilometer-alarm/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-alarm/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/start.sh b/docker/centos/source/ceilometer/ceilometer-alarm/start.sh deleted file mode 120000 index ed3ac528d..000000000 --- a/docker/centos/source/ceilometer/ceilometer-alarm/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-alarm/start.sh
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-api/Dockerfile b/docker/centos/source/ceilometer/ceilometer-api/Dockerfile deleted file mode 100644 index 5db74a001..000000000 --- a/docker/centos/source/ceilometer/ceilometer-api/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-api/build b/docker/centos/source/ceilometer/ceilometer-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-api/config-external.sh b/docker/centos/source/ceilometer/ceilometer-api/config-external.sh deleted file mode 120000 index 4ea59dad7..000000000 --- a/docker/centos/source/ceilometer/ceilometer-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-api/start.sh b/docker/centos/source/ceilometer/ceilometer-api/start.sh deleted file mode 120000 index 7acfa2cba..000000000 --- a/docker/centos/source/ceilometer/ceilometer-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-api/start.sh
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-base/.buildinfo b/docker/centos/source/ceilometer/ceilometer-base/.buildinfo deleted file mode 100644 index 70bd3d7d3..000000000 --- a/docker/centos/source/ceilometer/ceilometer-base/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=ceilometer -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/ceilometer} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/ceilometer/ceilometer-master.tar.gz} diff --git a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile b/docker/centos/source/ceilometer/ceilometer-base/Dockerfile deleted file mode 100644 index 0b4e0e63d..000000000 --- a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./ceilometer.tar / -RUN ln -s /ceilometer-* /ceilometer - -RUN cd /ceilometer \ - && useradd --user-group ceilometer \ - && pip install -r requirements.txt \ - && pip install /ceilometer \ - && mkdir /etc/ceilometer /var/log/ceilometer \ - && cp -r /ceilometer/etc/* /etc/ceilometer/ \ - && rm -rf /root/.cache - -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-base/build b/docker/centos/source/ceilometer/ceilometer-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-central/Dockerfile b/docker/centos/source/ceilometer/ceilometer-central/Dockerfile deleted file mode 100644 index 86cf40d92..000000000 --- a/docker/centos/source/ceilometer/ceilometer-central/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-central/build b/docker/centos/source/ceilometer/ceilometer-central/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-central/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-central/config-external.sh b/docker/centos/source/ceilometer/ceilometer-central/config-external.sh deleted file mode 120000 index cfc69e75d..000000000 --- a/docker/centos/source/ceilometer/ceilometer-central/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-central/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-central/start.sh b/docker/centos/source/ceilometer/ceilometer-central/start.sh deleted file mode 120000 index 8df383cd1..000000000 --- a/docker/centos/source/ceilometer/ceilometer-central/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-central/start.sh
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile b/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile deleted file mode 100644 index 86cf40d92..000000000 --- a/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-collector/build b/docker/centos/source/ceilometer/ceilometer-collector/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-collector/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-collector/config-external.sh b/docker/centos/source/ceilometer/ceilometer-collector/config-external.sh deleted file mode 120000 index e16dcecc1..000000000 --- a/docker/centos/source/ceilometer/ceilometer-collector/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-collector/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-collector/start.sh b/docker/centos/source/ceilometer/ceilometer-collector/start.sh deleted file mode 120000 index bea2eb09c..000000000 --- a/docker/centos/source/ceilometer/ceilometer-collector/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-collector/start.sh
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile b/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile deleted file mode 100644 index 86cf40d92..000000000 --- a/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-compute/build b/docker/centos/source/ceilometer/ceilometer-compute/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-compute/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-compute/config-external.sh b/docker/centos/source/ceilometer/ceilometer-compute/config-external.sh deleted file mode 120000 index 1d0c728e5..000000000 --- a/docker/centos/source/ceilometer/ceilometer-compute/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-compute/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-compute/start.sh b/docker/centos/source/ceilometer/ceilometer-compute/start.sh deleted file mode 120000 index 1118b9552..000000000 --- a/docker/centos/source/ceilometer/ceilometer-compute/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-compute/start.sh
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile b/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile deleted file mode 100644 index 86cf40d92..000000000 --- a/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/ceilometer/ceilometer-notification/build b/docker/centos/source/ceilometer/ceilometer-notification/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/ceilometer/ceilometer-notification/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-notification/config-external.sh b/docker/centos/source/ceilometer/ceilometer-notification/config-external.sh deleted file mode 120000 index 12d98d9ee..000000000 --- a/docker/centos/source/ceilometer/ceilometer-notification/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-notification/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/ceilometer/ceilometer-notification/start.sh b/docker/centos/source/ceilometer/ceilometer-notification/start.sh deleted file mode 120000 index 8e6d4e337..000000000 --- a/docker/centos/source/ceilometer/ceilometer-notification/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/ceilometer/ceilometer-notification/start.sh
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-api/Dockerfile b/docker/centos/source/cinder/cinder-api/Dockerfile deleted file mode 100644 index 99200d910..000000000 --- a/docker/centos/source/cinder/cinder-api/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN pip install python-keystoneclient - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/cinder/cinder-api/build b/docker/centos/source/cinder/cinder-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/cinder/cinder-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-api/config-external.sh b/docker/centos/source/cinder/cinder-api/config-external.sh deleted file mode 120000 index 0e9409e98..000000000 --- a/docker/centos/source/cinder/cinder-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-api/start.sh b/docker/centos/source/cinder/cinder-api/start.sh deleted file mode 120000 index 4b6c5f104..000000000 --- a/docker/centos/source/cinder/cinder-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-api/start.sh
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-backup/Dockerfile b/docker/centos/source/cinder/cinder-backup/Dockerfile deleted file mode 100644 index 70b8d8202..000000000 --- a/docker/centos/source/cinder/cinder-backup/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/cinder/cinder-backup/build b/docker/centos/source/cinder/cinder-backup/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/cinder/cinder-backup/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-backup/config-external.sh b/docker/centos/source/cinder/cinder-backup/config-external.sh deleted file mode 120000 index 4c6f65d40..000000000 --- a/docker/centos/source/cinder/cinder-backup/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-backup/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-backup/start.sh b/docker/centos/source/cinder/cinder-backup/start.sh deleted file mode 120000 index 62ae41b03..000000000 --- a/docker/centos/source/cinder/cinder-backup/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-backup/start.sh
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-base/.buildinfo b/docker/centos/source/cinder/cinder-base/.buildinfo deleted file mode 100644 index 05cb8abab..000000000 --- a/docker/centos/source/cinder/cinder-base/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=cinder -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/cinder} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/cinder/cinder-master.tar.gz} diff --git a/docker/centos/source/cinder/cinder-base/Dockerfile b/docker/centos/source/cinder/cinder-base/Dockerfile deleted file mode 100644 index 209895b17..000000000 --- a/docker/centos/source/cinder/cinder-base/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./cinder.tar / -RUN ln -s /cinder-* /cinder - -RUN yum -y install lvm2 \ - && yum clean all \ - && cd /cinder \ - && useradd --user-group cinder \ - && pip install -r requirements.txt \ - && pip install /cinder \ - && mkdir /etc/cinder /var/log/cinder \ - && cp -r /cinder/etc/cinder/* /etc/cinder/ \ - && chown -R cinder: /etc/cinder /var/log/cinder \ - && rm -rf /root/.cache \ - && sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \ - && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf - -# NOTE(sdake): The sed operations make LVM tools work inside a container - see -# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw diff --git a/docker/centos/source/cinder/cinder-base/build b/docker/centos/source/cinder/cinder-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/cinder/cinder-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-scheduler/Dockerfile b/docker/centos/source/cinder/cinder-scheduler/Dockerfile deleted file mode 100644 index 70b8d8202..000000000 --- a/docker/centos/source/cinder/cinder-scheduler/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/cinder/cinder-scheduler/build b/docker/centos/source/cinder/cinder-scheduler/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/cinder/cinder-scheduler/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-scheduler/config-external.sh b/docker/centos/source/cinder/cinder-scheduler/config-external.sh deleted file mode 120000 index f6d26aba5..000000000 --- a/docker/centos/source/cinder/cinder-scheduler/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-scheduler/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-scheduler/start.sh b/docker/centos/source/cinder/cinder-scheduler/start.sh deleted file mode 120000 index 0953c6457..000000000 --- a/docker/centos/source/cinder/cinder-scheduler/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-scheduler/start.sh
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-volume/Dockerfile b/docker/centos/source/cinder/cinder-volume/Dockerfile deleted file mode 100644 index c7d6c9446..000000000 --- a/docker/centos/source/cinder/cinder-volume/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Install required packages -RUN yum install -y \ - lvm2 \ - scsi-target-utils \ - && yum clean all - -# Add start scripts -COPY config-external.sh /opt/kolla/ -COPY start.sh /start.sh - -CMD ["/start.sh"] diff --git a/docker/centos/source/cinder/cinder-volume/build b/docker/centos/source/cinder/cinder-volume/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/cinder/cinder-volume/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-volume/config-external.sh b/docker/centos/source/cinder/cinder-volume/config-external.sh deleted file mode 120000 index abcdd6bc4..000000000 --- a/docker/centos/source/cinder/cinder-volume/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-volume/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/cinder/cinder-volume/start.sh b/docker/centos/source/cinder/cinder-volume/start.sh deleted file mode 120000 index 471a5ebd7..000000000 --- a/docker/centos/source/cinder/cinder-volume/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/cinder/cinder-volume/start.sh
\ No newline at end of file diff --git a/docker/centos/source/data/Dockerfile b/docker/centos/source/data/Dockerfile deleted file mode 100644 index 635918540..000000000 --- a/docker/centos/source/data/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM centos -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -CMD /bin/sleep infinity diff --git a/docker/centos/source/data/build b/docker/centos/source/data/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/source/data/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-api/Dockerfile b/docker/centos/source/designate/designate-api/Dockerfile deleted file mode 100644 index eac73ff52..000000000 --- a/docker/centos/source/designate/designate-api/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-api/build b/docker/centos/source/designate/designate-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/designate/designate-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-api/config-external.sh b/docker/centos/source/designate/designate-api/config-external.sh deleted file mode 120000 index da641a600..000000000 --- a/docker/centos/source/designate/designate-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-api/start.sh b/docker/centos/source/designate/designate-api/start.sh deleted file mode 120000 index f96fe1a34..000000000 --- a/docker/centos/source/designate/designate-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-api/start.sh
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-backend-bind9/Dockerfile b/docker/centos/source/designate/designate-backend-bind9/Dockerfile deleted file mode 100644 index eac73ff52..000000000 --- a/docker/centos/source/designate/designate-backend-bind9/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-backend-bind9/build b/docker/centos/source/designate/designate-backend-bind9/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/designate/designate-backend-bind9/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-backend-bind9/config-external.sh b/docker/centos/source/designate/designate-backend-bind9/config-external.sh deleted file mode 120000 index 98eabc775..000000000 --- a/docker/centos/source/designate/designate-backend-bind9/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-backend-bind9/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-backend-bind9/start.sh b/docker/centos/source/designate/designate-backend-bind9/start.sh deleted file mode 120000 index 918411fa1..000000000 --- a/docker/centos/source/designate/designate-backend-bind9/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-backend-bind9/start.sh
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-base/.buildinfo b/docker/centos/source/designate/designate-base/.buildinfo deleted file mode 100644 index de3736376..000000000 --- a/docker/centos/source/designate/designate-base/.buildinfo +++ /dev/null @@ -1,11 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=designate -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/designate} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/designate/designate-master.tar.gz} - diff --git a/docker/centos/source/designate/designate-base/Dockerfile b/docker/centos/source/designate/designate-base/Dockerfile deleted file mode 100644 index f8210a432..000000000 --- a/docker/centos/source/designate/designate-base/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./designate.tar / -RUN ln -s /designate-* /designate - -RUN cd /designate \ - && useradd --user-group designate \ - && pip install -r requirements.txt \ - && pip install /designate \ - && mkdir /etc/designate /var/log/designate \ - && cp -r /designate/etc/designate/* /etc/designate/ \ - && rm -rf /root/.cache - -CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-base/build b/docker/centos/source/designate/designate-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/designate/designate-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-central/Dockerfile b/docker/centos/source/designate/designate-central/Dockerfile deleted file mode 100644 index eac73ff52..000000000 --- a/docker/centos/source/designate/designate-central/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-central/build b/docker/centos/source/designate/designate-central/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/designate/designate-central/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-central/config-external.sh b/docker/centos/source/designate/designate-central/config-external.sh deleted file mode 120000 index abe5bcd39..000000000 --- a/docker/centos/source/designate/designate-central/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-central/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-central/start.sh b/docker/centos/source/designate/designate-central/start.sh deleted file mode 120000 index 9e0a8c484..000000000 --- a/docker/centos/source/designate/designate-central/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-central/start.sh
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-mdns/Dockerfile b/docker/centos/source/designate/designate-mdns/Dockerfile deleted file mode 100644 index eac73ff52..000000000 --- a/docker/centos/source/designate/designate-mdns/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-mdns/build b/docker/centos/source/designate/designate-mdns/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/designate/designate-mdns/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-mdns/config-external.sh b/docker/centos/source/designate/designate-mdns/config-external.sh deleted file mode 120000 index e450238fc..000000000 --- a/docker/centos/source/designate/designate-mdns/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-mdns/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-mdns/start.sh b/docker/centos/source/designate/designate-mdns/start.sh deleted file mode 120000 index f7bf747fc..000000000 --- a/docker/centos/source/designate/designate-mdns/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-mdns/start.sh
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-poolmanager/Dockerfile b/docker/centos/source/designate/designate-poolmanager/Dockerfile deleted file mode 100644 index eac73ff52..000000000 --- a/docker/centos/source/designate/designate-poolmanager/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-poolmanager/build b/docker/centos/source/designate/designate-poolmanager/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/designate/designate-poolmanager/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-poolmanager/config-external.sh b/docker/centos/source/designate/designate-poolmanager/config-external.sh deleted file mode 120000 index 461acb12a..000000000 --- a/docker/centos/source/designate/designate-poolmanager/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-poolmanager/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-poolmanager/start.sh b/docker/centos/source/designate/designate-poolmanager/start.sh deleted file mode 120000 index cc428b4fe..000000000 --- a/docker/centos/source/designate/designate-poolmanager/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-poolmanager/start.sh
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-sink/Dockerfile b/docker/centos/source/designate/designate-sink/Dockerfile deleted file mode 100644 index eac73ff52..000000000 --- a/docker/centos/source/designate/designate-sink/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/designate/designate-sink/build b/docker/centos/source/designate/designate-sink/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/designate/designate-sink/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-sink/config-external.sh b/docker/centos/source/designate/designate-sink/config-external.sh deleted file mode 120000 index edc94e6e4..000000000 --- a/docker/centos/source/designate/designate-sink/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-sink/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/designate/designate-sink/start.sh b/docker/centos/source/designate/designate-sink/start.sh deleted file mode 120000 index 751b58345..000000000 --- a/docker/centos/source/designate/designate-sink/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/designate/designate-sink/start.sh
\ No newline at end of file diff --git a/docker/centos/source/glance/glance-api/Dockerfile b/docker/centos/source/glance/glance-api/Dockerfile deleted file mode 100644 index c3c0fd9d1..000000000 --- a/docker/centos/source/glance/glance-api/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/glance/glance-api/build b/docker/centos/source/glance/glance-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/glance/glance-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/glance/glance-api/config-external.sh b/docker/centos/source/glance/glance-api/config-external.sh deleted file mode 120000 index 46a22b7b3..000000000 --- a/docker/centos/source/glance/glance-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/glance/glance-api/start.sh b/docker/centos/source/glance/glance-api/start.sh deleted file mode 120000 index 6740e1fe9..000000000 --- a/docker/centos/source/glance/glance-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-api/start.sh
\ No newline at end of file diff --git a/docker/centos/source/glance/glance-base/.buildinfo b/docker/centos/source/glance/glance-base/.buildinfo deleted file mode 100644 index 19c048a7e..000000000 --- a/docker/centos/source/glance/glance-base/.buildinfo +++ /dev/null @@ -1,9 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf -COMPONENT=glance -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/glance} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/glance/glance-master.tar.gz} diff --git a/docker/centos/source/glance/glance-base/Dockerfile b/docker/centos/source/glance/glance-base/Dockerfile deleted file mode 100644 index b2a41c49a..000000000 --- a/docker/centos/source/glance/glance-base/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./glance.tar / -RUN ln -s /glance-* /glance - -RUN cd /glance \ - && useradd --user-group glance \ - && pip install -r requirements.txt \ - && pip install /glance \ - && mkdir /etc/glance /var/log/glance \ - && cp -r /glance/etc/* /etc/glance/ \ - && chown -R glance: /etc/glance /var/log/glance \ - && rm -rf /root/.cache - -CMD ["/start.sh"] diff --git a/docker/centos/source/glance/glance-base/build b/docker/centos/source/glance/glance-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/glance/glance-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/glance/glance-registry/Dockerfile b/docker/centos/source/glance/glance-registry/Dockerfile deleted file mode 100644 index 22e3fcb10..000000000 --- a/docker/centos/source/glance/glance-registry/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY config-external.sh /opt/kolla/ - -COPY start.sh / -CMD ["/start.sh"] diff --git a/docker/centos/source/glance/glance-registry/build b/docker/centos/source/glance/glance-registry/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/glance/glance-registry/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/glance/glance-registry/config-external.sh b/docker/centos/source/glance/glance-registry/config-external.sh deleted file mode 120000 index cfcbd1391..000000000 --- a/docker/centos/source/glance/glance-registry/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-registry/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/glance/glance-registry/start.sh b/docker/centos/source/glance/glance-registry/start.sh deleted file mode 120000 index 1295cdc31..000000000 --- a/docker/centos/source/glance/glance-registry/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-registry/start.sh
\ No newline at end of file diff --git a/docker/centos/source/gnocchi/gnocchi-api/Dockerfile b/docker/centos/source/gnocchi/gnocchi-api/Dockerfile deleted file mode 100644 index ad16c6e00..000000000 --- a/docker/centos/source/gnocchi/gnocchi-api/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/gnocchi/gnocchi-api/build b/docker/centos/source/gnocchi/gnocchi-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/gnocchi/gnocchi-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/gnocchi/gnocchi-api/config-external.sh b/docker/centos/source/gnocchi/gnocchi-api/config-external.sh deleted file mode 120000 index 471d03664..000000000 --- a/docker/centos/source/gnocchi/gnocchi-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/gnocchi/gnocchi-api/start.sh b/docker/centos/source/gnocchi/gnocchi-api/start.sh deleted file mode 120000 index 99320c6d0..000000000 --- a/docker/centos/source/gnocchi/gnocchi-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-api/start.sh
\ No newline at end of file diff --git a/docker/centos/source/gnocchi/gnocchi-base/.buildinfo b/docker/centos/source/gnocchi/gnocchi-base/.buildinfo deleted file mode 100644 index a89f3419d..000000000 --- a/docker/centos/source/gnocchi/gnocchi-base/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=gnocchi -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/gnocchi} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/gnocchi/gnocchi-master.tar.gz} diff --git a/docker/centos/source/gnocchi/gnocchi-base/Dockerfile b/docker/centos/source/gnocchi/gnocchi-base/Dockerfile deleted file mode 100644 index 78bd361d8..000000000 --- a/docker/centos/source/gnocchi/gnocchi-base/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./gnocchi.tar / -RUN ln -s /gnocchi-* /gnocchi - -RUN cd /gnocchi \ - && useradd --user-group gnocchi \ - && pip install -r requirements.txt \ - && pip install /gnocchi \ - && mkdir /etc/gnocchi /var/log/gnocchi \ - && cp -r /gnocchi/etc/gnocchi/* /etc/gnocchi/ \ - && rm -rf /root/.cache diff --git a/docker/centos/source/gnocchi/gnocchi-base/build b/docker/centos/source/gnocchi/gnocchi-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/gnocchi/gnocchi-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile b/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile deleted file mode 100644 index ad16c6e00..000000000 --- a/docker/centos/source/gnocchi/gnocchi-statsd/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%gnocchi-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/build b/docker/centos/source/gnocchi/gnocchi-statsd/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/gnocchi/gnocchi-statsd/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/config-external.sh b/docker/centos/source/gnocchi/gnocchi-statsd/config-external.sh deleted file mode 120000 index fe516e42c..000000000 --- a/docker/centos/source/gnocchi/gnocchi-statsd/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-statsd/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/gnocchi/gnocchi-statsd/start.sh b/docker/centos/source/gnocchi/gnocchi-statsd/start.sh deleted file mode 120000 index ad961553e..000000000 --- a/docker/centos/source/gnocchi/gnocchi-statsd/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/gnocchi/gnocchi-statsd/start.sh
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-api-cfn/Dockerfile b/docker/centos/source/heat/heat-api-cfn/Dockerfile deleted file mode 100644 index fb0d48115..000000000 --- a/docker/centos/source/heat/heat-api-cfn/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/heat/heat-api-cfn/build b/docker/centos/source/heat/heat-api-cfn/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/heat/heat-api-cfn/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-api-cfn/config-external.sh b/docker/centos/source/heat/heat-api-cfn/config-external.sh deleted file mode 120000 index d1d084800..000000000 --- a/docker/centos/source/heat/heat-api-cfn/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api-cfn/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-api-cfn/start.sh b/docker/centos/source/heat/heat-api-cfn/start.sh deleted file mode 120000 index a71201d4b..000000000 --- a/docker/centos/source/heat/heat-api-cfn/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api-cfn/start.sh
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-api/Dockerfile b/docker/centos/source/heat/heat-api/Dockerfile deleted file mode 100644 index fb0d48115..000000000 --- a/docker/centos/source/heat/heat-api/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/heat/heat-api/build b/docker/centos/source/heat/heat-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/heat/heat-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-api/config-external.sh b/docker/centos/source/heat/heat-api/config-external.sh deleted file mode 120000 index bfc23ba35..000000000 --- a/docker/centos/source/heat/heat-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-api/start.sh b/docker/centos/source/heat/heat-api/start.sh deleted file mode 120000 index cf3eb022c..000000000 --- a/docker/centos/source/heat/heat-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-api/start.sh
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-base/.buildinfo b/docker/centos/source/heat/heat-base/.buildinfo deleted file mode 100644 index 9ffa55fe4..000000000 --- a/docker/centos/source/heat/heat-base/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=heat -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/heat} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/heat/heat-master.tar.gz} diff --git a/docker/centos/source/heat/heat-base/Dockerfile b/docker/centos/source/heat/heat-base/Dockerfile deleted file mode 100644 index 72ff59556..000000000 --- a/docker/centos/source/heat/heat-base/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./heat.tar / -RUN ln -s /heat-* /heat - -RUN cd /heat \ - && useradd --user-group heat \ - && pip install -r requirements.txt \ - && pip install /heat \ - && mkdir /etc/heat /var/log/heat \ - && cp -r /heat/etc/heat/* /etc/heat/ \ - && rm -rf /root/.cache diff --git a/docker/centos/source/heat/heat-base/build b/docker/centos/source/heat/heat-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/heat/heat-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-engine/Dockerfile b/docker/centos/source/heat/heat-engine/Dockerfile deleted file mode 100644 index fb0d48115..000000000 --- a/docker/centos/source/heat/heat-engine/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/heat/heat-engine/build b/docker/centos/source/heat/heat-engine/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/heat/heat-engine/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-engine/config-external.sh b/docker/centos/source/heat/heat-engine/config-external.sh deleted file mode 120000 index a620c9e5b..000000000 --- a/docker/centos/source/heat/heat-engine/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-engine/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/heat/heat-engine/start.sh b/docker/centos/source/heat/heat-engine/start.sh deleted file mode 120000 index d660bc5d1..000000000 --- a/docker/centos/source/heat/heat-engine/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/heat/heat-engine/start.sh
\ No newline at end of file diff --git a/docker/centos/source/horizon/.buildinfo b/docker/centos/source/horizon/.buildinfo deleted file mode 100644 index 79952ecc3..000000000 --- a/docker/centos/source/horizon/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=horizon -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/horizon} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/horizon/horizon-master.tar.gz} diff --git a/docker/centos/source/horizon/Dockerfile b/docker/centos/source/horizon/Dockerfile deleted file mode 100644 index b2ae89a5f..000000000 --- a/docker/centos/source/horizon/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./horizon.tar / -RUN ln -s /horizon-* /horizon - -RUN yum install -y \ - httpd \ - mod_wsgi \ - && yum clean all - -RUN cd /horizon \ - && useradd --user-group horizon \ - && pip install -r requirements.txt \ - && pip install /horizon \ - && mkdir -p \ - /etc/openstack-dashboard \ - /usr/share/openstack-dashboard/static \ - /var/log/horizon \ - && cp -r /horizon/openstack_dashboard /usr/share/openstack-dashboard/ \ - && cp /horizon/openstack_dashboard/local/local_settings.py.example \ - /etc/openstack-dashboard/local_settings \ - && ln -s /etc/openstack-dashboard/local_settings \ - /usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py \ - && cp /horizon/manage.py /usr/share/openstack-dashboard \ - && python /usr/share/openstack-dashboard/manage.py collectstatic --noinput \ - && chown -R apache:apache /usr/share/openstack-dashboard/static \ - && rm -rf /root/.cache - -# The chown is required because of this packaging bug: -# https://bugzilla.redhat.com/show_bug.cgi?id=1219006 - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/horizon/build b/docker/centos/source/horizon/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/source/horizon/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/horizon/config-external.sh b/docker/centos/source/horizon/config-external.sh deleted file mode 120000 index 19b799f7b..000000000 --- a/docker/centos/source/horizon/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/horizon/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/horizon/start.sh b/docker/centos/source/horizon/start.sh deleted file mode 120000 index 3c793e4f9..000000000 --- a/docker/centos/source/horizon/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/horizon/start.sh
\ No newline at end of file diff --git a/docker/centos/source/keystone/.buildinfo b/docker/centos/source/keystone/.buildinfo deleted file mode 100644 index b1ce82439..000000000 --- a/docker/centos/source/keystone/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=keystone -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/keystone} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/keystone/keystone-master.tar.gz} diff --git a/docker/centos/source/keystone/Dockerfile b/docker/centos/source/keystone/Dockerfile deleted file mode 100644 index f83321591..000000000 --- a/docker/centos/source/keystone/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install \ - httpd \ - mod_wsgi \ - && yum clean all - -ADD ./keystone.tar / -RUN ln -s /keystone-* /keystone - -RUN cd /keystone \ - && useradd --user-group keystone \ - && pip install -r requirements.txt \ - && pip install /keystone \ - && mkdir /etc/keystone /var/log/keystone /var/www/cgi-bin/keystone \ - && cp /keystone/etc/keystone.conf.sample /etc/keystone/keystone.conf \ - && cp -r /keystone/etc/* /etc/keystone/ \ - && cp -a httpd/wsgi-keystone.conf /etc/httpd/conf.d \ - && sed -i 's,/var/log/apache2,/var/log/httpd,' /etc/httpd/conf.d/wsgi-keystone.conf \ - && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ - && cp -a httpd/keystone.py /var/www/cgi-bin/keystone/main \ - && cp -a httpd/keystone.py /var/www/cgi-bin/keystone/admin \ - && chown -R keystone: /var/www/cgi-bin/keystone /var/log/keystone \ - && chmod 755 /var/www/cgi-bin/keystone/* - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/keystone/build b/docker/centos/source/keystone/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/source/keystone/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/keystone/config-external.sh b/docker/centos/source/keystone/config-external.sh deleted file mode 120000 index ae5be7eea..000000000 --- a/docker/centos/source/keystone/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keystone/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/keystone/start.sh b/docker/centos/source/keystone/start.sh deleted file mode 120000 index ae34844ea..000000000 --- a/docker/centos/source/keystone/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keystone/start.sh
\ No newline at end of file diff --git a/docker/centos/source/magnum/magnum-api/Dockerfile b/docker/centos/source/magnum/magnum-api/Dockerfile deleted file mode 100644 index aa39615e7..000000000 --- a/docker/centos/source/magnum/magnum-api/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%magnum-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/magnum/magnum-api/build b/docker/centos/source/magnum/magnum-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/magnum/magnum-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/magnum/magnum-api/config-external.sh b/docker/centos/source/magnum/magnum-api/config-external.sh deleted file mode 120000 index 746e2aa58..000000000 --- a/docker/centos/source/magnum/magnum-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/magnum/magnum-api/start.sh b/docker/centos/source/magnum/magnum-api/start.sh deleted file mode 120000 index 58cc9e37c..000000000 --- a/docker/centos/source/magnum/magnum-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-api/start.sh
\ No newline at end of file diff --git a/docker/centos/source/magnum/magnum-base/.buildinfo b/docker/centos/source/magnum/magnum-base/.buildinfo deleted file mode 100644 index 95d42029a..000000000 --- a/docker/centos/source/magnum/magnum-base/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=magnum -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/magnum} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/magnum/magnum-master.tar.gz} diff --git a/docker/centos/source/magnum/magnum-base/Dockerfile b/docker/centos/source/magnum/magnum-base/Dockerfile deleted file mode 100644 index 55936981d..000000000 --- a/docker/centos/source/magnum/magnum-base/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./magnum.tar / -RUN ln -s /magnum-* /magnum - -RUN cd /magnum \ - && useradd --user-group magnum \ - && pip install -r requirements.txt \ - && pip install /magnum \ - && mkdir /etc/magnum /var/log/magnum \ - && cp -r /magnum/etc/magnum/* /etc/magnum/ \ - && rm -rf /root/.cache diff --git a/docker/centos/source/magnum/magnum-base/build b/docker/centos/source/magnum/magnum-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/magnum/magnum-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/magnum/magnum-conductor/Dockerfile b/docker/centos/source/magnum/magnum-conductor/Dockerfile deleted file mode 100644 index 6790aeeff..000000000 --- a/docker/centos/source/magnum/magnum-conductor/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%magnum-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Install kubectl binary (ugh) -RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl && rm -rf /tmp/kubernetes - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/magnum/magnum-conductor/build b/docker/centos/source/magnum/magnum-conductor/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/magnum/magnum-conductor/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/magnum/magnum-conductor/config-external.sh b/docker/centos/source/magnum/magnum-conductor/config-external.sh deleted file mode 120000 index 2d3f514d5..000000000 --- a/docker/centos/source/magnum/magnum-conductor/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-conductor/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/magnum/magnum-conductor/start.sh b/docker/centos/source/magnum/magnum-conductor/start.sh deleted file mode 120000 index 681863036..000000000 --- a/docker/centos/source/magnum/magnum-conductor/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/magnum/magnum-conductor/start.sh
\ No newline at end of file diff --git a/docker/centos/source/murano/murano-api/Dockerfile b/docker/centos/source/murano/murano-api/Dockerfile deleted file mode 100644 index a838fa8ac..000000000 --- a/docker/centos/source/murano/murano-api/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%murano-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY config-external.sh /opt/kolla/ - -COPY start.sh / - -CMD ["/start.sh"] diff --git a/docker/centos/source/murano/murano-api/build b/docker/centos/source/murano/murano-api/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/murano/murano-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/murano/murano-api/config-external.sh b/docker/centos/source/murano/murano-api/config-external.sh deleted file mode 120000 index 6b73e957f..000000000 --- a/docker/centos/source/murano/murano-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/murano/murano-api/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/murano/murano-api/start.sh b/docker/centos/source/murano/murano-api/start.sh deleted file mode 120000 index bcf6f43e7..000000000 --- a/docker/centos/source/murano/murano-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/murano/murano-api/start.sh
\ No newline at end of file diff --git a/docker/centos/source/murano/murano-base/.buildinfo b/docker/centos/source/murano/murano-base/.buildinfo deleted file mode 100644 index 4806db155..000000000 --- a/docker/centos/source/murano/murano-base/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=murano -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/murano} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/murano/murano-master.tar.gz} diff --git a/docker/centos/source/murano/murano-base/Dockerfile b/docker/centos/source/murano/murano-base/Dockerfile deleted file mode 100644 index 21de3ece3..000000000 --- a/docker/centos/source/murano/murano-base/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./murano.tar / -RUN ln -s /murano-* /murano - -RUN cd /murano \ - && pip install -r requirements.txt \ - && pip install /murano \ - && mkdir /etc/murano \ - && cd /murano \ - && tox -e genconfig \ - && cp -r etc/murano/* /etc/murano/ \ - && cp etc/murano/murano.conf.sample /etc/murano/murano.conf \ - && rm -rf /root/.cache diff --git a/docker/centos/source/murano/murano-base/build b/docker/centos/source/murano/murano-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/murano/murano-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/murano/murano-engine/Dockerfile b/docker/centos/source/murano/murano-engine/Dockerfile deleted file mode 100644 index a838fa8ac..000000000 --- a/docker/centos/source/murano/murano-engine/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%murano-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY config-external.sh /opt/kolla/ - -COPY start.sh / - -CMD ["/start.sh"] diff --git a/docker/centos/source/murano/murano-engine/build b/docker/centos/source/murano/murano-engine/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/murano/murano-engine/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/murano/murano-engine/config-external.sh b/docker/centos/source/murano/murano-engine/config-external.sh deleted file mode 120000 index 1c8e0612c..000000000 --- a/docker/centos/source/murano/murano-engine/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/murano/murano-engine/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/murano/murano-engine/start.sh b/docker/centos/source/murano/murano-engine/start.sh deleted file mode 120000 index a4b0147fb..000000000 --- a/docker/centos/source/murano/murano-engine/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/murano/murano-engine/start.sh
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-agents/Dockerfile b/docker/centos/source/neutron/neutron-agents/Dockerfile deleted file mode 100644 index 546c2a210..000000000 --- a/docker/centos/source/neutron/neutron-agents/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Install supervisor -RUN easy_install supervisor - -# Install supervisor-stdout -RUN pip install supervisor-stdout - -# Configure supervisord -RUN mkdir -p /var/log/supervisor/ -COPY supervisord.conf /etc/ - -# TODO: SamYaple FWaaS is part of the l3-agent, not a seperate agent that is -# why this file is needed. To support FWaaS we cannot have a seperate container -# I need to figure out the best way to make this work together -# -# This file _does_ _not_ need to exist, you must remove referencing it from the -# exec line in the start script. Also all these config options can exist in the -# main neutron.conf if we wish -COPY fwaas_driver.ini /etc/neutron/ - -COPY neutron-dhcp-agent/ /opt/kolla/neutron-dhcp-agent -COPY neutron-l3-agent/ /opt/kolla/neutron-l3-agent -COPY neutron-metadata-agent/ /opt/kolla/neutron-metadata-agent - -CMD ["/usr/bin/supervisord"] diff --git a/docker/centos/source/neutron/neutron-agents/build b/docker/centos/source/neutron/neutron-agents/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/neutron/neutron-agents/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-agents/fwaas_driver.ini b/docker/centos/source/neutron/neutron-agents/fwaas_driver.ini deleted file mode 120000 index 0e016223c..000000000 --- a/docker/centos/source/neutron/neutron-agents/fwaas_driver.ini +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-l3-agent/fwaas_driver.ini
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh deleted file mode 120000 index 680eee875..000000000 --- a/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-dhcp-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/start.sh b/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/start.sh deleted file mode 120000 index 63dad958d..000000000 --- a/docker/centos/source/neutron/neutron-agents/neutron-dhcp-agent/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-dhcp-agent/start.sh
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-external.sh b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-external.sh deleted file mode 120000 index f4530afd9..000000000 --- a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-l3-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini deleted file mode 120000 index 8ea67959c..000000000 --- a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/fwaas_driver.ini +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-l3-agent/fwaas_driver.ini
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/start.sh b/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/start.sh deleted file mode 120000 index fa70dec8b..000000000 --- a/docker/centos/source/neutron/neutron-agents/neutron-l3-agent/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-l3-agent/start.sh
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-external.sh b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-external.sh deleted file mode 120000 index a5c3ac24a..000000000 --- a/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-metadata-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/start.sh b/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/start.sh deleted file mode 120000 index 0de2452ee..000000000 --- a/docker/centos/source/neutron/neutron-agents/neutron-metadata-agent/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/neutron/neutron-metadata-agent/start.sh
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-agents/supervisord.conf b/docker/centos/source/neutron/neutron-agents/supervisord.conf deleted file mode 120000 index a7f24cb77..000000000 --- a/docker/centos/source/neutron/neutron-agents/supervisord.conf +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-agents/supervisord.conf
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-base/.buildinfo b/docker/centos/source/neutron/neutron-base/.buildinfo deleted file mode 100644 index b4035affb..000000000 --- a/docker/centos/source/neutron/neutron-base/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=neutron -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/neutron} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/neutron/neutron-master.tar.gz} diff --git a/docker/centos/source/neutron/neutron-base/Dockerfile b/docker/centos/source/neutron/neutron-base/Dockerfile deleted file mode 100644 index ee57cfedc..000000000 --- a/docker/centos/source/neutron/neutron-base/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./neutron.tar / -RUN ln -s /neutron-* /neutron - -RUN cd /neutron \ - && useradd --user-group neutron \ - && pip install -r requirements.txt \ - && pip install /neutron \ - && mkdir /etc/neutron /usr/share/neutron /var/log/neutron \ - && cp -r etc/* /etc/neutron/ \ - && cp -r etc/neutron/* /etc/neutron/ \ - && cp etc/api-paste.ini /usr/share/neutron \ - && mv /etc/neutron/neutron/ /etc/neutron/plugins/ \ - && chown -R neutron: /etc/neutron /var/log/neutron \ - && rm -rf /root/.cache - -COPY config-sudoers.sh /opt/kolla/ diff --git a/docker/centos/source/neutron/neutron-base/build b/docker/centos/source/neutron/neutron-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/neutron/neutron-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-base/config-sudoers.sh b/docker/centos/source/neutron/neutron-base/config-sudoers.sh deleted file mode 120000 index 08e65f4d7..000000000 --- a/docker/centos/source/neutron/neutron-base/config-sudoers.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-base/config-sudoers.sh
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile b/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile deleted file mode 100644 index ded2b7de0..000000000 --- a/docker/centos/source/neutron/neutron-linuxbridge-agent/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Install required packages -RUN yum install -y ebtables && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/build b/docker/centos/source/neutron/neutron-linuxbridge-agent/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/neutron/neutron-linuxbridge-agent/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/config-external.sh b/docker/centos/source/neutron/neutron-linuxbridge-agent/config-external.sh deleted file mode 120000 index 6bd77d67d..000000000 --- a/docker/centos/source/neutron/neutron-linuxbridge-agent/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-linuxbridge-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-linuxbridge-agent/start.sh b/docker/centos/source/neutron/neutron-linuxbridge-agent/start.sh deleted file mode 120000 index 9d51d3d6a..000000000 --- a/docker/centos/source/neutron/neutron-linuxbridge-agent/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-linuxbridge-agent/start.sh
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile b/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile deleted file mode 100644 index 4f447853b..000000000 --- a/docker/centos/source/neutron/neutron-openvswitch-agent/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Install required packages -RUN yum install -y \ - https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \ - openvswitch \ - && yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/build b/docker/centos/source/neutron/neutron-openvswitch-agent/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/neutron/neutron-openvswitch-agent/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/config-external.sh b/docker/centos/source/neutron/neutron-openvswitch-agent/config-external.sh deleted file mode 120000 index 14354b71a..000000000 --- a/docker/centos/source/neutron/neutron-openvswitch-agent/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-openvswitch-agent/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-openvswitch-agent/start.sh b/docker/centos/source/neutron/neutron-openvswitch-agent/start.sh deleted file mode 120000 index c14edb0ad..000000000 --- a/docker/centos/source/neutron/neutron-openvswitch-agent/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-openvswitch-agent/start.sh
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-server/Dockerfile b/docker/centos/source/neutron/neutron-server/Dockerfile deleted file mode 100644 index f678357a0..000000000 --- a/docker/centos/source/neutron/neutron-server/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -#Install required packages -RUN yum install -y which && \ - yum clean all - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/neutron/neutron-server/build b/docker/centos/source/neutron/neutron-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/neutron/neutron-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-server/config-external.sh b/docker/centos/source/neutron/neutron-server/config-external.sh deleted file mode 120000 index b8d7792ce..000000000 --- a/docker/centos/source/neutron/neutron-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/neutron/neutron-server/start.sh b/docker/centos/source/neutron/neutron-server/start.sh deleted file mode 120000 index a11ea7703..000000000 --- a/docker/centos/source/neutron/neutron-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/neutron/neutron-server/start.sh
\ No newline at end of file diff --git a/docker/centos/source/nova/nova-api/Dockerfile b/docker/centos/source/nova/nova-api/Dockerfile deleted file mode 100644 index 02626c2c2..000000000 --- a/docker/centos/source/nova/nova-api/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY 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 deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/nova/nova-api/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ 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 deleted file mode 120000 index fa9d355fe..000000000 --- a/docker/centos/source/nova/nova-api/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-api/config-external.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 deleted file mode 120000 index 12fd6f028..000000000 --- a/docker/centos/source/nova/nova-api/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../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 deleted file mode 100644 index 2c5f3d813..000000000 --- a/docker/centos/source/nova/nova-base/.buildinfo +++ /dev/null @@ -1,13 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=nova -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/nova} - -# Used for curl install method -# TODO(coolsvap) change to master once the changes -# in blueprint consolidate-libvirt-fs-volume-drivers -# Kolla bug : https://bugs.launchpad.net/kolla/+bug/1480231 -: ${TARBALL_URI:=http://tarballs.openstack.org/nova/nova-2015.1.1.tar.gz} diff --git a/docker/centos/source/nova/nova-base/Dockerfile b/docker/centos/source/nova/nova-base/Dockerfile deleted file mode 100644 index b15dcd20c..000000000 --- a/docker/centos/source/nova/nova-base/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -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 diff --git a/docker/centos/source/nova/nova-base/build b/docker/centos/source/nova/nova-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/nova/nova-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../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 deleted file mode 100644 index 96b234a5c..000000000 --- a/docker/centos/source/nova/nova-compute/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum -y install sysfsutils \ - libvirt-python \ - && yum clean all - -COPY start.sh / -COPY 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 deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/nova/nova-compute/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../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 deleted file mode 120000 index bb13b939c..000000000 --- a/docker/centos/source/nova/nova-compute/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-compute/config-external.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 deleted file mode 120000 index 830400f9e..000000000 --- a/docker/centos/source/nova/nova-compute/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../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 deleted file mode 100644 index f22d5b243..000000000 --- a/docker/centos/source/nova/nova-conductor/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / - -COPY 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 deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/nova/nova-conductor/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../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 deleted file mode 120000 index d98f3a875..000000000 --- a/docker/centos/source/nova/nova-conductor/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-conductor/config-external.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 deleted file mode 120000 index 0eb07db61..000000000 --- a/docker/centos/source/nova/nova-conductor/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../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 deleted file mode 100644 index f22d5b243..000000000 --- a/docker/centos/source/nova/nova-consoleauth/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / - -COPY 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 deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/nova/nova-consoleauth/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../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 deleted file mode 120000 index b9d573470..000000000 --- a/docker/centos/source/nova/nova-consoleauth/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-consoleauth/config-external.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 deleted file mode 120000 index 658be8e2a..000000000 --- a/docker/centos/source/nova/nova-consoleauth/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../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 deleted file mode 100644 index 856cab73e..000000000 --- a/docker/centos/source/nova/nova-libvirt/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -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 / - -COPY 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 deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/nova/nova-libvirt/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../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 deleted file mode 120000 index e16a4f542..000000000 --- a/docker/centos/source/nova/nova-libvirt/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-libvirt/config-external.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 deleted file mode 120000 index 63ca58e26..000000000 --- a/docker/centos/source/nova/nova-libvirt/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../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 deleted file mode 100644 index c8822e917..000000000 --- a/docker/centos/source/nova/nova-network/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -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 / -COPY 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 deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/nova/nova-network/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../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 deleted file mode 120000 index 086eac04e..000000000 --- a/docker/centos/source/nova/nova-network/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-network/config-external.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 deleted file mode 120000 index 89c974d80..000000000 --- a/docker/centos/source/nova/nova-network/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../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 deleted file mode 100644 index 69c99cdf7..000000000 --- a/docker/centos/source/nova/nova-novncproxy/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -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 / - -COPY 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 deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/nova/nova-novncproxy/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../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 deleted file mode 120000 index 8d2a91810..000000000 --- a/docker/centos/source/nova/nova-novncproxy/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-novncproxy/config-external.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 deleted file mode 120000 index b57c6a318..000000000 --- a/docker/centos/source/nova/nova-novncproxy/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../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 deleted file mode 100644 index f22d5b243..000000000 --- a/docker/centos/source/nova/nova-scheduler/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / - -COPY 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 deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/nova/nova-scheduler/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../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 deleted file mode 120000 index ef9c60c29..000000000 --- a/docker/centos/source/nova/nova-scheduler/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-scheduler/config-external.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 deleted file mode 120000 index b73e07a6a..000000000 --- a/docker/centos/source/nova/nova-scheduler/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/nova/nova-scheduler/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-account-server/Dockerfile b/docker/centos/source/swift/swift-account-server/Dockerfile deleted file mode 100644 index c923e339e..000000000 --- a/docker/centos/source/swift/swift-account-server/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-account-server/build b/docker/centos/source/swift/swift-account-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-account-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-account-server/config-external.sh b/docker/centos/source/swift/swift-account-server/config-external.sh deleted file mode 120000 index 93a15ca3b..000000000 --- a/docker/centos/source/swift/swift-account-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-account-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-account-server/start.sh b/docker/centos/source/swift/swift-account-server/start.sh deleted file mode 120000 index acf6b18d7..000000000 --- a/docker/centos/source/swift/swift-account-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-account-server/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-base/.buildinfo b/docker/centos/source/swift/swift-base/.buildinfo deleted file mode 100644 index ca6e05ede..000000000 --- a/docker/centos/source/swift/swift-base/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=swift -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/swift} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/swift/swift-master.tar.gz} diff --git a/docker/centos/source/swift/swift-base/Dockerfile b/docker/centos/source/swift/swift-base/Dockerfile deleted file mode 100644 index 2a983963b..000000000 --- a/docker/centos/source/swift/swift-base/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./swift.tar / -RUN ln -s /swift-* /swift - -RUN cd /swift \ - && useradd --user-group swift \ - && pip install -r requirements.txt \ - && pip install /swift \ - && mkdir /etc/swift /var/log/swift \ - && cp -r /swift/etc/* /etc/swift/ \ - && rm -rf /root/.cache - -COPY config-swift.sh build-swift-ring.py /opt/kolla/ - -RUN mkdir /opt/swift - -CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-base/build b/docker/centos/source/swift/swift-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-base/config-swift.sh b/docker/centos/source/swift/swift-base/config-swift.sh deleted file mode 120000 index fb883f482..000000000 --- a/docker/centos/source/swift/swift-base/config-swift.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-base/config-swift.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-container-server/Dockerfile b/docker/centos/source/swift/swift-container-server/Dockerfile deleted file mode 100644 index c923e339e..000000000 --- a/docker/centos/source/swift/swift-container-server/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-container-server/build b/docker/centos/source/swift/swift-container-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-container-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-container-server/config-external.sh b/docker/centos/source/swift/swift-container-server/config-external.sh deleted file mode 120000 index 8fa814ca7..000000000 --- a/docker/centos/source/swift/swift-container-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-container-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-container-server/start.sh b/docker/centos/source/swift/swift-container-server/start.sh deleted file mode 120000 index b7d3cd9fc..000000000 --- a/docker/centos/source/swift/swift-container-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-container-server/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-auditor/Dockerfile b/docker/centos/source/swift/swift-object-auditor/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/source/swift/swift-object-auditor/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-object-auditor/build b/docker/centos/source/swift/swift-object-auditor/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-object-auditor/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-auditor/config-external.sh b/docker/centos/source/swift/swift-object-auditor/config-external.sh deleted file mode 120000 index 1adf26bcb..000000000 --- a/docker/centos/source/swift/swift-object-auditor/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-auditor/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-auditor/start.sh b/docker/centos/source/swift/swift-object-auditor/start.sh deleted file mode 120000 index 5ef316559..000000000 --- a/docker/centos/source/swift/swift-object-auditor/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-auditor/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-base/Dockerfile b/docker/centos/source/swift/swift-object-base/Dockerfile deleted file mode 100644 index 600d9d651..000000000 --- a/docker/centos/source/swift/swift-object-base/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY config-swift-object.sh /opt/kolla/ diff --git a/docker/centos/source/swift/swift-object-base/build b/docker/centos/source/swift/swift-object-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-object-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-base/config-swift-object.sh b/docker/centos/source/swift/swift-object-base/config-swift-object.sh deleted file mode 120000 index a289b4d0d..000000000 --- a/docker/centos/source/swift/swift-object-base/config-swift-object.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-base/config-swift-object.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-expirer/Dockerfile b/docker/centos/source/swift/swift-object-expirer/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/source/swift/swift-object-expirer/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-object-expirer/build b/docker/centos/source/swift/swift-object-expirer/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-object-expirer/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-expirer/config-external.sh b/docker/centos/source/swift/swift-object-expirer/config-external.sh deleted file mode 120000 index 7f8d3e37e..000000000 --- a/docker/centos/source/swift/swift-object-expirer/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-expirer/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-expirer/start.sh b/docker/centos/source/swift/swift-object-expirer/start.sh deleted file mode 120000 index 3b9a9c3ee..000000000 --- a/docker/centos/source/swift/swift-object-expirer/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-expirer/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-replicator/Dockerfile b/docker/centos/source/swift/swift-object-replicator/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/source/swift/swift-object-replicator/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-object-replicator/build b/docker/centos/source/swift/swift-object-replicator/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-object-replicator/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-replicator/config-external.sh b/docker/centos/source/swift/swift-object-replicator/config-external.sh deleted file mode 120000 index 69e793df4..000000000 --- a/docker/centos/source/swift/swift-object-replicator/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-replicator/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-replicator/start.sh b/docker/centos/source/swift/swift-object-replicator/start.sh deleted file mode 120000 index da27b6312..000000000 --- a/docker/centos/source/swift/swift-object-replicator/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-replicator/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-server/Dockerfile b/docker/centos/source/swift/swift-object-server/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/source/swift/swift-object-server/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-object-server/build b/docker/centos/source/swift/swift-object-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-object-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-server/config-external.sh b/docker/centos/source/swift/swift-object-server/config-external.sh deleted file mode 120000 index a9213fffa..000000000 --- a/docker/centos/source/swift/swift-object-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-server/start.sh b/docker/centos/source/swift/swift-object-server/start.sh deleted file mode 120000 index 7e47f8018..000000000 --- a/docker/centos/source/swift/swift-object-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-server/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-updater/Dockerfile b/docker/centos/source/swift/swift-object-updater/Dockerfile deleted file mode 100644 index eb070cce9..000000000 --- a/docker/centos/source/swift/swift-object-updater/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -COPY start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-object-updater/build b/docker/centos/source/swift/swift-object-updater/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-object-updater/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-updater/config-external.sh b/docker/centos/source/swift/swift-object-updater/config-external.sh deleted file mode 120000 index 94ba9e60c..000000000 --- a/docker/centos/source/swift/swift-object-updater/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-updater/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-object-updater/start.sh b/docker/centos/source/swift/swift-object-updater/start.sh deleted file mode 120000 index 2e78e5c09..000000000 --- a/docker/centos/source/swift/swift-object-updater/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-object-updater/start.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-proxy-server/Dockerfile b/docker/centos/source/swift/swift-proxy-server/Dockerfile deleted file mode 100644 index cbd4357f3..000000000 --- a/docker/centos/source/swift/swift-proxy-server/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - - -COPY ./start.sh /start.sh -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/swift/swift-proxy-server/build b/docker/centos/source/swift/swift-proxy-server/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/centos/source/swift/swift-proxy-server/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-proxy-server/config-external.sh b/docker/centos/source/swift/swift-proxy-server/config-external.sh deleted file mode 120000 index 178516af5..000000000 --- a/docker/centos/source/swift/swift-proxy-server/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-proxy-server/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/swift/swift-proxy-server/start.sh b/docker/centos/source/swift/swift-proxy-server/start.sh deleted file mode 120000 index 63d0ec91a..000000000 --- a/docker/centos/source/swift/swift-proxy-server/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../../docker/common/swift/swift-proxy-server/start.sh
\ No newline at end of file diff --git a/docker/centos/source/zaqar/.buildinfo b/docker/centos/source/zaqar/.buildinfo deleted file mode 100644 index 5f46f8dd7..000000000 --- a/docker/centos/source/zaqar/.buildinfo +++ /dev/null @@ -1,10 +0,0 @@ -# Build info specific to this image. All values can be overridden in .buildconf - -COMPONENT=zaqar -SOURCE_INSTALL_AVAILABLE=1 - -# Used for git install method -: ${CLONE_FROM:=https://github.com/openstack/zaqar} - -# Used for curl install method -: ${TARBALL_URI:=http://tarballs.openstack.org/zaqar/zaqar-master.tar.gz} diff --git a/docker/centos/source/zaqar/Dockerfile b/docker/centos/source/zaqar/Dockerfile deleted file mode 100644 index 3fee08aee..000000000 --- a/docker/centos/source/zaqar/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -ADD ./zaqar.tar / -RUN ln -s /zaqar-* /zaqar - -RUN cd /zaqar \ - && useradd --user-group zaqar \ - && pip install -r requirements.txt \ - && pip install /zaqar \ - && mkdir /etc/zaqar /var/log/zaqar \ - && cp -r /zaqar/etc/* /etc/zaqar/ \ - && rm -rf /root/.cache - - -COPY ./start.sh /start.sh - -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] diff --git a/docker/centos/source/zaqar/build b/docker/centos/source/zaqar/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/centos/source/zaqar/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/centos/source/zaqar/config-external.sh b/docker/centos/source/zaqar/config-external.sh deleted file mode 120000 index 38fff40d1..000000000 --- a/docker/centos/source/zaqar/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/zaqar/config-external.sh
\ No newline at end of file diff --git a/docker/centos/source/zaqar/start.sh b/docker/centos/source/zaqar/start.sh deleted file mode 120000 index 48134a044..000000000 --- a/docker/centos/source/zaqar/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/zaqar/start.sh
\ No newline at end of file diff --git a/docker/common/mariadb-app/config-mysql.sh b/docker/common/mariadb-app/config-mysql.sh deleted file mode 100755 index 6cc6afa78..000000000 --- a/docker/common/mariadb-app/config-mysql.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -. /opt/kolla/kolla-common.sh - -: ${BIND_ADDRESS:=$PUBLIC_IP} -: ${DB_ROOT_PASSWORD:=$DB_ROOT_PASSWORD} -: ${DEFAULT_STORAGE_ENGINE:=innodb} -: ${COLLATION_SERVER:=utf8_general_ci} -: ${INIT_CONNECT:=SET NAMES utf8} -: ${CHAR_SET_SERVER:=utf8} -: ${INNODB_FILE_PER_TABLE:=true} -: ${DATADIR:=/var/lib/mysql} -: ${TEMP_FILE:='/tmp/mysql-first-time.sql'} - -server_cnf=/etc/my.cnf.d/server.cnf - -crudini --set $server_cnf mysqld bind-address $BIND_ADDRESS -crudini --set $server_cnf mysqld default-storage-engine $DEFAULT_STORAGE_ENGINE -crudini --set $server_cnf mysqld collation-server $COLLATION_SERVER -crudini --set $server_cnf mysqld init-connect "'${INIT_CONNECT}'" -crudini --set $server_cnf mysqld character-set-server $CHAR_SET_SERVER -crudini --set $server_cnf mysqld max_connections "$MARIADB_MAX_CONNECTIONS" -if [ "${INNODB_FILE_PER_TABLE}" == "true" ] || ["${INNODB_FILE_PER_TABLE}" == "True" ] ; then - crudini --set $server_cnf mysqld innodb_file_per_table 1 -fi diff --git a/docker/common/mariadb-app/mysql-entrypoint.sh b/docker/common/mariadb-app/mysql-entrypoint.sh deleted file mode 100755 index 6dece43ca..000000000 --- a/docker/common/mariadb-app/mysql-entrypoint.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -set -e - -# Configure MySQL settings -. /opt/kolla/config-mysql.sh - -if [ -z "$(ls -A /var/lib/mysql)" -a "${1%_safe}" = 'mysqld' ]; then - PATH=/usr/libexec:$PATH - export PATH - - if [ -z "$MARIADB_ROOT_PASSWORD" ]; then - echo >&2 'error: database is uninitialized and MARIADB_ROOT_PASSWORD not set' - echo >&2 ' Did you forget to add -e MARIADB_ROOT_PASSWORD=... ?' - exit 1 - fi - - mysql_install_db --user=mysql --datadir="$DATADIR" - - # These statements _must_ be on individual lines, and _must_ end with - # semicolons (no line breaks or comments are permitted). - # TODO proper SQL escaping on ALL the things D: - TEMP_FILE='/tmp/mysql-first-time.sql' - cat > "$TEMP_FILE" <<-EOSQL -DELETE FROM mysql.user ; -CREATE USER 'root'@'%' IDENTIFIED BY '${MARIADB_ROOT_PASSWORD}' ; -GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION ; -DROP DATABASE IF EXISTS test ; -EOSQL - - if [ "$MARIADB_DATABASE" ]; then - echo "CREATE DATABASE IF NOT EXISTS $MARIADB_DATABASE ;" >> "$TEMP_FILE" - fi - - if [ "$MARIADB_USER" -a "$MARIADB_PASSWORD" ]; then - echo "CREATE USER '$MARIADB_USER'@'%' IDENTIFIED BY '$MARIADB_PASSWORD' ;" >> "$TEMP_FILE" - - if [ "$MARIADB_DATABASE" ]; then - echo "GRANT ALL ON $MARIADB_DATABASE.* TO '$MARIADB_USER'@'%' ;" >> "$TEMP_FILE" - fi - fi - - echo 'FLUSH PRIVILEGES ;' >> "$TEMP_FILE" - - set -- "$@" --init-file="$TEMP_FILE" -fi - -chown -R mysql:mysql "$DATADIR" - -exec "$@" diff --git a/docker/fedora/binary/base/Dockerfile b/docker/fedora/binary/base/Dockerfile deleted file mode 100644 index d40738410..000000000 --- a/docker/fedora/binary/base/Dockerfile +++ /dev/null @@ -1,105 +0,0 @@ -FROM fedora:21 -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Set up repositories -RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm -RUN yum -y install dnf dnf-plugins-core && yum clean all -RUN dnf copr enable -y sdake/pam.noaudit - - -# Update packages -RUN yum update -y && yum clean all - -# Install base packages -RUN yum install -y \ - iproute \ - mariadb \ - mariadb-libs \ - openssl \ - openstack-utils \ - pyparsing \ - python-alembic \ - python-amqp \ - python-amqplib \ - python-anyjson \ - python-boto \ - python-cheetah \ - python-cliff \ - python-cmd2 \ - python-croniter \ - python-crypto \ - python-d2to1 \ - python-docutils \ - python-dogpile-cache \ - python-dogpile-core \ - python-empy \ - python-eventlet \ - python-flask \ - python-futures \ - python-greenlet \ - python-httplib2 \ - python-iso8601 \ - python-itsdangerous \ - python-jinja2 \ - python-jsonpatch \ - python-jsonpath-rw \ - python-jsonpointer \ - python-jsonschema \ - python-keyring \ - python-kombu \ - python-ldap \ - python-lesscpy \ - python-lockfile \ - python-lxml \ - python-markdown \ - python-memcached \ - python-migrate \ - python-msgpack \ - python-netifaces \ - python-networkx \ - python-oauthlib \ - python-oslo-config \ - python-oslo-messaging \ - python-oslo-rootwrap \ - python-paramiko \ - python-passlib \ - python-paste-deploy \ - python-pbr \ - python-pecan \ - python-ply \ - python-prettytable \ - python-psutil \ - python-pycadf \ - python-pygments \ - python-pymongo \ - python-qpid \ - python-repoze-lru \ - python-requests \ - python-routes \ - python-simplegeneric \ - python-simplejson \ - python-singledispatch \ - python-six \ - python-sqlalchemy \ - python-stevedore \ - python-taskflow \ - python-versiontools \ - python-warlock \ - python-webob \ - python-websockify \ - python-webtest \ - python-werkzeug \ - python-wsme \ - && yum clean all - -# This is dirty like zebra. This works around a bug in Ubuntu 14.04 LTS. The -# --net=host option does not work on ubuntu 14.04 because of a kernel bug. One -# workaround is to build pam without authentication. -# See: -# https://registry.hub.docker.com/u/sequenceiq/pam/ -# -RUN rpm -e --nodeps pam -RUN yum -y install pam+noaudit && yum clean all -# End dirty like zebra - -COPY kolla-common.sh /opt/kolla/ diff --git a/docker/fedora/binary/base/build b/docker/fedora/binary/base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/fedora/binary/base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/fedora/binary/base/kolla-common.sh b/docker/fedora/binary/base/kolla-common.sh deleted file mode 120000 index c265c62f7..000000000 --- a/docker/fedora/binary/base/kolla-common.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/kolla-common.sh
\ No newline at end of file diff --git a/docker/fedora/binary/ceilometer b/docker/fedora/binary/ceilometer deleted file mode 120000 index b9f08a71f..000000000 --- a/docker/fedora/binary/ceilometer +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/ceilometer
\ No newline at end of file diff --git a/docker/fedora/binary/designate b/docker/fedora/binary/designate deleted file mode 120000 index 5090326fe..000000000 --- a/docker/fedora/binary/designate +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/designate
\ No newline at end of file diff --git a/docker/fedora/binary/galera b/docker/fedora/binary/galera deleted file mode 120000 index c9339280c..000000000 --- a/docker/fedora/binary/galera +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/galera
\ No newline at end of file diff --git a/docker/fedora/binary/glance b/docker/fedora/binary/glance deleted file mode 120000 index 4b4131254..000000000 --- a/docker/fedora/binary/glance +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/glance
\ No newline at end of file diff --git a/docker/fedora/binary/gnocchi b/docker/fedora/binary/gnocchi deleted file mode 120000 index 0d0716860..000000000 --- a/docker/fedora/binary/gnocchi +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/gnocchi
\ No newline at end of file diff --git a/docker/fedora/binary/haproxy b/docker/fedora/binary/haproxy deleted file mode 120000 index 1229d611b..000000000 --- a/docker/fedora/binary/haproxy +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/haproxy
\ No newline at end of file diff --git a/docker/fedora/binary/heat b/docker/fedora/binary/heat deleted file mode 120000 index a675ed4cb..000000000 --- a/docker/fedora/binary/heat +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/heat
\ No newline at end of file diff --git a/docker/fedora/binary/horizon b/docker/fedora/binary/horizon deleted file mode 120000 index c460446ee..000000000 --- a/docker/fedora/binary/horizon +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/horizon
\ No newline at end of file diff --git a/docker/fedora/binary/keepalived b/docker/fedora/binary/keepalived deleted file mode 120000 index 940b56586..000000000 --- a/docker/fedora/binary/keepalived +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/keepalived
\ No newline at end of file diff --git a/docker/fedora/binary/keystone b/docker/fedora/binary/keystone deleted file mode 120000 index fb666c53b..000000000 --- a/docker/fedora/binary/keystone +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/keystone
\ No newline at end of file diff --git a/docker/fedora/binary/magnum/magnum-api b/docker/fedora/binary/magnum/magnum-api deleted file mode 120000 index 47a08ccac..000000000 --- a/docker/fedora/binary/magnum/magnum-api +++ /dev/null @@ -1 +0,0 @@ -../../../centos/binary/magnum/magnum-api
\ No newline at end of file diff --git a/docker/fedora/binary/magnum/magnum-base/Dockerfile b/docker/fedora/binary/magnum/magnum-base/Dockerfile deleted file mode 100644 index 15d156932..000000000 --- a/docker/fedora/binary/magnum/magnum-base/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Magnum is not yet in upstream RDO packaging - -RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/fedora-22/sdake-openstack-magnum-fedora-22.repo -o /etc/yum.repos.d/sdake-openstack-magnum-f22.repo diff --git a/docker/fedora/binary/magnum/magnum-base/build b/docker/fedora/binary/magnum/magnum-base/build deleted file mode 120000 index ec1913803..000000000 --- a/docker/fedora/binary/magnum/magnum-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/fedora/binary/magnum/magnum-conductor b/docker/fedora/binary/magnum/magnum-conductor deleted file mode 120000 index ba9853139..000000000 --- a/docker/fedora/binary/magnum/magnum-conductor +++ /dev/null @@ -1 +0,0 @@ -../../../centos/binary/magnum/magnum-conductor
\ No newline at end of file diff --git a/docker/fedora/binary/memcached b/docker/fedora/binary/memcached deleted file mode 120000 index 3028d65a6..000000000 --- a/docker/fedora/binary/memcached +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/memcached
\ No newline at end of file diff --git a/docker/fedora/binary/mongodb b/docker/fedora/binary/mongodb deleted file mode 120000 index 486f6030f..000000000 --- a/docker/fedora/binary/mongodb +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/mongodb
\ No newline at end of file diff --git a/docker/fedora/binary/neutron b/docker/fedora/binary/neutron deleted file mode 120000 index 09ccb9467..000000000 --- a/docker/fedora/binary/neutron +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/neutron
\ No newline at end of file diff --git a/docker/fedora/binary/nova b/docker/fedora/binary/nova deleted file mode 120000 index f1f2d05a3..000000000 --- a/docker/fedora/binary/nova +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/nova
\ No newline at end of file diff --git a/docker/fedora/binary/openvswitch b/docker/fedora/binary/openvswitch deleted file mode 120000 index 6526ff756..000000000 --- a/docker/fedora/binary/openvswitch +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/openvswitch
\ No newline at end of file diff --git a/docker/fedora/binary/rabbitmq b/docker/fedora/binary/rabbitmq deleted file mode 120000 index d6f927fc9..000000000 --- a/docker/fedora/binary/rabbitmq +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/rabbitmq
\ No newline at end of file diff --git a/docker/fedora/binary/swift b/docker/fedora/binary/swift deleted file mode 120000 index b4416ea0f..000000000 --- a/docker/fedora/binary/swift +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/swift
\ No newline at end of file diff --git a/docker/fedora/binary/zaqar b/docker/fedora/binary/zaqar deleted file mode 120000 index 1adc217cb..000000000 --- a/docker/fedora/binary/zaqar +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/zaqar
\ No newline at end of file diff --git a/docker/fedora/rdo b/docker/fedora/rdo deleted file mode 120000 index cab89b7b4..000000000 --- a/docker/fedora/rdo +++ /dev/null @@ -1 +0,0 @@ -binary
\ No newline at end of file diff --git a/docker/fedora/source/base/Dockerfile b/docker/fedora/source/base/Dockerfile deleted file mode 100644 index 0b0bcd20c..000000000 --- a/docker/fedora/source/base/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM fedora:21 -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Dependencies required for building/installing source components -RUN yum install -y \ - gcc \ - git \ - libffi-devel \ - libxml2-devel \ - libxslt-devel \ - mariadb \ - mariadb-devel \ - mysql-devel \ - MySQL-python \ - openldap-devel \ - openssl \ - openssl-devel \ - postgresql \ - postgresql-devel \ - python-devel \ - python-oslo-policy \ - sqlite-devel \ - tar \ - && yum clean all - - -# the only dependencies we need from RDO in the source builds are -# python-pip, python-cliff for crudini, -# all of which can be pulled from pypi. -# also the older version of pip does not have support for wheels -# we are installing from source pip is the important for -# most dependency installations -# https://bugs.launchpad.net/kolla/+bug/1476760 -RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ - && python get-pip.py \ - && rm get-pip.py - -RUN pip install --upgrade \ - cachetools \ - crudini \ - pip \ - tox - -COPY kolla-common.sh /opt/kolla/ diff --git a/docker/fedora/source/base/build b/docker/fedora/source/base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/fedora/source/base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/fedora/source/base/kolla-common.sh b/docker/fedora/source/base/kolla-common.sh deleted file mode 120000 index c265c62f7..000000000 --- a/docker/fedora/source/base/kolla-common.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/kolla-common.sh
\ No newline at end of file diff --git a/docker/fedora/source/ceilometer b/docker/fedora/source/ceilometer deleted file mode 120000 index f65423310..000000000 --- a/docker/fedora/source/ceilometer +++ /dev/null @@ -1 +0,0 @@ -../../centos/source/ceilometer
\ No newline at end of file diff --git a/docker/fedora/source/designate b/docker/fedora/source/designate deleted file mode 120000 index 55232e599..000000000 --- a/docker/fedora/source/designate +++ /dev/null @@ -1 +0,0 @@ -../../centos/source/designate
\ No newline at end of file diff --git a/docker/fedora/source/glance b/docker/fedora/source/glance deleted file mode 120000 index 9b38cfb43..000000000 --- a/docker/fedora/source/glance +++ /dev/null @@ -1 +0,0 @@ -../../centos/source/glance
\ No newline at end of file diff --git a/docker/fedora/source/gnocchi b/docker/fedora/source/gnocchi deleted file mode 120000 index 9b9576502..000000000 --- a/docker/fedora/source/gnocchi +++ /dev/null @@ -1 +0,0 @@ -../../centos/source/gnocchi
\ No newline at end of file diff --git a/docker/fedora/source/heat b/docker/fedora/source/heat deleted file mode 120000 index fcc7ddf6c..000000000 --- a/docker/fedora/source/heat +++ /dev/null @@ -1 +0,0 @@ -../../centos/source/heat
\ No newline at end of file diff --git a/docker/fedora/source/horizon b/docker/fedora/source/horizon deleted file mode 120000 index f454ac78a..000000000 --- a/docker/fedora/source/horizon +++ /dev/null @@ -1 +0,0 @@ -../../centos/source/horizon
\ No newline at end of file diff --git a/docker/fedora/source/keystone b/docker/fedora/source/keystone deleted file mode 120000 index e5b14713f..000000000 --- a/docker/fedora/source/keystone +++ /dev/null @@ -1 +0,0 @@ -../../centos/source/keystone
\ No newline at end of file diff --git a/docker/fedora/source/magnum b/docker/fedora/source/magnum deleted file mode 120000 index 2db138bf4..000000000 --- a/docker/fedora/source/magnum +++ /dev/null @@ -1 +0,0 @@ -../../centos/source/magnum
\ No newline at end of file diff --git a/docker/fedora/source/neutron b/docker/fedora/source/neutron deleted file mode 120000 index ac5d21dd5..000000000 --- a/docker/fedora/source/neutron +++ /dev/null @@ -1 +0,0 @@ -../../centos/source/neutron
\ No newline at end of file diff --git a/docker/fedora/source/nova b/docker/fedora/source/nova deleted file mode 120000 index 661bde3bb..000000000 --- a/docker/fedora/source/nova +++ /dev/null @@ -1 +0,0 @@ -../../centos/source/nova
\ No newline at end of file diff --git a/docker/fedora/source/swift b/docker/fedora/source/swift deleted file mode 120000 index 0be99c84b..000000000 --- a/docker/fedora/source/swift +++ /dev/null @@ -1 +0,0 @@ -../../centos/source/swift/
\ No newline at end of file diff --git a/docker/ol/binary/base/Dockerfile b/docker/ol/binary/base/Dockerfile deleted file mode 100644 index 169cb5f3a..000000000 --- a/docker/ol/binary/base/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM oraclelinux:7.1 -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum update -y \ - && yum install -y git \ - && yum clean all \ - && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ - && python get-pip.py \ - && rm -f get-pip.py \ - && pip install crudini - -COPY kolla-common.sh /opt/kolla/ diff --git a/docker/ol/binary/base/build b/docker/ol/binary/base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ol/binary/base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ol/binary/base/kolla-common.sh b/docker/ol/binary/base/kolla-common.sh deleted file mode 120000 index c265c62f7..000000000 --- a/docker/ol/binary/base/kolla-common.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/kolla-common.sh
\ No newline at end of file diff --git a/docker/ol/source/base/Dockerfile b/docker/ol/source/base/Dockerfile deleted file mode 100644 index f9a76c9bd..000000000 --- a/docker/ol/source/base/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM oraclelinux:7.1 -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Dependencies required for building/installing source components -RUN yum install -y \ - MySQL-python \ - gcc \ - git \ - libffi-devel \ - mariadb \ - openssl \ - openssl-devel \ - python-devel \ - tar \ - && yum clean all - -# TODO(pbourke): replace pip below with rpms once available in Oracle -# repos -RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ - && python get-pip.py \ - && rm get-pip.py - -RUN pip install crudini - -COPY kolla-common.sh /opt/kolla/ diff --git a/docker/ol/source/base/build b/docker/ol/source/base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ol/source/base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ol/source/base/kolla-common.sh b/docker/ol/source/base/kolla-common.sh deleted file mode 120000 index c265c62f7..000000000 --- a/docker/ol/source/base/kolla-common.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/kolla-common.sh
\ No newline at end of file diff --git a/docker/ol/source/keystone b/docker/ol/source/keystone deleted file mode 120000 index f66ecff4e..000000000 --- a/docker/ol/source/keystone +++ /dev/null @@ -1 +0,0 @@ -../../centos/source/keystone/
\ No newline at end of file diff --git a/docker/rhel/binary/base/Dockerfile b/docker/rhel/binary/base/Dockerfile deleted file mode 100644 index 422875dd6..000000000 --- a/docker/rhel/binary/base/Dockerfile +++ /dev/null @@ -1,92 +0,0 @@ -FROM rhel7 -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum install -y \ - mariadb-libs \ - openstack-utils \ - pyparsing \ - python-alembic \ - python-amqp \ - python-amqplib \ - python-anyjson \ - python-boto \ - python-ceilometerclient \ - python-cheetah \ - python-cinderclient \ - python-cliff \ - python-cmd2 \ - python-croniter \ - python-crypto \ - python-d2to1 \ - python-docutils \ - python-dogpile-cache \ - python-dogpile-core \ - python-empy \ - python-eventlet \ - python-flask \ - python-futures \ - python-glanceclient \ - python-greenlet \ - python-heatclient \ - python-httplib2 \ - python-iso8601 \ - python-itsdangerous \ - python-jinja2 \ - python-jsonpatch \ - python-jsonpath-rw \ - python-jsonpointer \ - python-jsonschema \ - python-keyring \ - python-keystoneclient \ - python-kombu \ - python-lesscpy \ - python-lockfile \ - python-lxml \ - python-markdown \ - python-memcached \ - python-ldap \ - python-migrate \ - python-msgpack \ - python-netifaces \ - python-networkx \ - python-neutronclient \ - python-novaclient \ - python-oauthlib \ - python-openstackclient \ - python-oslo-config \ - python-oslo-messaging \ - python-oslo-rootwrap \ - python-oslo-vmware \ - python-paramiko \ - python-passlib \ - python-paste-deploy \ - python-pbr \ - python-pecan \ - python-ply \ - python-prettytable \ - python-psutil \ - python-pycadf \ - python-pygments \ - python-pymongo \ - python-qpid \ - python-repoze-lru \ - python-requests \ - python-routes \ - python-saharaclient \ - python-simplegeneric \ - python-simplejson \ - python-singledispatch \ - python-six \ - python-sqlalchemy \ - python-stevedore \ - python-swiftclient \ - python-taskflow \ - python-troveclient \ - python-versiontools \ - python-warlock \ - python-webob \ - python-websockify \ - python-webtest \ - python-werkzeug \ - python-wsme \ - && yum clean all diff --git a/docker/rhel/binary/base/build b/docker/rhel/binary/base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/rhel/binary/base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/rhel/binary/base/kolla-common.sh b/docker/rhel/binary/base/kolla-common.sh deleted file mode 120000 index c265c62f7..000000000 --- a/docker/rhel/binary/base/kolla-common.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/kolla-common.sh
\ No newline at end of file diff --git a/docker/rhel/binary/ceilometer b/docker/rhel/binary/ceilometer deleted file mode 120000 index b9f08a71f..000000000 --- a/docker/rhel/binary/ceilometer +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/ceilometer
\ No newline at end of file diff --git a/docker/rhel/binary/designate b/docker/rhel/binary/designate deleted file mode 120000 index 5090326fe..000000000 --- a/docker/rhel/binary/designate +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/designate
\ No newline at end of file diff --git a/docker/rhel/binary/glance b/docker/rhel/binary/glance deleted file mode 120000 index 4b4131254..000000000 --- a/docker/rhel/binary/glance +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/glance
\ No newline at end of file diff --git a/docker/rhel/binary/heat b/docker/rhel/binary/heat deleted file mode 120000 index a675ed4cb..000000000 --- a/docker/rhel/binary/heat +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/heat
\ No newline at end of file diff --git a/docker/rhel/binary/horizon b/docker/rhel/binary/horizon deleted file mode 120000 index c460446ee..000000000 --- a/docker/rhel/binary/horizon +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/horizon
\ No newline at end of file diff --git a/docker/rhel/binary/keystone b/docker/rhel/binary/keystone deleted file mode 120000 index fb666c53b..000000000 --- a/docker/rhel/binary/keystone +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/keystone
\ No newline at end of file diff --git a/docker/rhel/binary/magnum b/docker/rhel/binary/magnum deleted file mode 120000 index d5c1f84ed..000000000 --- a/docker/rhel/binary/magnum +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/magnum
\ No newline at end of file diff --git a/docker/rhel/binary/mongodb b/docker/rhel/binary/mongodb deleted file mode 120000 index 486f6030f..000000000 --- a/docker/rhel/binary/mongodb +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/mongodb
\ No newline at end of file diff --git a/docker/rhel/binary/neutron b/docker/rhel/binary/neutron deleted file mode 120000 index 09ccb9467..000000000 --- a/docker/rhel/binary/neutron +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/neutron
\ No newline at end of file diff --git a/docker/rhel/binary/nova b/docker/rhel/binary/nova deleted file mode 120000 index f1f2d05a3..000000000 --- a/docker/rhel/binary/nova +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/nova
\ No newline at end of file diff --git a/docker/rhel/binary/rabbitmq b/docker/rhel/binary/rabbitmq deleted file mode 120000 index d6f927fc9..000000000 --- a/docker/rhel/binary/rabbitmq +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/rabbitmq
\ No newline at end of file diff --git a/docker/rhel/binary/swift b/docker/rhel/binary/swift deleted file mode 120000 index b4416ea0f..000000000 --- a/docker/rhel/binary/swift +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/swift
\ No newline at end of file diff --git a/docker/rhel/binary/zaqar b/docker/rhel/binary/zaqar deleted file mode 120000 index 1adc217cb..000000000 --- a/docker/rhel/binary/zaqar +++ /dev/null @@ -1 +0,0 @@ -../../centos/binary/zaqar
\ No newline at end of file diff --git a/docker/rhel/osp b/docker/rhel/osp deleted file mode 120000 index cab89b7b4..000000000 --- a/docker/rhel/osp +++ /dev/null @@ -1 +0,0 @@ -binary
\ No newline at end of file diff --git a/docker/ubuntu/binary/base/Dockerfile b/docker/ubuntu/binary/base/Dockerfile deleted file mode 100644 index dbe5e97dd..000000000 --- a/docker/ubuntu/binary/base/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM ubuntu:trusty -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN apt-get update \ - && apt-get install -y --no-install-recommends software-properties-common \ - && add-apt-repository cloud-archive:kilo \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get dist-upgrade -y \ - && apt-get install -y --no-install-recommends \ - crudini \ - curl \ - openssl \ - && apt-get clean - -COPY kolla-common.sh /opt/kolla/ diff --git a/docker/ubuntu/binary/base/build b/docker/ubuntu/binary/base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ubuntu/binary/base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ubuntu/binary/base/kolla-common.sh b/docker/ubuntu/binary/base/kolla-common.sh deleted file mode 120000 index c265c62f7..000000000 --- a/docker/ubuntu/binary/base/kolla-common.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/kolla-common.sh
\ No newline at end of file diff --git a/docker/ubuntu/binary/keystone/Dockerfile b/docker/ubuntu/binary/keystone/Dockerfile deleted file mode 100644 index 9ce96618e..000000000 --- a/docker/ubuntu/binary/keystone/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN apt-get install -y --no-install-recommends \ - apache2 \ - keystone \ - libapache2-mod-wsgi \ - python-keystoneclient \ - && apt-get clean - -RUN curl -o /etc/apache2/sites-available/wsgi-keystone.conf \ - https://raw.githubusercontent.com/openstack/keystone/stable/kilo/httpd/wsgi-keystone.conf -RUN ln -s /etc/apache2/sites-available/wsgi-keystone.conf /etc/apache2/sites-enabled -RUN mkdir -p /var/www/cgi-bin/keystone -RUN cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/main -RUN cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin -RUN chown -R keystone:keystone /var/www/cgi-bin/keystone -RUN chmod 755 /var/www/cgi-bin/keystone/* - -COPY start.sh / - -CMD ["/start.sh"] diff --git a/docker/ubuntu/binary/keystone/build b/docker/ubuntu/binary/keystone/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ubuntu/binary/keystone/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ubuntu/binary/keystone/start.sh b/docker/ubuntu/binary/keystone/start.sh deleted file mode 120000 index ae34844ea..000000000 --- a/docker/ubuntu/binary/keystone/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keystone/start.sh
\ No newline at end of file diff --git a/docker/ubuntu/binary/nova-base/Dockerfile b/docker/ubuntu/binary/nova-base/Dockerfile deleted file mode 100644 index 704b5d2e0..000000000 --- a/docker/ubuntu/binary/nova-base/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN apt-get install -y --no-install-recommends \ - nova-common \ - python-cinderclient \ - python-keystoneclient \ - python-nova \ - bridge-utils \ - && apt-get clean diff --git a/docker/ubuntu/binary/nova-base/build b/docker/ubuntu/binary/nova-base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ubuntu/binary/nova-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ubuntu/binary/rabbitmq/Dockerfile b/docker/ubuntu/binary/rabbitmq/Dockerfile deleted file mode 100644 index d9df48932..000000000 --- a/docker/ubuntu/binary/rabbitmq/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN apt-get install -y --no-install-recommends \ - hostname \ - rabbitmq-server \ - && apt-get clean \ - && /usr/lib/rabbitmq/bin/rabbitmq-plugins --offline enable rabbitmq_management - -COPY config-rabbit.sh config-external.sh /opt/kolla/ -COPY start.sh / - -CMD ["/start.sh"] diff --git a/docker/ubuntu/binary/rabbitmq/build b/docker/ubuntu/binary/rabbitmq/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ubuntu/binary/rabbitmq/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ubuntu/binary/rabbitmq/config-external.sh b/docker/ubuntu/binary/rabbitmq/config-external.sh deleted file mode 120000 index e02e664c8..000000000 --- a/docker/ubuntu/binary/rabbitmq/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/rabbitmq/config-external.sh
\ No newline at end of file diff --git a/docker/ubuntu/binary/rabbitmq/config-rabbit.sh b/docker/ubuntu/binary/rabbitmq/config-rabbit.sh deleted file mode 120000 index 6feee2aba..000000000 --- a/docker/ubuntu/binary/rabbitmq/config-rabbit.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/rabbitmq/config-rabbit.sh
\ No newline at end of file diff --git a/docker/ubuntu/binary/rabbitmq/start.sh b/docker/ubuntu/binary/rabbitmq/start.sh deleted file mode 120000 index 035f55e26..000000000 --- a/docker/ubuntu/binary/rabbitmq/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/rabbitmq/start.sh
\ No newline at end of file diff --git a/docker/ubuntu/source/base/Dockerfile b/docker/ubuntu/source/base/Dockerfile deleted file mode 100644 index d85fcb42b..000000000 --- a/docker/ubuntu/source/base/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -FROM ubuntu:trusty -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN apt-get update \ - && apt-get install -y --no-install-recommends software-properties-common \ - && add-apt-repository cloud-archive:kilo \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get dist-upgrade -y \ - && apt-get install -y --no-install-recommends \ - crudini \ - curl \ - gcc \ - git \ - ldap-utils \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - mysql-server\ - openssl \ - postgresql \ - python-dev \ - python-oslo-policy \ - slapd \ - sqlite \ - tar \ - && apt-get clean - -RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ - && python get-pip.py \ - && rm get-pip.py - -RUN pip install --upgrade \ - cachetools \ - crudini \ - pip \ - tox - -COPY kolla-common.sh /opt/kolla/ diff --git a/docker/ubuntu/source/base/build b/docker/ubuntu/source/base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ubuntu/source/base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ubuntu/source/base/kolla-common.sh b/docker/ubuntu/source/base/kolla-common.sh deleted file mode 120000 index c265c62f7..000000000 --- a/docker/ubuntu/source/base/kolla-common.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/kolla-common.sh
\ No newline at end of file diff --git a/tests/test_images.py b/tests/test_images.py deleted file mode 100644 index d0a700792..000000000 --- a/tests/test_images.py +++ /dev/null @@ -1,63 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from oslo_log import fixture as log_fixture -from oslo_log import log as logging -from oslotest import base - -from subprocess import PIPE -from subprocess import Popen -from subprocess import STDOUT - -LOG = logging.getLogger(__name__) - - -class ImagesTest(base.BaseTestCase): - - def setUp(self): - super(ImagesTest, self).setUp() - self.useFixture(log_fixture.SetLogLevel([__name__], - logging.logging.INFO)) - - def test_builds(self): - proc = Popen(['tools/build-all-docker-images', - '--testmode', - '--retry 3'], - stdout=PIPE, stderr=STDOUT, bufsize=1) - with proc.stdout: - for line in iter(proc.stdout.readline, b''): - LOG.info(line.strip()) - proc.wait() - - # these are images that are known to not build properly - excluded_images = ["kollaglue/centos-rdo-rhel-osp-base", - "kollaglue/centos-rdo-gnocchi-api", - "kollaglue/centos-rdo-gnocchi-statsd"] - - results = eval(line) - - failures = 0 - for image, result in results.iteritems(): - if image in excluded_images: - if result is 'fail': - continue - failures = failures + 1 - LOG.warning(">>> Expected image '%s' to fail, please update" - " the excluded_images in source file above if the" - " image build has been fixed." % image) - else: - if result is not 'fail': - continue - failures = failures + 1 - LOG.critical(">>> Expected image '%s' to succeed!" % image) - - self.assertEqual(failures, 0, "%d failure(s) occurred" % failures) diff --git a/tools/build-all-docker-images b/tools/build-all-docker-images deleted file mode 100755 index dfd970426..000000000 --- a/tools/build-all-docker-images +++ /dev/null @@ -1,239 +0,0 @@ -#!/usr/bin/env bash -# Depends on bash 4 and gawk - -TOPDIR=$(git rev-parse --show-toplevel) -# Work in a temp dir so that developers can continue working while a build is -# in progress -WORKDIR=$(mktemp -d /tmp/kolla-workdir.XXXXXXXXXX) -# Remove $WORKDIR otherwise $TOPDIR is copied *inside* of it -rm -rf $WORKDIR -cp -aL "$TOPDIR" $WORKDIR -DOCKERDIR="$WORKDIR/docker" - -declare -A dependency -declare -A img_dirs -declare -A status - -function info { - [[ -n $1 ]] && printf "%s\n" "$1" -} - -function success { - [[ -n $1 ]] && printf "\033[00;32m%s\033[00m\n" "$1" -} - -function warn { - [[ -n $1 ]] && printf "\033[00;31m%s\033[00m\n" "$1" -} - -function set_defaults { - PREFIX=centos-rdo- - NAMESPACE=kollaglue - [ -f $WORKDIR/.buildconf ] && . $WORKDIR/.buildconf - [ -n "${FORCE_PREFIX}" ] && PREFIX="${FORCE_PREFIX}" -} - -function has_changed { - local image=$1 - # Rebuild everything unless given git revision - # We don't really care about the order of the $FROM and $TO parameters, all - # we need is the list of changed files between the revisions, or HEAD if - # only one of them is specified - [[ -z $FROM && -z $TO ]] || git diff --name-only $FROM $TO | grep -q "${img_dirs[$image]#$WORKDIR/}" -} - -function requires_build { - local image=$1 - local dep=${dependency[$image]} - # An image requires a built if it meets the following conditions: - # - it has instructions to build the image - # - it hasn't been processed yet - # - its dependency was rebuilt or its build instruction was modified - [[ ${img_dirs[$image]} && -z ${status[$image]} ]] && \ - ([[ ${status[$dep]} == "rebuilt" ]] || has_changed $image) -} - -function build_image { - local dir=$1 - printf "\n" - if [ -x "$dir/build" ]; then - info "Building image in $dir" - if $dir/build $ARGS --no-use-released-parent; then - success "Successfully built image in $dir" - status[$image]="rebuilt" - else - warn "Failed to build image in $dir" - status[$image]="fail" - fi - else - warn "Image $image does not provide build script" - status[$image]="fail" - fi -} - -function init_image { - local img_dir=$1 - - set_defaults - [ -f $WORKDIR/.buildconf ] && . $WORKDIR/.buildconf - [ -f $img_dir/.buildconf ] && . $img_dir/.buildconf - [ -n "$FORCE_NAMESPACE" ] && NAMESPACE=$FORCE_NAMESPACE - [ -n "${REGISTRY}" ] && NAMESPACE="${REGISTRY}/${NAMESPACE}" - - local image="${NAMESPACE:+${NAMESPACE}/}${PREFIX}${img_dir##*/}" - local base_image=$(cat $img_dir/Dockerfile | gawk 'match($0, /^\s*FROM\s+(\S+)/, matches) {print matches[1]}' ) - base_image=${base_image//%%KOLLA_NAMESPACE%%/$NAMESPACE} - base_image=${base_image//%%KOLLA_PREFIX%%/$PREFIX} - base_image=${base_image//:%%KOLLA_TAG%%/} - - img_dirs[$image]=$img_dir - dependency[$image]=$base_image - - # Restore defaults to minimize risk of side effects - set_defaults -} - -function process_image { - local image=$1 - if [ -n "${dependency[$image]}" ]; then - process_image ${dependency[$image]} - fi - if requires_build $image; then - build_image ${img_dirs[$image]} - fi - if [ -z "${status[$image]}" ]; then - status[$image]="up-to-date" - fi -} - -function print_summary { - printf "\nSummary\n=======\n" - for image in "${!status[@]}"; do - case "${status[$image]}" in - ("fail") warn "Failed to process $image" ;; - ("rebuilt") success "Rebuilt $image" ;; - (*) info "$image: ${status[$image]}" ;; - esac - done -} - -function print_parseable_summary { - printf "{" - for image in "${!status[@]}"; do - printf "'$image':'${status[$image]}'," - done - printf "}" -} - -function interrupted { - info "Interrupted..." - print_summary - rm -rf $WORKDIR - exit 1 -} - -function usage { - read -r -d '' HELP <<EOF -A wrapper to build-docker-image that build all images in order. - -Options: - ---prefix <image_prefix> ---from <git-revision> ---to <git-revision> - -$($WORKDIR/tools/build-docker-image --help) -EOF - printf "%s\n" "${HELP/$WORKDIR\/tools\/build-docker-image/$0}" -} - -trap 'interrupted' INT - - -ARGS=$@ -PARSED_ARGS=$(getopt -q -o hr:n:t: -l help,prefix:,namespace:,release,tag:,private-registry:,from:,to:,testmode -- "$@") - -eval set -- "$PARSED_ARGS" - -while :; do - case "$1" in - - (--help|-h) usage - exit 0 - ;; - - (--prefix) shift - FORCE_PREFIX="$1" - ;; - - (--namespace|-n) - shift - FORCE_NAMESPACE="$1" - ;; - - (--release) - RELEASE_SPECIFIED=1 - ;; - - (--tag|-t) - shift - TAG_SPECIFIED=1 - ;; - - (--private-registry|-r) - shift - REGISTRY="$1" - ;; - - (--from) - shift - FROM="$1" - ARGS=${ARGS/\-\-from*$FROM/} - ;; - - (--to) - shift - TO="$1" - ARGS=${ARGS/\-\-to*$TO/} - ;; - - (--testmode) - TESTMODE=1 - ARGS=${ARGS/\-\-testmode/} - ;; - - (--) break - ;; - - esac - - shift -done - -set_defaults - -# BASE == centos, fedora, ubuntu, etc. -BASE=$(echo "${PREFIX}" | cut -d- -f1) -# TYPE == binary, source, rdo -TYPE=$(echo "${PREFIX}" | cut -d- -f2) - -# Ensure a tag is specified otherwise build may fail when changing git branch -# The release tag is automatically appended when --release flag is used. -if [[ $RELEASE_SPECIFIED != 1 ]] && [[ $TAG_SPECIFIED != 1 ]]; then - TAG=$(git rev-parse --short HEAD) - ARGS+=" --tag $TAG" -fi - -# Do a first pass to find images to build and their dependencies -for dockerfile in $(find "${DOCKERDIR}/${BASE}/${TYPE}" -name Dockerfile); do - init_image $(dirname $dockerfile) -done - -# Process all images -for image in "${!img_dirs[@]}"; do - process_image $image -done - -print_summary -[ -n "$TESTMODE" ] && print_parseable_summary -rm -rf $WORKDIR diff --git a/tools/build-docker-image b/tools/build-docker-image deleted file mode 100755 index f7c7995e1..000000000 --- a/tools/build-docker-image +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/bash - -TOPDIR=$(git rev-parse --show-toplevel) -IMGDIR="$(cd "$(dirname "$0")" && pwd)" - -. $TOPDIR/tools/validate-docker-execute - -RELEASE_NAMESPACE=kollaglue -NAMESPACE=kollaglue -PREFIX=centos-rdo- -TAG=$(git rev-parse --short HEAD) -RELEASE_TAG=latest -MAX_TRIES=1 - -usage () { - cat <<EOF -Usage: $0 [options] - -Options: - ---prefix <image_prefix> ---private-registry, -r <registry_address[:port]> ---namespace, -n <namespace> ---tag, -t <tag> ---push, -p ---force-rm, -f ---no-cache, -N ---pull, -u ---release ---no-use-released-parent ---retry <number_of_retries> -EOF -} - -[ -f $TOPDIR/.buildconf ] && . $TOPDIR/.buildconf -[ -f $IMGDIR/.buildinfo ] && . $IMGDIR/.buildinfo -[ -f $IMGDIR/.buildconf ] && . $IMGDIR/.buildconf - -ARGS=$(getopt -o hr:n:t:pfuN -l help,prefix:,namespace:,push,pull,private-registry:,release,tag:,force-rm,no-cache,no-use-released-parent,retry: -- "$@") || { usage >&2; exit 2; } - -eval set -- "$ARGS" - -while :; do - case "$1" in - - (--help|-h) usage - exit 0 - ;; - - (--prefix) shift - FORCE_PREFIX="$1" - ;; - - (--release) MODE=release - NAMESPACE=$RELEASE_NAMESPACE - TAG=$RELEASE_TAG - ;; - - (--tag|-t) shift - TAG="$1" - ;; - - (--push|-p) PUSH=1 - ;; - - (--pull|-u) BUILDFLAGS="${BUILDFLAGS} --pull=true" - ;; - - (--force-rm|-f) - BUILDFLAGS="${BUILDFLAGS} --force-rm=true" - ;; - - (--no-cache|-N) - BUILDFLAGS="${BUILDFLAGS} --no-cache" - ;; - - (--private-registry|-r) - shift - REGISTRY="$1" - ;; - - (--namespace|-n) - shift - NAMESPACE="$1" - ;; - - (--no-use-released-parent) - USE_CURRENT_TAG=1 - ;; - - (--retry) - shift - MAX_TRIES=$((MAX_TRIES + $1)) - ;; - - (--) break - ;; - - esac - - shift -done - -if [[ $USE_CURRENT_TAG = 1 ]]; then - PARENT_TAG=$TAG -else - PARENT_TAG=$RELEASE_TAG -fi - -if [ "$NAMESPACE" = "$RELEASE_NAMESPACE" ] \ - && [ "$TAG" = "$RELEASE_TAG" ] \ - && ! [ "$MODE" = "release" ]; then - - echo "ERROR: use --release to build a release image" >&2 - exit 1 -fi - -if [[ -n "${PREFIX}" && -n "${FORCE_PREFIX}" ]]; then - PREFIX="${FORCE_PREFIX}" -fi - - -if [[ -n $REGISTRY ]]; then - NAMESPACE="${REGISTRY}/${NAMESPACE}" -fi - -IMAGE="${PREFIX}${IMGDIR##*/}" -FULLIMAGE="${NAMESPACE}/${IMAGE}${TAG:+:${TAG}}" - -cat <<EOF -====================================================================== -$FULLIMAGE -====================================================================== - -EOF - -if [ "$MODE" = "release" ]; then - echo "*** YOU ARE BUILDING A RELEASE IMAGE ***" - echo -fi - -TMPDIR=$(mktemp -d /tmp/kolla-build.XXXXXXXXXX) -cp -aL $IMGDIR/* $TMPDIR -# Use an extension for in-place editing for portability, as GNU and BSD -# versions of sed behave differently otherwise -sed -i.bak "s|%%KOLLA_NAMESPACE%%|${NAMESPACE}|g" $TMPDIR/Dockerfile -sed -i.bak "s|%%KOLLA_PREFIX%%|${PREFIX}|g" $TMPDIR/Dockerfile -sed -i.bak "s|%%KOLLA_TAG%%|${PARENT_TAG}|g" $TMPDIR/Dockerfile - -if [[ "${SOURCE_INSTALL_AVAILABLE}" == "1" ]]; then - . ${TOPDIR}/tools/gen-source-tar.sh -fi - -TRY=0 -while [ $((MAX_TRIES - 1)) -gt $TRY ]; do - if docker build ${BUILDFLAGS} -t "$FULLIMAGE" $TMPDIR; then - break - else - echo "WARNING: failed to build $FULLIMAGE, retrying..." - TRY=$((TRY + 1)) - fi -done - -if ! docker build ${BUILDFLAGS} -t "$FULLIMAGE" $TMPDIR; then - echo "ERROR: failed to build $FULLIMAGE" - exit 1 -fi - -rm -rf $TMPDIR - -echo "Built: $FULLIMAGE" - -if [ "$PUSH" = 1 ]; then - if ! docker push "$FULLIMAGE"; then - echo "ERROR: failed to push $FULLIMAGE" - exit 1 - fi - - echo "Pushed: $FULLIMAGE" -fi diff --git a/tools/gen-source-tar.sh b/tools/gen-source-tar.sh deleted file mode 100644 index 6f3a6eb20..000000000 --- a/tools/gen-source-tar.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -set -e - -: ${SOURCE_INSTALL_METHOD:=curl} -: ${GIT_REF:=master} -: ${LOCAL_SOURCE:=/tmp/${COMPONENT}} - -function fetch_source_from_uri { - curl ${TARBALL_URI} -o ${TMPDIR}/${COMPONENT}.tar -} - -function fetch_source_from_git { - # NOTE(pbourke): do a shallow clone to master only, unless a specific ref is - # required - if [ -z ${GIT_REF} ]; then - git clone --depth=1 ${CLONE_FROM} ${TMPDIR}/${COMPONENT} - else - git clone ${CLONE_FROM} ${TMPDIR}/${COMPONENT} - git --git-dir ${TMPDIR}/${COMPONENT}/.git \ - --work-tree ${TMPDIR}/${COMPONENT}/ \ - checkout ${GIT_REF} - fi - tar -cf ${TMPDIR}/${COMPONENT}.tar -C ${TMPDIR} ${COMPONENT} -} - -function fetch_source_from_local { - tar -cf ${TMPDIR}/${COMPONENT}.tar \ - -C $(dirname ${LOCAL_SOURCE}) ${COMPONENT} -} - -case ${SOURCE_INSTALL_METHOD} in - curl) - fetch_source_from_uri - ;; - git) - fetch_source_from_git - ;; - local) - fetch_source_from_local - ;; - *) - cat << EOF -Unknown install method '${SOURCE_INSTALL_METHOD}'. Please check the value of -\$SOURCE_INSTALL_METHOD in .buildconf -EOF - exit 1 - ;; -esac diff --git a/tools/update-build-links b/tools/update-build-links deleted file mode 100755 index 76c4df3ef..000000000 --- a/tools/update-build-links +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')") -cd "$(dirname "$REAL_PATH")/.." - -find docker -name Dockerfile | while read dockerfile; do - dir=${dockerfile%/*} - link=$(python -c 'import os,sys; print os.path.relpath(sys.argv[1], sys.argv[2])' \ - $PWD/tools/build-docker-image $dir) - ln -sf $link $dir/build -done - diff --git a/tools/validate-links.sh b/tools/validate-links.sh deleted file mode 100755 index 671120dd5..000000000 --- a/tools/validate-links.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')") -cd "$(dirname "$REAL_PATH")/.." - -if find . -type l -exec test ! -e {} \; -print | egrep '.*'; then - exit 1 -fi @@ -29,18 +29,6 @@ commands = whitelist_externals = bash commands = bash -c tests/setup_gate.sh -[testenv:images] -whitelist_externals = find - bash - sudo -commands = - bash -c "if [ -f .buildconf ]; then mv .buildconf buildconf.bak; fi" - bash -c "echo PREFIX=centos-rdo- > .buildconf" - find . -type f -name "*.pyc" -delete - bash -c "if [ ! -d .testrepository ]; then testr init; fi" - sudo -g docker testr run ^(test_images).* - bash -c "if [ -f buildconf.bak ]; then mv buildconf.bak .buildconf; fi" - # deprecated [testenv:images-centos-binary] whitelist_externals = find |