summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-17 13:40:12 +0000
committerGerrit Code Review <review@openstack.org>2017-06-17 13:40:12 +0000
commitc1b0c1c6ef35013e9ef773a53c44361f4e416850 (patch)
tree82a7282e5aecd1586cc44864b399535833bb9fbb
parent778cb613453ba1b371cd3352f46c7c4da787b8e6 (diff)
parent031e5118dd57daf0a140e42a13db466cc21c1125 (diff)
Merge "Switch to RDO packages for HA support in Kolla images"
-rw-r--r--container-images/tripleo_kolla_template_overrides.j221
1 files changed, 7 insertions, 14 deletions
diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2
index 57bb9c4..9081348 100644
--- a/container-images/tripleo_kolla_template_overrides.j2
+++ b/container-images/tripleo_kolla_template_overrides.j2
@@ -45,38 +45,31 @@
45# We'll configure mariadb with galera.cnf 45# We'll configure mariadb with galera.cnf
46RUN rm /etc/my.cnf.d/mariadb-server.cnf /etc/my.cnf.d/auth_gssapi.cnf 46RUN rm /etc/my.cnf.d/mariadb-server.cnf /etc/my.cnf.d/auth_gssapi.cnf
47 47
48# temporary pacemaker packages with support for bundles 48RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
49RUN 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
50{% endblock %} 49{% endblock %}
51 50
52{% block rabbitmq_footer %} 51{% block rabbitmq_footer %}
53# temporary pacemaker packages with support for bundles 52RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
54RUN 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
55{% endblock %} 53{% endblock %}
56 54
57{% block redis_footer %} 55{% block redis_footer %}
58# temporary pacemaker packages with support for bundles 56RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
59RUN 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
60{% endblock %} 57{% endblock %}
61 58
62{% block haproxy_footer %} 59{% block haproxy_footer %}
63# temporary pacemaker packages with support for bundles 60RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
64RUN 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
65{% endblock %} 61{% endblock %}
66 62
67{% block cinder_volume_footer %} 63{% block cinder_volume_footer %}
68# temporary pacemaker packages with support for bundles 64RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
69RUN 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
70{% endblock %} 65{% endblock %}
71 66
72{% block cinder_backup_footer %} 67{% block cinder_backup_footer %}
73# temporary pacemaker packages with support for bundles 68RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
74RUN 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
75{% endblock %} 69{% endblock %}
76 70
77{% block manila_share_footer %} 71{% block manila_share_footer %}
78# temporary pacemaker packages with support for bundles 72RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
79RUN 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
80{% endblock %} 73{% endblock %}
81 74
82# Required for nova migration 75# Required for nova migration