diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-24 12:31:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-24 12:31:49 +0000 |
| commit | d3d7777ebb3d9617fe92feee1f64c506acd1171e (patch) | |
| tree | 6ca7511013d25c0d5de6b0d9399b44e339252f7f | |
| parent | 04ba3ccb51dc70e75e5b80eea45bb79b0543e618 (diff) | |
| parent | 5c5a3faaa055f9074c33872f0fd1562c089eeb73 (diff) | |
| download | kolla-d3d7777ebb3d9617fe92feee1f64c506acd1171e.tar.gz kolla-d3d7777ebb3d9617fe92feee1f64c506acd1171e.zip | |
Merge "automaton renamed to python-automaton"
| -rw-r--r-- | docker/centos/binary/cinder/cinder-base/Dockerfile | 2 | ||||
| -rw-r--r-- | docker_templates/cinder/cinder-base/Dockerfile.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/centos/binary/cinder/cinder-base/Dockerfile b/docker/centos/binary/cinder/cinder-base/Dockerfile index fb8dea608..b6db65e63 100644 --- a/docker/centos/binary/cinder/cinder-base/Dockerfile +++ b/docker/centos/binary/cinder/cinder-base/Dockerfile @@ -1,4 +1,4 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -RUN yum -y install openstack-cinder automaton && yum clean all +RUN yum -y install openstack-cinder python-automaton && yum clean all diff --git a/docker_templates/cinder/cinder-base/Dockerfile.j2 b/docker_templates/cinder/cinder-base/Dockerfile.j2 index 6e34a3f2f..fe899ae44 100644 --- a/docker_templates/cinder/cinder-base/Dockerfile.j2 +++ b/docker_templates/cinder/cinder-base/Dockerfile.j2 @@ -5,7 +5,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} RUN yum -y install openstack-cinder \ - automaton \ + python-automaton \ && yum clean all {% elif base_distro in ['ubuntu', 'debian'] %} |