Switch to RDO packages for HA support in Kolla images
Now that the needed versions of pacemaker, pcs, libqb and resource-agents have landed in RDO, we can get rid of the temporary external yum repo Change-Id: I450c3102813bd5c398f448542b2ed381cbb60c48
This commit is contained in:
parent
93d87e069c
commit
031e5118dd
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue