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/neutron | |
| 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/neutron')
| -rw-r--r-- | docker/neutron/neutron-agents/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2 index 58d2b6d05..7eb1a1152 100644 --- a/docker/neutron/neutron-agents/Dockerfile.j2 +++ b/docker/neutron/neutron-agents/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-neutron-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 826a0788e..8560d72d5 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-openstack-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index 20f502f18..360afc4d1 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-neutron-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index 6911afb94..b6e797b0c 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-neutron-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 1b3f49650..12a9b2df7 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-neutron-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net.kolla) {% if install_type == 'binary' %} |