openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow changing base image"

Browse Source
This commit is contained in:
Jenkins 2015-03-06 00:44:02 +00:00 committed by Gerrit Code Review
commit c3114b9610
42 changed files with 65 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/barbican/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh ADD ./start.sh /start.sh

2
docker/ceilometer/ceilometer-alarm/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-ceilometer-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-alarm && yum clean all RUN yum install -y openstack-ceilometer-alarm && yum clean all

2
docker/ceilometer/ceilometer-api/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-ceilometer-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-api && yum clean all RUN yum install -y openstack-ceilometer-api && yum clean all

2
docker/ceilometer/ceilometer-base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN mkdir -p /opt/kolla RUN mkdir -p /opt/kolla

2
docker/ceilometer/ceilometer-central/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-ceilometer-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-central && yum clean all RUN yum install -y openstack-ceilometer-central && yum clean all

2
docker/ceilometer/ceilometer-collector/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-ceilometer-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-collector && yum clean all RUN yum install -y openstack-ceilometer-collector && yum clean all

2
docker/ceilometer/ceilometer-compute/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-ceilometer-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-pecan \ RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-pecan \

2
docker/ceilometer/ceilometer-notification/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-ceilometer-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-notification && yum clean all RUN yum install -y openstack-ceilometer-notification && yum clean all

2
docker/cinder/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-cinder && yum clean all RUN yum -y install openstack-cinder && yum clean all

2
docker/glance/glance-api/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-glance-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
VOLUME /var/lib/glance VOLUME /var/lib/glance

2
docker/glance/glance-base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-glance ; yum clean all RUN yum -y install openstack-glance ; yum clean all

2
docker/glance/glance-registry/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-glance-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh ADD ./start.sh /start.sh

2
docker/heat/heat-api/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-heat-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
# TODO: configure cfn and cloudwatch # TODO: configure cfn and cloudwatch

2
docker/heat/heat-base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN mkdir -p /opt/kolla RUN mkdir -p /opt/kolla

2
docker/heat/heat-engine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-heat-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%heat-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \ RUN yum -y install \

2
docker/horizon/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \ RUN yum -y install \

2
docker/keystone/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
#Install required packages #Install required packages

2
docker/mariadb/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install mariadb-galera-server; yum clean all RUN yum -y install mariadb-galera-server; yum clean all

2
docker/mongodb/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install mongodb mongodb-server; yum clean all RUN yum -y install mongodb mongodb-server; yum clean all

2
docker/neutron/agents/dhcp/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-neutron-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install required packages # Install required packages

2
docker/neutron/agents/l3/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-neutron-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install required packages # Install required packages

2
docker/neutron/agents/linux-bridge/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-neutron-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install required packages # Install required packages

2
docker/neutron/agents/metadata/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-neutron-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install required packages # Install required packages

2
docker/neutron/neutron-base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-neutron-ml2 ; yum clean all RUN yum -y install openstack-neutron-ml2 ; yum clean all

2
docker/neutron/neutron-server/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-neutron-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
#Install required packages #Install required packages

2
docker/nova-base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-common \ RUN yum -y install openstack-nova-common \

2
docker/nova-compute/nova-compute/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-nova-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-compute sysfsutils \ RUN yum -y install openstack-nova-compute sysfsutils \

2
docker/nova-compute/nova-libvirt/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install libvirtd libguestfs qemu-system-x86 \ RUN yum -y install libvirtd libguestfs qemu-system-x86 \

2
docker/nova-compute/nova-network/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-nova-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-network \ RUN yum -y install openstack-nova-network \

2
docker/nova-controller/nova-api/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-nova-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \ RUN yum -y install \

2
docker/nova-controller/nova-conductor/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-nova-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \ RUN yum -y install \

2
docker/nova-controller/nova-scheduler/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-nova-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \ RUN yum -y install \

2
docker/rabbitmq/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install required packages # Install required packages

2
docker/swift/swift-account/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-swift-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh ADD ./start.sh /start.sh

2
docker/swift/swift-base/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-utils openstack-swift && yum clean all RUN yum -y install openstack-utils openstack-swift && yum clean all

2
docker/swift/swift-container/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-swift-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh ADD ./start.sh /start.sh

2
docker/swift/swift-object/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-swift-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh ADD ./start.sh /start.sh

2
docker/swift/swift-proxy-server/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-swift-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh ADD ./start.sh /start.sh

2
docker/zaqar/Dockerfile
View File

@ -1,4 +1,4 @@
FROM kollaglue/fedora-rdo-base FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN curl -O https://repos.fedorapeople.org/repos/openstack/openstack-juno/fedora-21/openstack-zaqar-2014.2-1.fc22.noarch.rpm RUN curl -O https://repos.fedorapeople.org/repos/openstack/openstack-juno/fedora-21/openstack-zaqar-2014.2-1.fc22.noarch.rpm

38
docs/image-building.md
View File

@ -37,21 +37,6 @@ commands:
$ docker run kollaglue/fedora-rdo-keystone:76a1602 $ docker run kollaglue/fedora-rdo-keystone:76a1602
Or in your kubernetes configurations:
"containers": [{
"name": "keystone",
"image": "kollaglue/fedora-rdo-keystone:76a1602",
"ports": [
{"containerPort": 5000},
{"containerPort": 35357}
],
"env": [
{"name": "DB_ROOT_PASSWORD", "value": "password"},
{"name": "KEYSTONE_ADMIN_TOKEN", "value": "ADMINTOKEN"}
]
}]
## Building releases ## Building releases
To build into the `latest` tag, add `--release`: To build into the `latest` tag, add `--release`:
@ -62,14 +47,31 @@ Or to build and push:
$ ./build --push --release $ ./build --push --release
## Build all images at once
The `build-all-docker-images` script in the tools directory is a wrapper for
the `build-docker-image` that builds all images, as the name suggests, in the
correct order. It responds to the same options as `build-docker-image` with the
additional `--from` and `--to` options that allows building only images that
have changed between the specified git revisions.
For example, to build all images contained in docker directory and push new release:
$ tools/build-all-docker-images --release --push
To build only images modified in test-branch along with their children:
$ tools/build-all-docker-images --from master --to test-branch
## Configuration ## Configuration
The `build-docker-image` script will look for a file named `.buildconf` The `build-docker-image` script will look for a file named `.buildconf`
in your current directory and in the top level of the repository. You in the image directory and in the top level of the repository. You
can use this to set defaults, such as: can use this to set defaults, such as:
NAMESPACE=larsks NAMESPACE=larsks
PREFIX=centos-rdo-
This setting would cause all images to be tagged into the `larsks/` This setting would cause images to be tagged into the `larsks/`
namespace. namespace and use CentOS as base image instead of the default Fedora.

2
tools/build-all-docker-images
View File

@ -76,6 +76,8 @@ function init_image {
local image="${NAMESPACE:+${NAMESPACE}/}${PREFIX}${img_dir##*/}" local image="${NAMESPACE:+${NAMESPACE}/}${PREFIX}${img_dir##*/}"
local base_image=$(cat $img_dir/Dockerfile | gawk 'match($0, /^\s*FROM\s+(\S+)/, matches) {print matches[1]}' ) local base_image=$(cat $img_dir/Dockerfile | gawk 'match($0, /^\s*FROM\s+(\S+)/, matches) {print matches[1]}' )
base_image=${base_image//%%KOLLA_NAMESPACE%%/$NAMESPACE}
base_image=${base_image//%%KOLLA_PREFIX%%/$PREFIX}
img_dirs[$image]=$img_dir img_dirs[$image]=$img_dir
dependency[$image]=$base_image dependency[$image]=$base_image

4
tools/build-docker-image
View File

@ -90,6 +90,10 @@ fi
TMPDIR=$(mktemp -d /tmp/kolla-build.XXXXXXXXXX) TMPDIR=$(mktemp -d /tmp/kolla-build.XXXXXXXXXX)
cp -aL $IMGDIR/* $TMPDIR cp -aL $IMGDIR/* $TMPDIR
# Use an extension for in-place editing for portability, as GNU and BSD
# versions of sed behave differently otherwise
sed -i.bak "s/%%KOLLA_NAMESPACE%%/${NAMESPACE}/g" $TMPDIR/Dockerfile
sed -i.bak "s/%%KOLLA_PREFIX%%/${PREFIX}/g" $TMPDIR/Dockerfile
if ! docker build ${BUILDFLAGS} -t "$FULLIMAGE" $TMPDIR; then if ! docker build ${BUILDFLAGS} -t "$FULLIMAGE" $TMPDIR; then
echo "ERROR: failed to build $FULLIMAGE" echo "ERROR: failed to build $FULLIMAGE"