Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[ha] cmp: Fix duplicate PXE/admin interface IDs
[fuel.git]
/
mcp
/
reclass
/
classes
/
cluster
/
mcp-common-ha
/
openstack_control.yml.j2
diff --git
a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
index
cdebe3f
..
ceb3622
100644
(file)
--- a/
mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/
mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@
-21,7
+21,7
@@
classes:
- system.designate.server.cluster
- system.designate.server.backend.bind
- system.bind.server.single
- system.designate.server.cluster
- system.designate.server.backend.bind
- system.bind.server.single
- - system.haproxy.proxy.listen.openstack.
nova-
placement
+ - system.haproxy.proxy.listen.openstack.placement
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.glance
- system.glusterfs.client.volume.keystone
- system.glusterfs.client.cluster
- system.glusterfs.client.volume.glance
- system.glusterfs.client.volume.keystone
@@
-99,9
+99,6
@@
parameters:
server:
bind:
~ports: ~
server:
bind:
~ports: ~
- ~modules:
- - rewrite
- - wsgi
# sync from common-ha kvm role
glusterfs:
server:
# sync from common-ha kvm role
glusterfs:
server:
@@
-134,12
+131,7
@@
parameters:
haproxy:
proxy:
listen:
haproxy:
proxy:
listen:
- nova_placement_api:
- health-check:
- http:
- ~options:
- - expect status 405
- ~heat_cloudwatch_api:
+ heat_cloudwatch_api:
enabled: false
bind:
server:
enabled: false
bind:
server: