Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Revert "Disable block migration explicitly""
[fuel.git]
/
mcp
/
reclass
/
classes
/
cluster
/
mcp-common-noha
/
openstack_control.yml.j2
diff --git
a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index
e9bb135
..
cf09d59
100644
(file)
--- a/
mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/
mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@
-8,7
+8,6
@@
---
classes:
- system.linux.system.lowmem
---
classes:
- system.linux.system.lowmem
- - system.linux.system.repo.mcp.openstack
- service.nfs.server
- system.ceilometer.client
- system.ceilometer.client.neutron
- service.nfs.server
- system.ceilometer.client
- system.ceilometer.client.neutron
@@
-35,11
+34,10
@@
classes:
- service.mysql.server.single
- system.galera.server.database.cinder
- system.galera.server.database.glance
- service.mysql.server.single
- system.galera.server.database.cinder
- system.galera.server.database.glance
- - system.galera.server.database.
grafana
+ - system.galera.server.database.
neutron
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
- system.galera.server.database.heat
- system.galera.server.database.keystone
- system.galera.server.database.nova
- - system.galera.server.database.ceilometer
- system.galera.server.database.aodh
- system.galera.server.database.gnocchi
- system.galera.server.database.panko
- system.galera.server.database.aodh
- system.galera.server.database.gnocchi
- system.galera.server.database.panko
@@
-48,14
+46,9
@@
classes:
- service.barbican.server.plugin.simple_crypto
- service.redis.server.single
- service.ceilometer.server.single
- service.barbican.server.plugin.simple_crypto
- service.redis.server.single
- service.ceilometer.server.single
- - system.ceilometer.server.coordination.redis
- system.ceilometer.server.backend.default
- system.aodh.server.single
- system.ceilometer.server.backend.default
- system.aodh.server.single
- - system.aodh.server.coordination.redis
- system.gnocchi.server.single
- system.gnocchi.server.single
- - system.gnocchi.common.storage.incoming.redis
- - system.gnocchi.common.storage.redis
- - system.gnocchi.common.coordination.redis
- service.panko.server.single
- system.apache.server.site.gnocchi
- system.apache.server.site.panko
- service.panko.server.single
- system.apache.server.site.gnocchi
- system.apache.server.site.panko
@@
-68,13
+61,14
@@
classes:
- system.galera.server.database.tacker
- service.tacker.server.single
{%- endif %}
- system.galera.server.database.tacker
- service.tacker.server.single
{%- endif %}
+ - cluster.all-mcp-arch-common.backports
- cluster.mcp-common-noha.haproxy_openstack_api
- cluster.mcp-common-noha.openstack_control_pdf
parameters:
_param:
- cluster.mcp-common-noha.haproxy_openstack_api
- cluster.mcp-common-noha.openstack_control_pdf
parameters:
_param:
- interface_mtu: 9000
linux_system_codename: xenial
ceilometer_create_gnocchi_resources: 'True'
linux_system_codename: xenial
ceilometer_create_gnocchi_resources: 'True'
+ ceilometer_endpoint_status: absent
barbican_integration_enabled: 'false'
linux:
system:
barbican_integration_enabled: 'false'
linux:
system:
@@
-100,6
+94,13
@@
parameters:
resources:
v3:
enabled: true
resources:
v3:
enabled: true
+ services:
+ ceilometer:
+ status: absent
+ # required only for Rally validation
+ cinder:
+ type: volume
+ description: OpenStack Volume Service
server:
identity:
admin:
server:
identity:
admin:
@@
-165,10
+166,18
@@
parameters:
~database: ~
redis:
server:
~database: ~
redis:
server:
- version:
3
.0
+ version:
5
.0
appendfsync: 'no'
bind:
address: ${_param:single_address}
appendfsync: 'no'
bind:
address: ${_param:single_address}
+ gnocchi:
+ common:
+ storage:
+ driver: redis
+ redis_url: redis://${_param:single_address}:6379
+ incoming:
+ driver: redis
+ redis_url: redis://${_param:single_address}:6379
nfs:
server:
share:
nfs:
server:
share:
@@
-185,9
+194,10
@@
parameters:
server:
vlan_aware_vms: true
root_helper_daemon: false
server:
vlan_aware_vms: true
root_helper_daemon: false
- global_physnet_mtu: 9000
+ agent_down_time: 300
+ global_physnet_mtu: ${_param:interface_mtu}
backend:
backend:
- external_mtu:
9000
+ external_mtu:
${_param:interface_mtu}
{%- if '-bgpvpn-' in conf.MCP_DEPLOY_SCENARIO %}
bgp_vpn:
enabled: True
{%- if '-bgpvpn-' in conf.MCP_DEPLOY_SCENARIO %}
bgp_vpn:
enabled: True