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/ceilometer | |
| 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/ceilometer')
7 files changed, 7 insertions, 7 deletions
diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 index b7fcc7fc2..f720ee15d 100644 --- a/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 9316ac5c5..7470a9026 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 43c399a8d..315a218f5 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-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 == 'source' %} diff --git a/docker/ceilometer/ceilometer-central/Dockerfile.j2 b/docker/ceilometer/ceilometer-central/Dockerfile.j2 index 0d7ee7147..3b2e9a2c0 100644 --- a/docker/ceilometer/ceilometer-central/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-central/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 index ec6ccbce9..c5cf80d45 100644 --- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-collector/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 60b18b973..dd6bc62af 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index bc6b30ffe..571166443 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if install_type == 'binary' %} |