openstack
/
kolla
Code Issues Proposed changes

Merge "Delete the extra blank lines"

This commit is contained in:
Jenkins 2017-02-07 03:48:30 +00:00 committed by Gerrit Code Review
parent 61067c4da4 4d7814702c
commit 40130b2e7a
5 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docker/cinder/cinder-api/Dockerfile.j2
View File

@ -7,45 +7,32 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_api_packages = [
'python-keystone',
'httpd',
'mod_wsgi'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set cinder_api_packages = [
'cinder-api',
'apache2',
'libapache2-mod-wsgi'
] %}
{% endif %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_api_packages = [
'httpd',
'mod_wsgi'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set cinder_api_packages = [
'apache2',
'libapache2-mod-wsgi'
] %}
{% endif %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
{% endif %}

8
docker/cinder/cinder-backup/Dockerfile.j2
View File

@ -7,33 +7,25 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_backup_packages = [
'nfs-utils'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set cinder_backup_packages = [
'nfs-common',
'cinder-backup'
] %}
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_backup_packages = [
'nfs-utils'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set cinder_backup_packages = [
'nfs-common'
] %}
{% endif %}
{% endif %}

10
docker/cinder/cinder-base/Dockerfile.j2
View File

@ -9,45 +9,35 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_base_packages = [
'openstack-cinder',
'python-automaton',
'lvm2',
'ceph-common'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set cinder_base_packages = [
'cinder-common',
'ceph-common',
'lvm2'
] %}
{% endif %}
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_base_packages = [
'lvm2',
'qemu-img',
'ceph-common'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set cinder_base_packages = [
'lvm2',
'qemu-utils',
'ceph-common'
] %}
{% endif %}
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
ADD cinder-base-archive /cinder-base-source

1
docker/cinder/cinder-scheduler/Dockerfile.j2
View File

@ -7,7 +7,6 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['ubuntu'] %}
{% set cinder_scheduler_packages = [
'cinder-scheduler'
] %}

6
docker/cinder/cinder-volume/Dockerfile.j2
View File

@ -6,12 +6,10 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_volume_packages = [
'nfs-utils',
'scsi-target-utils'
] %}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
{% block cinder_volume_redhat_setup %}
@ -19,11 +17,9 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
{% endblock %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set cinder_volume_packages = [
'tgt'
] %}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
{% block cinder_volume_ubuntu_setup %}
@ -34,12 +30,10 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
{% if install_type == 'binary' %}
{% if base_distro in ['ubuntu', 'debian'] %}
{% set cinder_volume_packages = [
'cinder-volume',
'nfs-common'
] %}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
{% endif %}
{% endif %}