openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Switch to RDO packages for HA support in Kolla images"

This commit is contained in:
Jenkins 2017-06-17 13:40:12 +00:00 committed by Gerrit Code Review
parent 778cb61345 031e5118dd
commit c1b0c1c6ef
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
container-images/tripleo_kolla_template_overrides.j2
View File

@ -45,38 +45,31 @@
# We'll configure mariadb with galera.cnf # We'll configure mariadb with galera.cnf
RUN rm /etc/my.cnf.d/mariadb-server.cnf /etc/my.cnf.d/auth_gssapi.cnf RUN rm /etc/my.cnf.d/mariadb-server.cnf /etc/my.cnf.d/auth_gssapi.cnf
# temporary pacemaker packages with support for bundles RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
RUN yum-config-manager --add-repo http://people.redhat.com/mbaldess/rpms/container-repo/pacemaker-bundle.repo && yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
{% endblock %} {% endblock %}
{% block rabbitmq_footer %} {% block rabbitmq_footer %}
# temporary pacemaker packages with support for bundles RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
RUN yum-config-manager --add-repo http://people.redhat.com/mbaldess/rpms/container-repo/pacemaker-bundle.repo && yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
{% endblock %} {% endblock %}
{% block redis_footer %} {% block redis_footer %}
# temporary pacemaker packages with support for bundles RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
RUN yum-config-manager --add-repo http://people.redhat.com/mbaldess/rpms/container-repo/pacemaker-bundle.repo && yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
{% endblock %} {% endblock %}
{% block haproxy_footer %} {% block haproxy_footer %}
# temporary pacemaker packages with support for bundles RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
RUN yum-config-manager --add-repo http://people.redhat.com/mbaldess/rpms/container-repo/pacemaker-bundle.repo && yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
{% endblock %} {% endblock %}
{% block cinder_volume_footer %} {% block cinder_volume_footer %}
# temporary pacemaker packages with support for bundles RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
RUN yum-config-manager --add-repo http://people.redhat.com/mbaldess/rpms/container-repo/pacemaker-bundle.repo && yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
{% endblock %} {% endblock %}
{% block cinder_backup_footer %} {% block cinder_backup_footer %}
# temporary pacemaker packages with support for bundles RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
RUN yum-config-manager --add-repo http://people.redhat.com/mbaldess/rpms/container-repo/pacemaker-bundle.repo && yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
{% endblock %} {% endblock %}
{% block manila_share_footer %} {% block manila_share_footer %}
# temporary pacemaker packages with support for bundles RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
RUN yum-config-manager --add-repo http://people.redhat.com/mbaldess/rpms/container-repo/pacemaker-bundle.repo && yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
{% endblock %} {% endblock %}
# Required for nova migration # Required for nova migration