aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-22 12:56:36 -0700
committerSteven Dake <stdake@cisco.com>2015-08-22 12:57:47 -0700
commit5c5a3faaa055f9074c33872f0fd1562c089eeb73 (patch)
tree65e2c8d614d88e22a72ad331f10d5bd0c77cb637
parentf70e8d4598c58f8b2904542f7e0d87c693f70761 (diff)
downloadkolla-5c5a3faaa055f9074c33872f0fd1562c089eeb73.tar.gz
kolla-5c5a3faaa055f9074c33872f0fd1562c089eeb73.zip
automaton renamed to python-automaton
Cinder is broken by this RDO package rename. Maintaining docker templates for basic things like this until the /docker directory is removed. Change-Id: Ieae2ab3296346767c305d21e8bb8de964160f84a Closes-Bug: #1487762
-rw-r--r--docker/centos/binary/cinder/cinder-base/Dockerfile2
-rw-r--r--docker_templates/cinder/cinder-base/Dockerfile.j22
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'] %}