openstack/kolla-ansible
Code Issues Proposed changes

Merge "Handle empty package list for install_packages"

Browse Source
This commit is contained in:
Jenkins 2016-08-19 13:28:55 +00:00 committed by Gerrit Code Review
commit 24c55ff789
84 changed files with 112 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set aodh_api_packages = ['aodh-api'] %}
{% endif %}
RUN {{ macros.install_packages(aodh_api_packages | customizable("packages")) }}
{{ macros.install_packages(aodh_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_aodh_extend_start

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set aodh_base_packages = ['aodh-common'] %}
{% endif %}
RUN {{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set aodh_evaluator_packages = ['aodh-evaluator'] %}
{% endif %}
RUN {{ macros.install_packages(aodh_evaluator_packages | customizable("packages")) }}
{{ macros.install_packages(aodh_evaluator_packages | customizable("packages")) }}
{% endif %}
{% block aodh_evaluator_footer %}{% endblock %}

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set aodh_expirer_packages = ['aodh-expirer'] %}
{% endif %}
RUN {{ macros.install_packages(aodh_expirer_packages | customizable("packages")) }}
{{ macros.install_packages(aodh_expirer_packages | customizable("packages")) }}
{% endif %}
{% block aodh_expirer_footer %}{% endblock %}

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set aodh_listener_packages = ['aodh-listener'] %}
{% endif %}
RUN {{ macros.install_packages(aodh_listener_packages | customizable("packages")) }}
{{ macros.install_packages(aodh_listener_packages | customizable("packages")) }}
{% endif %}
{% block aodh_listener_footer %}{% endblock %}

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set aodh_notifier_packages = ['aodh-notifier'] %}
{% endif %}
RUN {{ macros.install_packages(aodh_notifier_packages | customizable("packages")) }}
{{ macros.install_packages(aodh_notifier_packages | customizable("packages")) }}
{% endif %}
{% block aodh_notifier_footer %}{% endblock %}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set ceilometer_api_packages = ['ceilometer-api'] %}
{% endif %}
RUN {{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }}
{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }}
{% endif %}

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

@ -17,7 +17,7 @@ MAINTAINER {{ maintainer }}
] %}
{% endif %}
RUN {{ macros.install_packages(ceilometer_base_packages | customizable("packages")) }}
{{ macros.install_packages(ceilometer_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set ceilometer_central_packages = ['ceilometer-agent-central'] %}
{% endif %}
RUN {{ macros.install_packages(ceilometer_central_packages | customizable("packages")) }}
{{ macros.install_packages(ceilometer_central_packages | customizable("packages")) }}
{% endif %}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set ceilometer_collector_packages = ['ceilometer-collector'] %}
{% endif %}
RUN {{ macros.install_packages(ceilometer_collector_packages | customizable("packages")) }}
{{ macros.install_packages(ceilometer_collector_packages | customizable("packages")) }}
{% endif %}

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

@ -16,7 +16,7 @@ MAINTAINER {{ maintainer }}
] %}
{% endif %}
RUN {{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set ceilometer_notification_packages = ['ceilometer-agent-notification'] %}
{% endif %}
RUN {{ macros.install_packages(ceilometer_notification_packages | customizable("packages")) }}
{{ macros.install_packages(ceilometer_notification_packages | customizable("packages")) }}
{% endif %}

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

@ -19,7 +19,7 @@ MAINTAINER {{ maintainer }}
'btrfs-tools'
] %}
{% endif %}
RUN {{ macros.install_packages(ceph_base_packages | customizable("packages")) }}
{{ macros.install_packages(ceph_base_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start

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

@ -19,7 +19,7 @@ MAINTAINER {{ maintainer }}
{% endif %}
RUN {{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
{% endif %}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
'cinder-backup'
] %}
RUN {{ macros.install_packages(cinder_backup_packages | customizable("packages")) }}
{{ macros.install_packages(cinder_backup_packages | customizable("packages")) }}
{% endif %}
{% endif %}

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

@ -23,7 +23,7 @@ MAINTAINER {{ maintainer }}
{% endif %}
RUN {{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
@ -44,7 +44,7 @@ RUN {{ macros.install_packages(cinder_base_packages | customizable("packages"))
{% endif %}
RUN {{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
ADD cinder-base-archive /cinder-base-source
RUN ln -s cinder-base-source/* cinder \

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

@ -18,7 +18,7 @@ MAINTAINER {{ maintainer }}
{% endif %}
RUN {{ macros.install_packages(cinder_rpcbind_packages | customizable("packages")) }}
{{ macros.install_packages(cinder_rpcbind_packages | customizable("packages")) }}
{% block cinder_rpcbind_footer %}{% endblock %}
{% block footer %}{% endblock %}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
'cinder-scheduler'
] %}
RUN {{ macros.install_packages(cinder_scheduler_packages | customizable("packages")) }}
{{ macros.install_packages(cinder_scheduler_packages | customizable("packages")) }}
{% endif %}
{% endif %}

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
'scsi-target-utils'
] %}
RUN {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
{% block cinder_volume_redhat_setup %}
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
@ -21,7 +21,7 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
'tgt'
] %}
RUN {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
{% block cinder_volume_ubuntu_setup %}
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
@ -36,7 +36,7 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
'cinder-volume'
] %}
RUN {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
{% endif %}
{% endif %}

2
docker/cron/Dockerfile.j2
View File

@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
] %}
{% endif %}
RUN {{ macros.install_packages(cron_packages | customizable("packages")) }}
{{ macros.install_packages(cron_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set designate_api_packages = ['designate-api'] %}
{% endif %}
RUN {{ macros.install_packages(designate_api_packages | customizable("packages")) }}
{{ macros.install_packages(designate_api_packages | customizable("packages")) }}
{% endif %}
{% block designate_api_footer %}{% endblock %}

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

@ -6,14 +6,14 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set designate_backend_bind9_packages = ['bind'] %}
RUN {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
{{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
RUN mkdir -p /var/lib/kolla/ \
&& cp -pr /var/named /var/lib/kolla/var-named
{% elif base_distro in ['ubuntu'] %}
{% set designate_backend_bind9_packages = ['bind9'] %}
RUN {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
{{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
{% endif %}
{% endif %}

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

@ -17,7 +17,7 @@ MAINTAINER {{ maintainer }}
'python2-suds'
] %}
RUN {{ macros.install_packages(designate_base_packages | customizable("packages")) }}
{{ macros.install_packages(designate_base_packages | customizable("packages")) }}
RUN cp /etc/designate/policy.json /tmp/ \
&& rpm -e openstack-designate-api \
&& mv /tmp/policy.json /etc/designate/ \
@ -29,7 +29,7 @@ RUN cp /etc/designate/policy.json /tmp/ \
'python-tooz'
] %}
RUN {{ macros.install_packages(designate_base_packages | customizable("packages")) }}
{{ macros.install_packages(designate_base_packages | customizable("packages")) }}
{% endif %}
{% elif install_type == 'source' %}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu']%}
{% set designate_central_packages = ['designate-central'] %}
{% endif %}
RUN {{ macros.install_packages(designate_central_packages | customizable("packages")) }}
{{ macros.install_packages(designate_central_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set designate_mdns_packages = ['designate-mdns'] %}
{% endif %}
RUN {{ macros.install_packages(designate_mdns_packages | customizable("packages")) }}
{{ macros.install_packages(designate_mdns_packages | customizable("packages")) }}
{% endif %}
{% block designate_mdns_footer %}{% endblock %}

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

@ -15,7 +15,7 @@ MAINTAINER {{ maintainer }}
'designate-pool-manager'
] %}
{% endif %}
RUN {{ macros.install_packages(designate_pool_manager_packages | customizable("packages")) }}
{{ macros.install_packages(designate_pool_manager_packages | customizable("packages")) }}
{% endif %}
{% block designate_pool_manager_footer %}{% endblock %}

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

@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
'designateclient'
] %}
{% endif %}
RUN {{ macros.install_packages(designate_sink_packages | customizable("packages")) }}
{{ macros.install_packages(designate_sink_packages | customizable("packages")) }}
{% endif %}
{% block designate_sink_footer %}{% endblock %}

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

@ -18,7 +18,7 @@ MAINTAINER {{ maintainer }}
] %}
{% endif %}
RUN {{ macros.install_packages(glance_base_packages | customizable("packages")) }}
{{ macros.install_packages(glance_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% set glance_base_packages = [
@ -26,7 +26,7 @@ RUN {{ macros.install_packages(glance_base_packages | customizable("packages"))
'python-rados'
] %}
RUN {{ macros.install_packages(glance_base_packages | customizable("packages")) }}
{{ macros.install_packages(glance_base_packages | customizable("packages")) }}
ADD glance-base-archive /glance-base-source
RUN ln -s glance-base-source/* glance \

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

@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set gnocchi_api_packages = ['gnocchi-api'] %}
{% endif %}
RUN {{ macros.install_packages(gnocchi_api_packages | customizable("packages")) }}
{{ macros.install_packages(gnocchi_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_gnocchi_extend_start

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set gnocchi_base_packages = ['gnocchi-common'] %}
{% endif %}
RUN {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set gnocchi_metricd_packages = ['gnocchi-metricd'] %}
{% endif %}
RUN {{ macros.install_packages(gnocchi_metricd_packages | customizable("packages")) }}
{{ macros.install_packages(gnocchi_metricd_packages | customizable("packages")) }}
{% endif %}
{% block gnocchi_metricd_footer %}{% endblock %}

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

@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set gnocchi_statsd_packages = ['openstack-gnocchi-statsd'] %}
{% endif %}
RUN {{ macros.install_packages(gnocchi_statsd_packages | customizable("packages")) }}
{{ macros.install_packages(gnocchi_statsd_packages | customizable("packages")) }}
{% endif %}
{% block gnocchi_statsd_footer %}{% endblock %}

2
docker/haproxy/Dockerfile.j2
View File

@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% set haproxy_packages = ['haproxy'] %}
RUN {{ macros.install_packages(haproxy_packages | customizable("packages")) }}
{{ macros.install_packages(haproxy_packages | customizable("packages")) }}
RUN usermod -a -G kolla haproxy \
&& mkdir -p /var/lib/kolla/haproxy \

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set heat_api_cfn_packages = ['heat-api-cfn'] %}
{% endif %}
RUN {{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }}
{{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }}
{% endif %}
{% block heat_api_cfn_footer %}{% endblock %}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set heat_api_packages = ['heat-api'] %}
{% endif %}
RUN {{ macros.install_packages(heat_api_packages | customizable("packages")) }}
{{ macros.install_packages(heat_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_heat_extend_start

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set heat_base_packages = ['heat-common'] %}
{% endif %}
RUN {{ macros.install_packages(heat_base_packages | customizable("packages")) }}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}

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

@ -13,7 +13,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set heat_engine_packages = ['heat-engine'] %}
{% endif %}
RUN {{ macros.install_packages(heat_engine_packages | customizable("packages")) }}
{{ macros.install_packages(heat_engine_packages | customizable("packages")) }}
{% endif %}
{% block heat_engine_footer %}{% endblock %}

2
docker/heka/Dockerfile.j2
View File

@ -16,7 +16,7 @@ RUN useradd --user-group heka \
] %}
{% endif %}
RUN {{ macros.install_packages(heka_packages | customizable("packages")) }}
{{ macros.install_packages(heka_packages | customizable("packages")) }}
COPY plugins/modules /usr/share/heka/lua_modules/
COPY plugins/decoders /usr/share/heka/lua_decoders/

8
docker/horizon/Dockerfile.j2
View File

@ -13,7 +13,7 @@ MAINTAINER {{ maintainer }}
'gettext'
] %}
RUN {{ macros.install_packages(horizon_packages | customizable("packages")) }}
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
{% block horizon_redhat_binary_setup %}
RUN useradd --user-group horizon \
@ -38,7 +38,7 @@ RUN useradd --user-group horizon \
'gettext'
] %}
RUN {{ macros.install_packages(horizon_packages | customizable("packages")) }}
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
{% block horizon_ubuntu_binary_setup %}
RUN echo > /etc/apache2/ports.conf \
@ -69,7 +69,7 @@ RUN echo > /etc/apache2/ports.conf \
'gettext'
] %}
RUN {{ macros.install_packages(horizon_packages | customizable("packages")) }}
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
{% block horizon_redhat_source_setup %}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
@ -83,7 +83,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
'gettext'
] %}
RUN {{ macros.install_packages(horizon_packages | customizable("packages")) }}
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
{% block horizon_ubuntu_source_setup %}
RUN echo > /etc/apache2/ports.conf \

2
docker/influxdb/Dockerfile.j2
View File

@ -3,7 +3,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% set influxdb_packages = ['influxdb'] %}
RUN {{ macros.install_packages(influxdb_packages | customizable("packages")) }}
{{ macros.install_packages(influxdb_packages | customizable("packages")) }}
COPY influxdb_sudoers /etc/sudoers.d/kolla_influxdb_sudoers
RUN chmod 750 /etc/sudoers.d \

2
docker/iscsid/Dockerfile.j2
View File

@ -19,7 +19,7 @@ MAINTAINER {{ maintainer }}
{% endif %}
RUN {{ macros.install_packages(iscsid_packages | customizable("packages")) }}
{{ macros.install_packages(iscsid_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start \

2
docker/keepalived/Dockerfile.j2
View File

@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
'socat'
] %}
{% endif %}
RUN {{ macros.install_packages(keepalived_packages | customizable("packages")) }}
{{ macros.install_packages(keepalived_packages | customizable("packages")) }}
COPY check_alive.sh /

8
docker/keystone/Dockerfile.j2
View File

@ -13,7 +13,7 @@ MAINTAINER {{ maintainer }}
'python-ldappool'
] %}
RUN {{ macros.install_packages(keystone_packages | customizable("packages")) }}
{{ macros.install_packages(keystone_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/main \
&& cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin \
@ -28,7 +28,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
'python-ldappool'
] %}
RUN {{ macros.install_packages(keystone_packages | customizable("packages")) }}
{{ macros.install_packages(keystone_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/main \
&& cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin \
@ -43,7 +43,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
'mod_wsgi',
'python-ldappool'
] %}
RUN {{ macros.install_packages(keystone_packages | customizable("packages")) }}
{{ macros.install_packages(keystone_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
{% elif base_distro in ['ubuntu', 'debian'] %}
@ -53,7 +53,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
'libapache2-mod-wsgi',
'python-ldappool'
] %}
RUN {{ macros.install_packages(keystone_packages | customizable("packages")) }}
{{ macros.install_packages(keystone_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}

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

@ -42,7 +42,7 @@ MAINTAINER {{ maintainer }}
{% endif %}
{% endif %}
RUN {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
{{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \

6
docker/macros.j2
View File

@ -1,12 +1,14 @@
{% macro install_packages(packages) -%}
{% if packages is defined and packages|length > 0 -%}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] -%}
yum -y install {{ packages | join(' ') }} && yum clean all
RUN yum -y install {{ packages | join(' ') }} && yum clean all
{%- elif base_distro in ['ubuntu', 'debian'] -%}
{#-
debian_package_install is a utility method to build up an appropriate
set of commands to install packages in a debian-based environment that
may include URL links to a .deb package (e.g, heka)
-#}
{{ debian_package_install(packages) }}
RUN {{ debian_package_install(packages) }}
{%- endif %}
{%- endif %}
{%- endmacro %}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set magnum_api_packages = ['magnum-api'] %}
{% endif %}
RUN {{ macros.install_packages(magnum_api_packages | customizable("packages")) }}
{{ macros.install_packages(magnum_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_magnum_extend_start

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

@ -10,7 +10,7 @@ RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/y
{% elif base_distro in ['ubuntu'] %}
{% set magnum_base_packages = ['magnum-common'] %}
{% endif %}
RUN {{ macros.install_packages(magnum_base_packages | customizable("packages")) }}
{{ macros.install_packages(magnum_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}

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

@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
] %}
{% endif %}
RUN {{ macros.install_packages(magnum_conductor_packages | customizable("packages")) }}
{{ macros.install_packages(magnum_conductor_packages | customizable("packages")) }}
# Install kubectl binary
RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.2.0/bin/linux/amd64/kubectl \

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
'manila-api'
] %}
RUN {{ macros.install_packages(manila_api_packages | customizable("packages")) }}
{{ macros.install_packages(manila_api_packages | customizable("packages")) }}
{% endif%}
{% endif%}

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

@ -20,7 +20,7 @@ MAINTAINER {{ maintainer }}
{% endif %}
RUN {{ macros.install_packages(manila_base_packages | customizable("packages")) }}
{{ macros.install_packages(manila_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
@ -33,7 +33,7 @@ RUN {{ macros.install_packages(manila_base_packages | customizable("packages"))
{% endif %}
RUN {{ macros.install_packages(manila_base_packages | customizable("packages")) }}
{{ macros.install_packages(manila_base_packages | customizable("packages")) }}
ADD manila-base-archive /manila-base-source
RUN ln -s manila-base-source/* manila \

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
'manila-scheduler'
] %}
RUN {{ macros.install_packages(manila_scheduler_packages | customizable("packages")) }}
{{ macros.install_packages(manila_scheduler_packages | customizable("packages")) }}
{% endif%}
{% endif%}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
'openstack-manila-share'
] %}
RUN {{ macros.install_packages(manila_share_packages | customizable("packages")) }}
{{ macros.install_packages(manila_share_packages | customizable("packages")) }}
{% endif %}
{% endif %}

4
docker/memcached/Dockerfile.j2
View File

@ -7,14 +7,14 @@ MAINTAINER {{ maintainer }}
{% set user = 'memcached' %}
{% set memcached_packages = ['memcached'] %}
RUN {{ macros.install_packages(memcached_packages | customizable("packages")) }} \
{{ macros.install_packages(memcached_packages | customizable("packages")) }} \
&& usermod -a -G kolla {{ user }}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set user = 'memcache' %}
{% set memcached_packages = ['memcached'] %}
RUN {{ macros.install_packages(memcached_packages | customizable("packages")) }} \
{{ macros.install_packages(memcached_packages | customizable("packages")) }} \
&& usermod -a -G kolla {{ user }}
{% endif %}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set mistral_api_packages = ['mistral-api'] %}
{% endif %}
RUN {{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set mistral_base_packages = ['mistral-common'] %}
{% endif %}
RUN {{ macros.install_packages(mistral_base_packages | customizable("packages")) }}
{{ macros.install_packages(mistral_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set mistral_engine_packages = ['mistral-engine'] %}
{% endif %}
RUN {{ macros.install_packages(mistral_engine_packages | customizable("packages")) }}
{{ macros.install_packages(mistral_engine_packages | customizable("packages")) }}
{% endif %}
{% block mistral_engine_footer %}{% endblock %}

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set mistral_executor_packages = ['mistral-executor'] %}
{% endif %}
RUN {{ macros.install_packages(mistral_executor_packages | customizable("packages")) }}
{{ macros.install_packages(mistral_executor_packages | customizable("packages")) }}
{% endif %}
{% block mistral_executor_footer %}{% endblock %}

2
docker/mongodb/Dockerfile.j2
View File

@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
] %}
{% endif %}
RUN {{ macros.install_packages(mongodb_packages | customizable("packages")) }}
{{ macros.install_packages(mongodb_packages | customizable("packages")) }}
RUN mkdir -p /var/lib/mongodb /home/mongodb \
&& chown -R mongodb: /var/lib/mongodb /home/mongodb

2
docker/multipathd/Dockerfile.j2
View File

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% set multipathd_packages = ['multipath-tools'] %}
{% endif %}
RUN {{ macros.install_packages(multipathd_packages | customizable("packages")) }}
{{ macros.install_packages(multipathd_packages | customizable("packages")) }}
{% block multipathd_footer %}{% endblock %}
{% block footer %}{% endblock %}

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% set murano_api_packages = ['murano-api'] %}
{% endif %}
RUN {{ macros.install_packages(murano_api_packages | customizable("packages")) }}
{{ macros.install_packages(murano_api_packages | customizable("packages")) }}
{% endif %}

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

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
{% set murano_base_packages = ['murano-common'] %}
{% endif %}
RUN {{ macros.install_packages(murano_base_packages | customizable("packages")) }}
{{ macros.install_packages(murano_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set murano_engine_packages = ['murano-engine'] %}
{% endif %}
RUN {{ macros.install_packages(murano_engine_packages | customizable("packages")) }}
{{ macros.install_packages(murano_engine_packages | customizable("packages")) }}
{% endif %}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set neutron_metering_agent_packages = ['neutron-metering-agent'] %}
{% endif %}
RUN {{ macros.install_packages(neutron_metering_agent_packages | customizable("packages")) }}
{{ macros.install_packages(neutron_metering_agent_packages | customizable("packages")) }}
{% endif %}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
'openssl'
] %}
RUN {{ macros.install_packages(openstack_base_packages) }}
{{ macros.install_packages(openstack_base_packages) }}
{% endif %}
{% if install_type == 'binary' %}
@ -185,7 +185,7 @@ ENV DEBIAN_FRONTEND noninteractive
] %}
{% endif %}
RUN {{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
{{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
@ -221,7 +221,7 @@ RUN {{ macros.install_packages(openstack_base_packages | customizable("packages"
] %}
{% endif %}
RUN {{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
{{ 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 \

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% set openvswitch_base_packages = ['openvswitch-switch'] %}
{% endif %}
RUN {{ macros.install_packages(openvswitch_base_packages | customizable("packages")) }}
{{ macros.install_packages(openvswitch_base_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start

2
docker/rally/Dockerfile.j2
View File

@ -12,7 +12,7 @@ RUN useradd --user-group rally
{% elif base_distro in ['ubuntu'] %}
{% set rally_packages = ['rally'] %}
{% endif %}
RUN {{ macros.install_packages(rally_packages | customizable("packages")) }}
{{ macros.install_packages(rally_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
ADD rally-archive /rally-source

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set sahara_api_packages = ['sahara-api'] %}
{% endif %}
RUN {{ macros.install_packages(sahara_api_packages | customizable("packages")) }}
{{ macros.install_packages(sahara_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set sahara_base_packages = ['sahara-common'] %}
{% endif %}
RUN {{ macros.install_packages(sahara_base_packages | customizable("packages")) }}
{{ macros.install_packages(sahara_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['ubuntu'] %}
{% set sahara_engine_packages = ['sahara-engine'] %}
{% endif %}
RUN {{ macros.install_packages(sahara_engine_packages | customizable("packages")) }}
{{ macros.install_packages(sahara_engine_packages | customizable("packages")) }}
{% endif %}
{% block sahara_engine_footer %}{% endblock %}

2
docker/swift/swift-account/Dockerfile.j2
View File

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set swift_acount_packages = ['swift-account'] %}
{% endif %}
RUN {{ macros.install_packages(swift_acount_packages | customizable("packages")) }}
{{ macros.install_packages(swift_acount_packages | customizable("packages")) }}
{% endif %}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set swift_base_packages = ['swift'] %}
{% endif %}
RUN {{ macros.install_packages(swift_base_packages | customizable("packages")) }}
{{ macros.install_packages(swift_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
@ -19,7 +19,7 @@ RUN {{ macros.install_packages(swift_base_packages | customizable("packages")) }
{% set swift_base_packages = ['liberasurecode-dev'] %}
{% endif %}
RUN {{ macros.install_packages(swift_base_packages | customizable("packages")) }}
{{ macros.install_packages(swift_base_packages | customizable("packages")) }}
ADD swift-base-archive /swift-base-source
RUN ln -s swift-base-source/* swift \
&& useradd --user-group swift \

2
docker/swift/swift-container/Dockerfile.j2
View File

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set swift_container_packages = ['swift-container'] %}
{% endif %}
RUN {{ macros.install_packages(swift_container_packages | customizable("packages")) }}
{{ macros.install_packages(swift_container_packages | customizable("packages")) }}
{% endif %}

2
docker/swift/swift-object/Dockerfile.j2
View File

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set swift_object_packages = ['swift-object'] %}
{% endif %}
RUN {{ macros.install_packages(swift_object_packages | customizable("packages")) }}
{{ macros.install_packages(swift_object_packages | customizable("packages")) }}
{% endif %}

2
docker/swift/swift-proxy-server/Dockerfile.j2
View File

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set swift_proxy_server_packages = ['swift-proxy'] %}
{% endif %}
RUN {{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }}
{{ macros.install_packages(swift_proxy_server_packages | customizable("packages")) }}
{% endif %}

2
docker/swift/swift-rsyncd/Dockerfile.j2
View File

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% set swift_rsyncd_packages = ['rsync'] %}
{% endif %}
RUN {{ macros.install_packages(swift_rsyncd_packages | customizable("packages")) }}
{{ macros.install_packages(swift_rsyncd_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start

2
docker/telegraf/Dockerfile.j2
View File

@ -3,7 +3,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% set telegraf_packages = ['telegraf'] %}
RUN {{ macros.install_packages(telegraf_packages | customizable("packages")) }}
{{ macros.install_packages(telegraf_packages | customizable("packages")) }}
COPY telegraf_sudoers /etc/sudoers.d/kolla_telegraf_sudoers
RUN chmod 750 /etc/sudoers.d \

2
docker/tempest/Dockerfile.j2
View File

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set tempest_packages = ['tempest'] %}
{% endif %}
RUN {{ macros.install_packages(tempest_packages | customizable("packages")) }}
{{ macros.install_packages(tempest_packages | customizable("packages")) }}
{% elif install_type == 'source' %}

4
docker/tgtd/Dockerfile.j2
View File

@ -6,13 +6,13 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set tgtd_packages = ['scsi-target-utils'] %}
RUN {{ macros.install_packages(tgtd_packages | customizable("packages")) }}
{{ macros.install_packages(tgtd_packages | customizable("packages")) }}
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set tgtd_packages = ['tgt'] %}
RUN {{ macros.install_packages(tgtd_packages | customizable("packages")) }}
{{ macros.install_packages(tgtd_packages | customizable("packages")) }}
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
{% endif %}

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% set trove_api_packages = ['trove-api'] %}
{% endif %}
RUN {{ macros.install_packages(trove_api_packages | customizable("packages")) }}
{{ macros.install_packages(trove_api_packages | customizable("packages")) }}
{% endif %}

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

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
{% set trove_base_packages = ['trove-common'] %}
{% endif %}
RUN {{ macros.install_packages(trove_base_packages | customizable("packages")) }}
{{ macros.install_packages(trove_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set trove_conductor_packages = ['trove-conductor'] %}
{% endif %}
RUN {{ macros.install_packages(trove_conductor_packages | customizable("packages")) }}
{{ macros.install_packages(trove_conductor_packages | customizable("packages")) }}
{% endif %}

2
docker/trove/trove-guestagent/Dockerfile.j2
View File

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set trove_guestagent_packages = ['trove-guestagent'] %}
{% endif %}
RUN {{ macros.install_packages(trove_guestagent_packages | customizable("packages")) }}
{{ macros.install_packages(trove_guestagent_packages | customizable("packages")) }}
{% endif %}

2
docker/trove/trove-taskmanager/Dockerfile.j2
View File

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set trove_taskmanager_packages = ['trove-taskmanager'] %}
{% endif %}
RUN {{ macros.install_packages(trove_taskmanager_packages | customizable("packages")) }}
{{ macros.install_packages(trove_taskmanager_packages | customizable("packages")) }}
{% endif %}

2
docker/zaqar/Dockerfile.j2
View File

@ -13,7 +13,7 @@ MAINTAINER {{ maintainer }}
'zaqar-server'
] %}
{% endif %}
RUN {{ macros.install_packages(zaqar_packages | customizable("packages")) }}
{{ macros.install_packages(zaqar_packages | customizable("packages")) }}
{% elif install_type == 'source' %}