diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-08-24 17:21:04 +0100 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-08-25 16:42:09 +0100 |
| commit | 9f5efc5ea6736001160b49a81ec6274ba6353169 (patch) | |
| tree | 196fa0f445f73a322260f42af8dd1a16ec881a8b /docker/openstack-base | |
| parent | d8755e173ff6744e13fa73cbc4ed6b384c51a3e3 (diff) | |
| download | kolla-9f5efc5ea6736001160b49a81ec6274ba6353169.tar.gz kolla-9f5efc5ea6736001160b49a81ec6274ba6353169.zip | |
Import the Murano core libary as part of setup
In order for Murano to be operational the core library package must be
imported [0]
Add Ansible tasks to do this idempotently.
[0] http://docs.openstack.org/developer/murano/install/manual.html
TrivialFix
Change-Id: I2c49e9d663595650b885267839012b543505337a
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index c3d6dc2a9..99544749a 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -202,7 +202,8 @@ ENV DEBIAN_FRONTEND noninteractive 'postgresql', 'postgresql-devel', 'python-devel', - 'sqlite-devel' + 'sqlite-devel', + 'zip' ] %} {% elif base_distro in ['ubuntu', 'debian'] %} {% set openstack_base_packages = [ @@ -217,11 +218,13 @@ ENV DEBIAN_FRONTEND noninteractive 'libyaml-dev', 'libz-dev', 'pkg-config', - 'git' + 'git', + 'zip' ] %} {% endif %} {{ macros.install_packages(openstack_base_packages | customizable("packages")) }} + ADD openstack-base-archive /openstack-base-source RUN ln -s openstack-base-source/* /requirements \ && mkdir -p /var/lib/kolla \ |