openstack
/
kolla-ansible
Code Issues Proposed changes

Remove Fedora support 

Closes-bug: #1616387
Change-Id: Id97f88b9baa3d48d33ce120962450a374282d044
This commit is contained in:
Christian Berendt 2016-11-03 10:37:21 +01:00
parent 9779778a1e
commit 5cd30d4914
124 changed files with 148 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

@ -26,7 +26,7 @@ orchestration_engine: "ANSIBLE"
# Valid options are [ COPY_ONCE, COPY_ALWAYS ] # Valid options are [ COPY_ONCE, COPY_ALWAYS ]
config_strategy: "COPY_ALWAYS" config_strategy: "COPY_ALWAYS"
# Valid options are [ centos, fedora, oraclelinux, ubuntu ] # Valid options are [ centos, oraclelinux, ubuntu ]
kolla_base_distro: "centos" kolla_base_distro: "centos"
# Valid options are [ binary, source ] # Valid options are [ binary, source ]
kolla_install_type: "binary" kolla_install_type: "binary"

1
doc/image-building.rst
View File

@ -45,7 +45,6 @@ The operator can change the base distro with the ``-b`` option::
There are following distros available for building images: There are following distros available for building images:
- fedora
- centos - centos
- oraclelinux - oraclelinux
- ubuntu - ubuntu

4
doc/quickstart.rst
View File

@ -191,7 +191,7 @@ For mounting ``/run`` as shared upon startup, add that command to
# Edit /etc/rc.local to add: # Edit /etc/rc.local to add:
mount --make-shared /run mount --make-shared /run
.. note:: If centos/fedora/oraclelinux container images are built on an Ubuntu .. note:: If centos/oraclelinux container images are built on an Ubuntu
host, the backend storage driver must not be AUFS (see the known issues in host, the backend storage driver must not be AUFS (see the known issues in
:doc:`image-building`). :doc:`image-building`).
@ -417,7 +417,7 @@ behavior, please use the following parameters with ``kolla-build``:
:: ::
--base [ubuntu|centos|fedora|oraclelinux] --base [ubuntu|centos|oraclelinux]
--type [binary|source] --type [binary|source]
If pushing to a local registry (recommended) use the flags: If pushing to a local registry (recommended) use the flags:

2
docker/aodh/aodh-api/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_api_packages = ['openstack-aodh-api'] %} {% set aodh_api_packages = ['openstack-aodh-api'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set aodh_api_packages = ['aodh-api'] %} {% set aodh_api_packages = ['aodh-api'] %}

4
docker/aodh/aodh-base/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_base_packages = [ {% set aodh_base_packages = [
'openstack-aodh-common', 'openstack-aodh-common',
@ -36,7 +36,7 @@ RUN mkdir -p /var/www/cgi-bin/aodh \
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_base_packages = [ {% set aodh_base_packages = [
'httpd', 'httpd',

2
docker/aodh/aodh-evaluator/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_evaluator_packages = ['openstack-aodh-evaluator'] %} {% set aodh_evaluator_packages = ['openstack-aodh-evaluator'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set aodh_evaluator_packages = ['aodh-evaluator'] %} {% set aodh_evaluator_packages = ['aodh-evaluator'] %}

2
docker/aodh/aodh-expirer/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_expirer_packages = ['openstack-aodh-expirer'] %} {% set aodh_expirer_packages = ['openstack-aodh-expirer'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set aodh_expirer_packages = ['aodh-expirer'] %} {% set aodh_expirer_packages = ['aodh-expirer'] %}

2
docker/aodh/aodh-listener/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_listener_packages = ['openstack-aodh-listener'] %} {% set aodh_listener_packages = ['openstack-aodh-listener'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set aodh_listener_packages = ['aodh-listener'] %} {% set aodh_listener_packages = ['aodh-listener'] %}

2
docker/aodh/aodh-notifier/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_notifier_packages = ['openstack-aodh-notifier'] %} {% set aodh_notifier_packages = ['openstack-aodh-notifier'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set aodh_notifier_packages = ['aodh-notifier'] %} {% set aodh_notifier_packages = ['aodh-notifier'] %}

2
docker/barbican/barbican-api/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_api_packages = ['openstack-barbican-api'] %} {% set barbican_api_packages = ['openstack-barbican-api'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set barbican_api_packages = [ {% set barbican_api_packages = [

4
docker/barbican/barbican-base/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_base_packages = ['openstack-barbican-common'] %} {% set barbican_base_packages = ['openstack-barbican-common'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set barbican_base_packages = ['barbican-common'] %} {% set barbican_base_packages = ['barbican-common'] %}
@ -15,7 +15,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(barbican_base_packages | customizable("packages")) }} {{ macros.install_packages(barbican_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_base_packages = ['uwsgi-plugin-python'] %} {% set barbican_base_packages = ['uwsgi-plugin-python'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set barbican_base_packages = ['uwsgi-plugin-python'] %} {% set barbican_base_packages = ['uwsgi-plugin-python'] %}

2
docker/barbican/barbican-keystone-listener/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_keystone_listener_packages = ['openstack-barbican-keystone-listener'] %} {% set barbican_keystone_listener_packages = ['openstack-barbican-keystone-listener'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set barbican_keystone_listener_packages = ['barbican-keystone-listener'] %} {% set barbican_keystone_listener_packages = ['barbican-keystone-listener'] %}

2
docker/barbican/barbican-worker/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_worker_packages = ['openstack-barbican-worker'] %} {% set barbican_worker_packages = ['openstack-barbican-worker'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set barbican_worker_packages = ['barbican-worker'] %} {% set barbican_worker_packages = ['barbican-worker'] %}

19
docker/base/Dockerfile.j2
View File

@ -24,7 +24,7 @@ ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(ho
# enables to provide repo overrides at a later date in a simple fashion if we # enables to provide repo overrides at a later date in a simple fashion if we
# desire such functionality. I think we will :) # desire such functionality. I think we will :)
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN if [ $(awk '{match($0, /[0-9]+/,version)}END{print version[0]}' /etc/system-release) != "{{ supported_distro_release }}" ]; then \ RUN if [ $(awk '{match($0, /[0-9]+/,version)}END{print version[0]}' /etc/system-release) != "{{ supported_distro_release }}" ]; then \
echo "Only supported {{ supported_distro_release }} release on {{ base_distro }}"; false; \ echo "Only supported {{ supported_distro_release }} release on {{ base_distro }}"; false; \
@ -143,23 +143,10 @@ RUN yum -y install \
{% endif %} {% endif %}
{# Endif for base_distro oraclelinux #} {# Endif for base_distro oraclelinux #}
{% if base_distro == 'fedora' %}
# Set up repositories
RUN yum -y install \
https://rdo.fedorapeople.org/rdo-release.rpm \
dnf \
dnf-plugins-core \
yum-plugin-priorities \
&& yum clean all
{% endif %}
{# Endif for base_distro fedora #}
#### END REPO ENABLEMENT #### END REPO ENABLEMENT
{# We are back to the basic if conditional here which is: {# We are back to the basic if conditional here which is:
if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] #} if base_distro in ['centos', 'oraclelinux', 'rhel'] #}
{% block base_redhat_binary_versionlock %}{% endblock %} {% block base_redhat_binary_versionlock %}{% endblock %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% set base_centos_binary_packages = [ {% set base_centos_binary_packages = [
@ -193,7 +180,7 @@ RUN yum -y install \
{% endif %} {% endif %}
{# endif for install type is source for RPM based distros #} {# endif for install type is source for RPM based distros #}
{# endif for base_distro centos,fedora,oraclelinux,rhel #} {# endif for base_distro centos,oraclelinux,rhel #}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
RUN if [ $(awk -F '=' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release) != "{{ supported_distro_release }}" ]; then \ RUN if [ $(awk -F '=' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release) != "{{ supported_distro_release }}" ]; then \

2
docker/bifrost/bifrost-deploy/Dockerfile.j2
View File

@ -7,7 +7,7 @@ ENV container docker
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel', 'debian'] or (base_distro == 'ubuntu' and base_distro_tag == '16.04') %} {% if base_distro in ['centos', 'oraclelinux', 'rhel', 'debian'] or (base_distro == 'ubuntu' and base_distro_tag == '16.04') %}
RUN bash -c ' $(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ \"$i\" == \"systemd-tmpfiles-setup.service\" ] || rm -f $i; done); \ RUN bash -c ' $(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ \"$i\" == \"systemd-tmpfiles-setup.service\" ] || rm -f $i; done); \
rm -f /lib/systemd/system/multi-user.target.wants/*;\ rm -f /lib/systemd/system/multi-user.target.wants/*;\

4
docker/ceilometer/ceilometer-api/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_api_packages = [ {% set ceilometer_api_packages = [
'openstack-ceilometer-api', 'openstack-ceilometer-api',
'httpd', 'httpd',
@ -27,7 +27,7 @@ RUN echo > /etc/apache2/ports.conf
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_api_packages = [ {% set ceilometer_api_packages = [
'httpd', 'httpd',

2
docker/ceilometer/ceilometer-base/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_base_packages = [ {% set ceilometer_base_packages = [
'openstack-ceilometer-common', 'openstack-ceilometer-common',
'python-tooz', 'python-tooz',

2
docker/ceilometer/ceilometer-central/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_central_packages = ['openstack-ceilometer-central'] %} {% set ceilometer_central_packages = ['openstack-ceilometer-central'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set ceilometer_central_packages = ['ceilometer-agent-central'] %} {% set ceilometer_central_packages = ['ceilometer-agent-central'] %}

2
docker/ceilometer/ceilometer-collector/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_collector_packages = ['openstack-ceilometer-collector'] %} {% set ceilometer_collector_packages = ['openstack-ceilometer-collector'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set ceilometer_collector_packages = ['ceilometer-collector'] %} {% set ceilometer_collector_packages = ['ceilometer-collector'] %}

4
docker/ceilometer/ceilometer-compute/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_compute_packages = [ {% set ceilometer_compute_packages = [
'openstack-ceilometer-compute', 'openstack-ceilometer-compute',
'python-ceilometerclient' 'python-ceilometerclient'
@ -21,7 +21,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }} {{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN yum -y install \ RUN yum -y install \
libvirt-devel \ libvirt-devel \

2
docker/ceilometer/ceilometer-notification/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_notification_packages = ['openstack-ceilometer-notification'] %} {% set ceilometer_notification_packages = ['openstack-ceilometer-notification'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set ceilometer_notification_packages = ['ceilometer-agent-notification'] %} {% set ceilometer_notification_packages = ['ceilometer-agent-notification'] %}

2
docker/ceph/ceph-base/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceph_base_packages = [ {% set ceph_base_packages = [
'ceph', 'ceph',
'ceph-radosgw', 'ceph-radosgw',

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

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_api_packages = [ {% set cinder_api_packages = [
'python-keystone' 'python-keystone'

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

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_backup_packages = [ {% set cinder_backup_packages = [
'nfs-utils' 'nfs-utils'
@ -22,7 +22,7 @@ MAINTAINER {{ maintainer }}
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_backup_packages = [ {% set cinder_backup_packages = [
'nfs-utils' 'nfs-utils'

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

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_base_packages = [ {% set cinder_base_packages = [
'openstack-cinder', 'openstack-cinder',
@ -28,7 +28,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }} {{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_base_packages = [ {% set cinder_base_packages = [
'lvm2', 'lvm2',

2
docker/cinder/cinder-rpcbind/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_rpcbind_packages = [ {% set cinder_rpcbind_packages = [
'nfs-utils', 'nfs-utils',

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

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_volume_packages = [ {% set cinder_volume_packages = [
'scsi-target-utils' 'scsi-target-utils'

2
docker/congress/congress-base/Dockerfile.j2
View File

@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
# TODO(Md Nadeem): need to add congress binary package when it is available in rpm base distro # TODO(Md Nadeem): need to add congress binary package when it is available in rpm base distro
#https://trunk.rdoproject.org/ #https://trunk.rdoproject.org/
{% elif base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% elif base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false && /bin/false

2
docker/cron/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cron_packages = [ {% set cron_packages = [
'cronie', 'cronie',
'logrotate' 'logrotate'

2
docker/designate/designate-api/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set designate_api_packages = ['openstack-designate-api'] %} {% set designate_api_packages = ['openstack-designate-api'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set designate_api_packages = ['designate-api'] %} {% set designate_api_packages = ['designate-api'] %}

2
docker/designate/designate-backend-bind9/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set designate_backend_bind9_packages = ['bind'] %} {% set designate_backend_bind9_packages = ['bind'] %}
{{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }} {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}

2
docker/designate/designate-base/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
# Install designate-api because of /etc/designate/policy.json, which # Install designate-api because of /etc/designate/policy.json, which
# is needed in all services. This is probably a packaging bug. We do # is needed in all services. This is probably a packaging bug. We do

2
docker/designate/designate-central/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set designate_central_packages = ['openstack-designate-central'] %} {% set designate_central_packages = ['openstack-designate-central'] %}
{% elif base_distro in ['ubuntu']%} {% elif base_distro in ['ubuntu']%}
{% set designate_central_packages = ['designate-central'] %} {% set designate_central_packages = ['designate-central'] %}

2
docker/designate/designate-mdns/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set designate_mdns_packages = ['openstack-designate-mdns'] %} {% set designate_mdns_packages = ['openstack-designate-mdns'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set designate_mdns_packages = ['designate-mdns'] %} {% set designate_mdns_packages = ['designate-mdns'] %}

2
docker/designate/designate-pool-manager/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
# The bind9 package here is only to provide the rndc binary. # The bind9 package here is only to provide the rndc binary.
{% set designate_pool_manager_packages = [ {% set designate_pool_manager_packages = [
'bind', 'bind',

2
docker/designate/designate-sink/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set designate_sink_packages = [ {% set designate_sink_packages = [
'openstack-designate-sink', 'openstack-designate-sink',
'python-designateclient' 'python-designateclient'

2
docker/dind/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
# Since the gate cannot do DinD on centos due to the age of the kernel, we don't # Since the gate cannot do DinD on centos due to the age of the kernel, we don't
# build a true DinD image. Should the time come that we get a newer kernel in # build a true DinD image. Should the time come that we get a newer kernel in

2
docker/elasticsearch/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set elasticsearch_packages = [ {% set elasticsearch_packages = [
'java-1.7.0-openjdk', 'java-1.7.0-openjdk',
'elasticsearch' 'elasticsearch'

2
docker/etcd/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set etcd_packages = ['etcd'] %} {% set etcd_packages = ['etcd'] %}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set etcd_packages = ['etcd'] %} {% set etcd_packages = ['etcd'] %}

2
docker/fluentd/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN rpm --import https://packages.treasuredata.com/GPG-KEY-td-agent RUN rpm --import https://packages.treasuredata.com/GPG-KEY-td-agent

2
docker/glance/glance-base/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set glance_base_packages = [ {% set glance_base_packages = [
'openstack-glance', 'openstack-glance',
'python-rbd', 'python-rbd',

2
docker/gnocchi/gnocchi-api/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set gnocchi_api_packages = [ {% set gnocchi_api_packages = [
'openstack-gnocchi-api', 'openstack-gnocchi-api',
'openstack-gnocchi-carbonara', 'openstack-gnocchi-carbonara',

4
docker/gnocchi/gnocchi-base/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set gnocchi_base_packages = [ {% set gnocchi_base_packages = [
'openstack-gnocchi-common', 'openstack-gnocchi-common',
@ -34,7 +34,7 @@ RUN truncate -s 0 /etc/apache2/ports.conf
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set gnocchi_base_packages = [ {% set gnocchi_base_packages = [
'httpd', 'httpd',

2
docker/gnocchi/gnocchi-metricd/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set gnocchi_metricd_packages = ['openstack-gnocchi-metricd'] %} {% set gnocchi_metricd_packages = ['openstack-gnocchi-metricd'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set gnocchi_metricd_packages = ['gnocchi-metricd'] %} {% set gnocchi_metricd_packages = ['gnocchi-metricd'] %}

2
docker/gnocchi/gnocchi-statsd/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set gnocchi_statsd_packages = ['openstack-gnocchi-statsd'] %} {% set gnocchi_statsd_packages = ['openstack-gnocchi-statsd'] %}
{% endif %} {% endif %}
{{ macros.install_packages(gnocchi_statsd_packages | customizable("packages")) }} {{ macros.install_packages(gnocchi_statsd_packages | customizable("packages")) }}

2
docker/heat/heat-api-cfn/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set heat_api_cfn_packages = ['openstack-heat-api-cfn'] %} {% set heat_api_cfn_packages = ['openstack-heat-api-cfn'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set heat_api_cfn_packages = ['heat-api-cfn'] %} {% set heat_api_cfn_packages = ['heat-api-cfn'] %}

2
docker/heat/heat-api/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set heat_api_packages = ['openstack-heat-api'] %} {% set heat_api_packages = ['openstack-heat-api'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set heat_api_packages = ['heat-api'] %} {% set heat_api_packages = ['heat-api'] %}

2
docker/heat/heat-base/Dockerfile.j2
View File

@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set heat_base_packages = ['openstack-heat-common'] %} {% set heat_base_packages = ['openstack-heat-common'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set heat_base_packages = ['heat-common'] %} {% set heat_base_packages = ['heat-common'] %}

2
docker/heat/heat-engine/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set heat_engine_packages = [ {% set heat_engine_packages = [
'python-barbicanclient', 'python-barbicanclient',
'python-zaqarclient', 'python-zaqarclient',

2
docker/heka/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set heka_packages = [ {% set heka_packages = [
'https://github.com/mozilla-services/heka/releases/download/v0.10.0/heka-0_10_0-linux-amd64.rpm' 'https://github.com/mozilla-services/heka/releases/download/v0.10.0/heka-0_10_0-linux-amd64.rpm'
] %} ] %}

4
docker/horizon/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set horizon_packages = [ {% set horizon_packages = [
'openstack-dashboard', 'openstack-dashboard',
@ -64,7 +64,7 @@ RUN echo > /etc/apache2/ports.conf \
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set horizon_packages = [ {% set horizon_packages = [
'httpd', 'httpd',

2
docker/ironic/ironic-api/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ironic_api_packages = ['openstack-ironic-api'] %} {% set ironic_api_packages = ['openstack-ironic-api'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set ironic_api_packages = ['ironic-api'] %} {% set ironic_api_packages = ['ironic-api'] %}

2
docker/ironic/ironic-base/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ironic_base_packages = ['openstack-ironic-common'] %} {% set ironic_base_packages = ['openstack-ironic-common'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set ironic_base_packages = ['ironic-common'] %} {% set ironic_base_packages = ['ironic-common'] %}

4
docker/ironic/ironic-conductor/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
# TODO(Jeffrey4l): no python-scciclient, python-oneviewclient, # TODO(Jeffrey4l): no python-scciclient, python-oneviewclient,
# python-seamicroclient, pyremotevbox package # python-seamicroclient, pyremotevbox package
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
@ -47,7 +47,7 @@ MAINTAINER {{ maintainer }}
] %} ] %}
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'util-linux', 'util-linux',
'qemu-img', 'qemu-img',

2
docker/ironic/ironic-inspector/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ironic_inspector_packages = ['openstack-ironic-inspector'] %} {% set ironic_inspector_packages = ['openstack-ironic-inspector'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set ironic_inspector_packages = [ {% set ironic_inspector_packages = [

2
docker/ironic/ironic-pxe/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ironic_pxe_packages = [ {% set ironic_pxe_packages = [
'tftp-server', 'tftp-server',
'syslinux-tftpboot' 'syslinux-tftpboot'

2
docker/iscsid/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set iscsid_packages = [ {% set iscsid_packages = [
'iscsi-initiator-utils', 'iscsi-initiator-utils',
'targetcli', 'targetcli',

2
docker/keepalived/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set keepalived_packages = [ {% set keepalived_packages = [
'hostname', 'hostname',
'keepalived', 'keepalived',

4
docker/keystone/keystone-base/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'openstack-keystone', 'openstack-keystone',
'python-keystoneclient', 'python-keystoneclient',
@ -38,7 +38,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'httpd', 'httpd',
'mod_wsgi', 'mod_wsgi',

2
docker/keystone/keystone-fernet/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set keystone_fernet_packages = [ {% set keystone_fernet_packages = [
'cronie', 'cronie',
'openssh-clients', 'openssh-clients',

2
docker/keystone/keystone-ssh/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set keystone_ssh_packages = [ {% set keystone_ssh_packages = [
'openssh-server', 'openssh-server',
'rsync' 'rsync'

2
docker/kolla-toolbox/Dockerfile.j2
View File

@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set kolla_toolbox_packages = [ {% set kolla_toolbox_packages = [
'crudini', 'crudini',
'gcc', 'gcc',

2
docker/macros.j2
View File

@ -1,6 +1,6 @@
{% macro install_packages(packages) -%} {% macro install_packages(packages) -%}
{% if packages is defined and packages|length > 0 -%} {% if packages is defined and packages|length > 0 -%}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] -%} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] -%}
RUN yum -y install {{ packages | join(' ') }} && yum clean all RUN yum -y install {{ packages | join(' ') }} && yum clean all
{%- elif base_distro in ['ubuntu', 'debian'] -%} {%- elif base_distro in ['ubuntu', 'debian'] -%}
{#- {#-

2
docker/magnum/magnum-api/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set magnum_api_packages = ['openstack-magnum-api'] %} {% set magnum_api_packages = ['openstack-magnum-api'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set magnum_api_packages = ['magnum-api'] %} {% set magnum_api_packages = ['magnum-api'] %}

2
docker/magnum/magnum-base/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} {% if base_distro in ['centos', 'oraclelinux'] %}
{% set magnum_base_packages = ['openstack-magnum-common'] %} {% set magnum_base_packages = ['openstack-magnum-common'] %}
RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean.repo RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean.repo

2
docker/magnum/magnum-conductor/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set magnum_conductor_packages = [ {% set magnum_conductor_packages = [
'openstack-magnum-conductor' 'openstack-magnum-conductor'
] %} ] %}

4
docker/manila/manila-base/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set manila_base_packages = [ {% set manila_base_packages = [
'openstack-manila', 'openstack-manila',
@ -25,7 +25,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(manila_base_packages | customizable("packages")) }} {{ macros.install_packages(manila_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set manila_base_packages = ['openvswitch'] %} {% set manila_base_packages = ['openvswitch'] %}

2
docker/manila/manila-share/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set manila_share_packages = [ {% set manila_share_packages = [
'openstack-manila-share' 'openstack-manila-share'

2
docker/mariadb/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set mariadb_packages = [ {% set mariadb_packages = [
'MariaDB-Galera-server', 'MariaDB-Galera-server',
'MariaDB-client', 'MariaDB-client',

2
docker/memcached/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set user = 'memcached' %} {% set user = 'memcached' %}
{% set memcached_packages = ['memcached'] %} {% set memcached_packages = ['memcached'] %}

2
docker/mistral/mistral-api/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set mistral_api_packages = ['openstack-mistral-api'] %} {% set mistral_api_packages = ['openstack-mistral-api'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set mistral_api_packages = ['mistral-api'] %} {% set mistral_api_packages = ['mistral-api'] %}

2
docker/mistral/mistral-base/Dockerfile.j2
View File

@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set mistral_base_packages = ['openstack-mistral-common'] %} {% set mistral_base_packages = ['openstack-mistral-common'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set mistral_base_packages = ['mistral-common'] %} {% set mistral_base_packages = ['mistral-common'] %}

2
docker/mistral/mistral-engine/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set mistral_engine_packages = ['openstack-mistral-engine'] %} {% set mistral_engine_packages = ['openstack-mistral-engine'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set mistral_engine_packages = ['mistral-engine'] %} {% set mistral_engine_packages = ['mistral-engine'] %}

2
docker/mistral/mistral-executor/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set mistral_executor_packages = ['openstack-mistral-executor'] %} {% set mistral_executor_packages = ['openstack-mistral-executor'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set mistral_executor_packages = ['mistral-executor'] %} {% set mistral_executor_packages = ['mistral-executor'] %}

2
docker/mongodb/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set mongodb_packages = [ {% set mongodb_packages = [
'mongodb', 'mongodb',
'mongodb-server' 'mongodb-server'

2
docker/multipathd/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set multipathd_packages = ['device-mapper-multipath'] %} {% set multipathd_packages = ['device-mapper-multipath'] %}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set multipathd_packages = ['multipath-tools'] %} {% set multipathd_packages = ['multipath-tools'] %}

2
docker/murano/murano-api/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN ln -s /var/cache/murano/meta/io.murano.zip /io.murano.zip RUN ln -s /var/cache/murano/meta/io.murano.zip /io.murano.zip
{% set murano_api_packages = ['openstack-murano-api'] %} {% set murano_api_packages = ['openstack-murano-api'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}

2
docker/murano/murano-base/Dockerfile.j2
View File

@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set murano_base_packages = ['openstack-murano-common'] %} {% set murano_base_packages = ['openstack-murano-common'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set murano_base_packages = ['murano-common'] %} {% set murano_base_packages = ['murano-common'] %}

2
docker/murano/murano-engine/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set murano_engine_packages = ['openstack-murano-engine'] %} {% set murano_engine_packages = ['openstack-murano-engine'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set murano_engine_packages = ['murano-engine'] %} {% set murano_engine_packages = ['murano-engine'] %}

4
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_base_packages = [ {% set neutron_base_packages = [
'openstack-neutron', 'openstack-neutron',
@ -39,7 +39,7 @@ RUN mkdir -p /usr/share/neutron \
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_base_packages = [ {% set neutron_base_packages = [
'conntrack-tools', 'conntrack-tools',

2
docker/neutron/neutron-lbaas-agent/Dockerfile.j2
View File

@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(neutron_lbaas_agent_packages | customizable("packages")) }} {{ macros.install_packages(neutron_lbaas_agent_packages | customizable("packages")) }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_lbaas_agent_packages = [ {% set neutron_lbaas_agent_packages = [
'openstack-neutron-lbaas' 'openstack-neutron-lbaas'

2
docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_linuxbridge_agent_packages = [ {% set neutron_linuxbridge_agent_packages = [
'ebtables', 'ebtables',

2
docker/neutron/neutron-metering-agent/Dockerfile.j2
View File

@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_metering_agent_packages = ['openstack-neutron-metering-agent'] %} {% set neutron_metering_agent_packages = ['openstack-neutron-metering-agent'] %}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set neutron_metering_agent_packages = ['neutron-metering-agent'] %} {% set neutron_metering_agent_packages = ['neutron-metering-agent'] %}

2
docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_openvswitch_agent_packages = [ {% set neutron_openvswitch_agent_packages = [
'openstack-neutron-openvswitch', 'openstack-neutron-openvswitch',

2
docker/neutron/neutron-server/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_server_packages = [ {% set neutron_server_packages = [
'openstack-neutron-lbaas', 'openstack-neutron-lbaas',

2
docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_vpnaas_agent_packages = [ {% set neutron_vpnaas_agent_packages = [
'openswan', 'openswan',
'openstack-neutron-vpn-agent' 'openstack-neutron-vpn-agent'

2
docker/nova/nova-api/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_api_packages = [ {% set nova_api_packages = [
'openstack-nova-api' 'openstack-nova-api'

4
docker/nova/nova-base/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_base_packages = [ {% set nova_base_packages = [
'openstack-nova-common', 'openstack-nova-common',
@ -30,7 +30,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(nova_base_packages | customizable("packages")) }} {{ macros.install_packages(nova_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_base_packages = [ {% set nova_base_packages = [
'bridge-utils', 'bridge-utils',

2
docker/nova/nova-compute-ironic/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_compute_ironic_packages = [ {% set nova_compute_ironic_packages = [
'openstack-nova-compute' 'openstack-nova-compute'

4
docker/nova/nova-compute/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_compute_packages = [ {% set nova_compute_packages = [
'openstack-nova-compute', 'openstack-nova-compute',
@ -43,7 +43,7 @@ RUN rm -f /etc/nova/nova-compute.conf
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_compute_packages = [ {% set nova_compute_packages = [
'libvirt-devel', 'libvirt-devel',

2
docker/nova/nova-conductor/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_conductor_packages = [ {% set nova_conductor_packages = [
'openstack-nova-conductor' 'openstack-nova-conductor'

2
docker/nova/nova-consoleauth/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_consoleauth_packages = [ {% set nova_consoleauth_packages = [
'openstack-nova-console' 'openstack-nova-console'

4
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_libvirt_packages = [ {% set nova_libvirt_packages = [
'libvirt-daemon', 'libvirt-daemon',
@ -52,7 +52,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(nova_libvirt_packages | customizable("packages")) }} {{ macros.install_packages(nova_libvirt_packages | customizable("packages")) }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN usermod -a -G qemu nova RUN usermod -a -G qemu nova

4
docker/nova/nova-network/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_network_packages = [ {% set nova_network_packages = [
'openstack-nova-network', 'openstack-nova-network',
@ -22,7 +22,7 @@ MAINTAINER {{ maintainer }}
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_network_packages = [ {% set nova_network_packages = [
'initscripts' 'initscripts'

2
docker/nova/nova-novncproxy/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_novncproxy_packages = [ {% set nova_novncproxy_packages = [
'novnc', 'novnc',

2
docker/nova/nova-scheduler/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_scheduler_packages = [ {% set nova_scheduler_packages = [
'openstack-nova-scheduler' 'openstack-nova-scheduler'

2
docker/nova/nova-serialproxy/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_serialproxy_packages = [ {% set nova_serialproxy_packages = [
'openstack-nova-serialproxy' 'openstack-nova-serialproxy'
] %} ] %}

2
docker/nova/nova-spicehtml5proxy/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set nova_spicehtml5proxy_packages = [ {% set nova_spicehtml5proxy_packages = [
'openstack-nova-spicehtml5proxy', 'openstack-nova-spicehtml5proxy',

6
docker/openstack-base/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set openstack_base_packages = [ {% set openstack_base_packages = [
'git', 'git',
'iproute', 'iproute',
@ -16,7 +16,7 @@ MAINTAINER {{ maintainer }}
{% endif %} {% endif %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
# TODO(Allen) Remove python-dogpile-cache after the requirement of # TODO(Allen) Remove python-dogpile-cache after the requirement of
# python-ironicclient is fixed. # python-ironicclient is fixed.
@ -191,7 +191,7 @@ ENV DEBIAN_FRONTEND noninteractive
{{ macros.install_packages(openstack_base_packages | customizable("packages")) }} {{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set openstack_base_packages = [ {% set openstack_base_packages = [
'gcc', 'gcc',
'gcc-c++', 'gcc-c++',

2
docker/openvswitch/openvswitch-base/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set openvswitch_base_packages = ['openvswitch'] %} {% set openvswitch_base_packages = ['openvswitch'] %}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}

Some files were not shown because too many files have changed in this diff Show More