starlingx
/
config
Code Issues Proposed changes

Merge "Disable Baremetal Libvirt and Enable baremetal horizon services"

This commit is contained in:
Zuul 2018-10-11 19:48:43 +00:00 committed by Gerrit Code Review
parent 8d634bc9b2 b9fe7baa3d
commit b98b509ea2
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet-manifests/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
SRC_DIR="src"
TIS_PATCH_VER=66
TIS_PATCH_VER=67

8
puppet-manifests/src/modules/platform/manifests/sm.pp
View File

@ -820,14 +820,6 @@ class platform::sm
exec { 'Deprovision OpenStack - Neutron Server (service)':
command => "sm-deprovision service neutron-server",
}
# Deprovision Horizon
exec { 'Deprovision OpenStack - Horizon (service-group-member)':
command => "sm-deprovision service-group-member web-services horizon",
} ->
exec { 'Deprovision OpenStack - Horizon(service)':
command => "sm-deprovision service horizon",
}
}
if $heat_service_enabled {

2
sysinv/sysinv/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
SRC_DIR="sysinv"
TIS_PATCH_VER=286
TIS_PATCH_VER=287

4
sysinv/sysinv/sysinv/sysinv/puppet/nova.py
View File

@ -419,6 +419,10 @@ class NovaPuppet(openstack.OpenstackBasePuppet):
def _get_compute_config(self, host):
return {
'nova::compute::enabled': self._enable_nova_compute(),
'nova::compute::libvirt::manage_libvirt_services':
self._enable_nova_compute(),
'nova::migration::libvirt::configure_libvirt':
self._enable_nova_compute(),
'nova::compute::compute_reserved_vm_memory_2M':
self._get_reserved_memory_2M(host),
'nova::compute::compute_reserved_vm_memory_1G':