diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-19 18:55:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-19 18:55:36 +0000 |
| commit | da65e6a6ba597701ab75480b607f83abeb1baa10 (patch) | |
| tree | b837f30a6f2cea3274ec8ed22179f7e6f26406e2 /docker | |
| parent | dbee85d41b9356b2f250cf624fbe972c4f87e2cf (diff) | |
| parent | 92224ccb518c90d7c269158d074d811aee2f05f0 (diff) | |
| download | kolla-da65e6a6ba597701ab75480b607f83abeb1baa10.tar.gz kolla-da65e6a6ba597701ab75480b607f83abeb1baa10.zip | |
Merge "CentOS 8: Enable hacluster and masakari images"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/hacluster/hacluster-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/hacluster/hacluster-pcs/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/masakari/masakari-monitors/Dockerfile.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/hacluster/hacluster-base/Dockerfile.j2 b/docker/hacluster/hacluster-base/Dockerfile.j2 index 26fc3fd70..6dfbc822e 100644 --- a/docker/hacluster/hacluster-base/Dockerfile.j2 +++ b/docker/hacluster/hacluster-base/Dockerfile.j2 @@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.enable_extra_repos(['hacluster']) }} + COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start diff --git a/docker/hacluster/hacluster-pcs/Dockerfile.j2 b/docker/hacluster/hacluster-pcs/Dockerfile.j2 index bb7d92a6c..4486fa72f 100644 --- a/docker/hacluster/hacluster-pcs/Dockerfile.j2 +++ b/docker/hacluster/hacluster-pcs/Dockerfile.j2 @@ -7,8 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.enable_extra_repos(['hacluster']) }} - {% set hacluster_pcs_packages = ['pcs','crmsh'] %} {{ macros.install_packages(hacluster_pcs_packages | customizable("packages")) }} diff --git a/docker/masakari/masakari-monitors/Dockerfile.j2 b/docker/masakari/masakari-monitors/Dockerfile.j2 index b0856d1dd..d7098f737 100644 --- a/docker/masakari/masakari-monitors/Dockerfile.j2 +++ b/docker/masakari/masakari-monitors/Dockerfile.j2 @@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.configure_user(name='masakari') }} +{{ macros.enable_extra_repos(['hacluster']) }} {% if install_type == 'binary' %} |