diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-06 10:14:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-06 10:14:03 +0000 |
| commit | 3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7 (patch) | |
| tree | d923b0b6e4e8fbf1b97a4fdcf6c4b4b336c1d878 /docker/trove | |
| parent | a130ecb153f555ffd96bebf554eaa10c34a1486d (diff) | |
| parent | 69fef5cd59286b5eeaa4deaf9da97511413ed653 (diff) | |
| download | kolla-3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7.tar.gz kolla-3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7.zip | |
Merge "debian: enable all images enabled for Ubuntu"
Diffstat (limited to 'docker/trove')
| -rw-r--r-- | docker/trove/trove-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/trove/trove-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/trove/trove-conductor/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/trove/trove-guestagent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/trove/trove-taskmanager/Dockerfile.j2 | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index c3dd29a00..8506a0549 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/docker/trove/trove-api/Dockerfile.j2 @@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set trove_api_packages = ['openstack-trove-api'] %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set trove_api_packages = ['trove-api'] %} {% endif %} diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index 6d66203f3..f1cc2d72c 100644 --- a/docker/trove/trove-base/Dockerfile.j2 +++ b/docker/trove/trove-base/Dockerfile.j2 @@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set trove_base_packages = ['openstack-trove-common'] %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {{ macros.ubuntu_trove_bug_1651852() }} {% set trove_base_packages = [] %} {% endif %} diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2 index a8a187acf..7e807bc27 100644 --- a/docker/trove/trove-conductor/Dockerfile.j2 +++ b/docker/trove/trove-conductor/Dockerfile.j2 @@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set trove_conductor_packages = ['openstack-trove-conductor'] %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set trove_conductor_packages = ['trove-conductor'] %} {% endif %} diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2 index c5c5f8cad..5b8409eb8 100644 --- a/docker/trove/trove-guestagent/Dockerfile.j2 +++ b/docker/trove/trove-guestagent/Dockerfile.j2 @@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set trove_guestagent_packages = ['openstack-trove-guestagent'] %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set trove_guestagent_packages = ['trove-guestagent'] %} {% endif %} diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2 index 4d2002842..773eb69f4 100644 --- a/docker/trove/trove-taskmanager/Dockerfile.j2 +++ b/docker/trove/trove-taskmanager/Dockerfile.j2 @@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set trove_taskmanager_packages = ['openstack-trove-taskmanager'] %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set trove_taskmanager_packages = ['trove-taskmanager'] %} {% endif %} |