diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-28 10:49:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-28 10:49:53 +0000 |
| commit | 6a622ec82c2c63bfe08d6432ce39c2ece18ccbbe (patch) | |
| tree | e3c4b7312e7bf0ce65ae3d1e5be25b44b16a97fe /docker/openvswitch | |
| parent | fea0f07c089683c9a1061833fa2533f994fe9198 (diff) | |
| parent | 0e99b69de48c1deb7f6f1f707e78f445caa5c3d0 (diff) | |
| download | kolla-6a622ec82c2c63bfe08d6432ce39c2ece18ccbbe.tar.gz kolla-6a622ec82c2c63bfe08d6432ce39c2ece18ccbbe.zip | |
Merge "Implement a install_type and install_metatype"
Diffstat (limited to 'docker/openvswitch')
| -rw-r--r-- | docker/openvswitch/ovs-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/openvswitch/ovs-db-server/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/openvswitch/ovs-vswitchd/Dockerfile.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/openvswitch/ovs-base/Dockerfile.j2 b/docker/openvswitch/ovs-base/Dockerfile.j2 index 05e5b1892..7ededdfcd 100644 --- a/docker/openvswitch/ovs-base/Dockerfile.j2 +++ b/docker/openvswitch/ovs-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/openvswitch/ovs-db-server/Dockerfile.j2 b/docker/openvswitch/ovs-db-server/Dockerfile.j2 index bec5a8f12..cca030e35 100644 --- a/docker/openvswitch/ovs-db-server/Dockerfile.j2 +++ b/docker/openvswitch/ovs-db-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ovs-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ovs-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / diff --git a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 b/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 index 14b3d08a9..839da1f21 100644 --- a/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/ovs-vswitchd/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ovs-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ovs-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh / |