diff options
Diffstat (limited to 'docker/centos/binary')
270 files changed, 0 insertions, 1076 deletions
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 |