Move nova static configs to Armada manifest
Move all nova static configurations from the overrides to the Armada manifest. Story: 2003909 Task: 29372 Change-Id: I92c787cb8f05e02c8e960e23dcb356cc8f007492 Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
This commit is contained in:
parent
992fe3a26b
commit
812c2a17c4
@ -538,6 +538,8 @@ data:
|
|||||||
job_ks_endpoints: false
|
job_ks_endpoints: false
|
||||||
ingress_osapi: false
|
ingress_osapi: false
|
||||||
service_ingress_osapi: false
|
service_ingress_osapi: false
|
||||||
|
cron_job_cell_setup: false
|
||||||
|
cron_job_service_cleaner: false
|
||||||
labels:
|
labels:
|
||||||
agent:
|
agent:
|
||||||
compute:
|
compute:
|
||||||
@ -589,11 +591,93 @@ data:
|
|||||||
anti:
|
anti:
|
||||||
type:
|
type:
|
||||||
default: requiredDuringSchedulingIgnoredDuringExecution
|
default: requiredDuringSchedulingIgnoredDuringExecution
|
||||||
conf:
|
user:
|
||||||
nova:
|
nova:
|
||||||
|
uid: 0
|
||||||
|
conf:
|
||||||
|
ceph:
|
||||||
|
enabled: true
|
||||||
|
nova:
|
||||||
|
DEFAULT:
|
||||||
|
default_mempages_size: 2048
|
||||||
|
reserved_host_memory_mb: 0
|
||||||
|
compute_monitors: cpu.virt_driver
|
||||||
|
running_deleted_instance_poll_interval: 60
|
||||||
|
mkisofs_cmd: /usr/bin/genisoimage
|
||||||
|
network_allocate_retries: 2
|
||||||
|
force_raw_images: false
|
||||||
|
concurrent_disk_operations: 2
|
||||||
|
# Set number of block device allocate retries and interval
|
||||||
|
# for volume create when VM boots and creates a new volume.
|
||||||
|
# The total block allocate retries time is set to 2 hours
|
||||||
|
# to satisfy the volume allocation time on slow RPM disks
|
||||||
|
# which may take 1 hour and a half per volume when several
|
||||||
|
# volumes are created in parallel.
|
||||||
|
block_device_allocate_retries_interval: 3
|
||||||
|
block_device_allocate_retries: 2400
|
||||||
|
disk_allocation_ratio: 1.0
|
||||||
|
cpu_allocation_ratio: 16.0
|
||||||
|
ram_allocation_ratio: 1.0
|
||||||
|
remove_unused_original_minimum_age_seconds: 3600
|
||||||
|
enable_new_services: false
|
||||||
|
map_new_hosts: false
|
||||||
|
|
||||||
libvirt:
|
libvirt:
|
||||||
virt_type: qemu
|
|
||||||
cpu_mode: none
|
cpu_mode: none
|
||||||
|
live_migration_completion_timeout: 180
|
||||||
|
live_migration_permit_auto_converge: true
|
||||||
|
mem_stats_period_seconds: 0
|
||||||
|
rbd_secret_uuid: null
|
||||||
|
rbd_user: null
|
||||||
|
# Allow up to 1 day for resize conf
|
||||||
|
remove_unused_resized_minimum_age_seconds: 86400
|
||||||
|
database:
|
||||||
|
idle_timeout: 60
|
||||||
|
max_overflow: 64
|
||||||
|
max_pool_size: 1
|
||||||
|
api_database:
|
||||||
|
idle_timeout: 60
|
||||||
|
max_overflow: 64
|
||||||
|
max_pool_size: 1
|
||||||
|
cell0_database:
|
||||||
|
idle_timeout: 60
|
||||||
|
max_overflow: 64
|
||||||
|
max_pool_size: 1
|
||||||
|
placement:
|
||||||
|
os_interface: internal
|
||||||
|
neutron:
|
||||||
|
default_floating_pool: public
|
||||||
|
notifications:
|
||||||
|
notification_format: unversioned
|
||||||
|
filter_scheduler:
|
||||||
|
disk_weight_multiplier: 0.0
|
||||||
|
enabled_filters:
|
||||||
|
- RetryFilter
|
||||||
|
- ComputeFilter
|
||||||
|
- AvailabilityZoneFilter
|
||||||
|
- AggregateInstanceExtraSpecsFilter
|
||||||
|
- ComputeCapabilitiesFilter
|
||||||
|
- ImagePropertiesFilter
|
||||||
|
- NUMATopologyFilter
|
||||||
|
- ServerGroupAffinityFilter
|
||||||
|
- ServerGroupAntiAffinityFilter
|
||||||
|
- PciPassthroughFilter
|
||||||
|
- DiskFilter
|
||||||
|
io_ops_weight_multiplier: -5.0
|
||||||
|
pci_weight_multiplier: 0.0
|
||||||
|
ram_weight_multiplier: 0.0
|
||||||
|
soft_affinity_weight_multiplier: 0.0
|
||||||
|
soft_anti_affinity_weight_multiplier: 0.0
|
||||||
|
scheduler:
|
||||||
|
discover_hosts_in_cells_interval: 30
|
||||||
|
periodic_task_interval: -1
|
||||||
|
upgrade_levels: None
|
||||||
|
metrics:
|
||||||
|
required: false
|
||||||
|
network:
|
||||||
|
sshd:
|
||||||
|
enabled: true
|
||||||
|
|
||||||
source:
|
source:
|
||||||
type: tar
|
type: tar
|
||||||
location: http://172.17.0.1/helm_charts/nova-0.1.0.tgz
|
location: http://172.17.0.1/helm_charts/nova-0.1.0.tgz
|
||||||
|
@ -538,6 +538,8 @@ data:
|
|||||||
job_ks_endpoints: false
|
job_ks_endpoints: false
|
||||||
ingress_osapi: false
|
ingress_osapi: false
|
||||||
service_ingress_osapi: false
|
service_ingress_osapi: false
|
||||||
|
cron_job_cell_setup: false
|
||||||
|
cron_job_service_cleaner: false
|
||||||
labels:
|
labels:
|
||||||
agent:
|
agent:
|
||||||
compute:
|
compute:
|
||||||
@ -589,11 +591,93 @@ data:
|
|||||||
anti:
|
anti:
|
||||||
type:
|
type:
|
||||||
default: requiredDuringSchedulingIgnoredDuringExecution
|
default: requiredDuringSchedulingIgnoredDuringExecution
|
||||||
conf:
|
user:
|
||||||
nova:
|
nova:
|
||||||
|
uid: 0
|
||||||
|
conf:
|
||||||
|
ceph:
|
||||||
|
enabled: true
|
||||||
|
nova:
|
||||||
|
DEFAULT:
|
||||||
|
default_mempages_size: 2048
|
||||||
|
reserved_host_memory_mb: 0
|
||||||
|
compute_monitors: cpu.virt_driver
|
||||||
|
running_deleted_instance_poll_interval: 60
|
||||||
|
mkisofs_cmd: /usr/bin/genisoimage
|
||||||
|
network_allocate_retries: 2
|
||||||
|
force_raw_images: false
|
||||||
|
concurrent_disk_operations: 2
|
||||||
|
# Set number of block device allocate retries and interval
|
||||||
|
# for volume create when VM boots and creates a new volume.
|
||||||
|
# The total block allocate retries time is set to 2 hours
|
||||||
|
# to satisfy the volume allocation time on slow RPM disks
|
||||||
|
# which may take 1 hour and a half per volume when several
|
||||||
|
# volumes are created in parallel.
|
||||||
|
block_device_allocate_retries_interval: 3
|
||||||
|
block_device_allocate_retries: 2400
|
||||||
|
disk_allocation_ratio: 1.0
|
||||||
|
cpu_allocation_ratio: 16.0
|
||||||
|
ram_allocation_ratio: 1.0
|
||||||
|
remove_unused_original_minimum_age_seconds: 3600
|
||||||
|
enable_new_services: false
|
||||||
|
map_new_hosts: false
|
||||||
|
|
||||||
libvirt:
|
libvirt:
|
||||||
virt_type: qemu
|
|
||||||
cpu_mode: none
|
cpu_mode: none
|
||||||
|
live_migration_completion_timeout: 180
|
||||||
|
live_migration_permit_auto_converge: true
|
||||||
|
mem_stats_period_seconds: 0
|
||||||
|
rbd_secret_uuid: null
|
||||||
|
rbd_user: null
|
||||||
|
# Allow up to 1 day for resize conf
|
||||||
|
remove_unused_resized_minimum_age_seconds: 86400
|
||||||
|
database:
|
||||||
|
idle_timeout: 60
|
||||||
|
max_overflow: 64
|
||||||
|
max_pool_size: 1
|
||||||
|
api_database:
|
||||||
|
idle_timeout: 60
|
||||||
|
max_overflow: 64
|
||||||
|
max_pool_size: 1
|
||||||
|
cell0_database:
|
||||||
|
idle_timeout: 60
|
||||||
|
max_overflow: 64
|
||||||
|
max_pool_size: 1
|
||||||
|
placement:
|
||||||
|
os_interface: internal
|
||||||
|
neutron:
|
||||||
|
default_floating_pool: public
|
||||||
|
notifications:
|
||||||
|
notification_format: unversioned
|
||||||
|
filter_scheduler:
|
||||||
|
disk_weight_multiplier: 0.0
|
||||||
|
enabled_filters:
|
||||||
|
- RetryFilter
|
||||||
|
- ComputeFilter
|
||||||
|
- AvailabilityZoneFilter
|
||||||
|
- AggregateInstanceExtraSpecsFilter
|
||||||
|
- ComputeCapabilitiesFilter
|
||||||
|
- ImagePropertiesFilter
|
||||||
|
- NUMATopologyFilter
|
||||||
|
- ServerGroupAffinityFilter
|
||||||
|
- ServerGroupAntiAffinityFilter
|
||||||
|
- PciPassthroughFilter
|
||||||
|
- DiskFilter
|
||||||
|
io_ops_weight_multiplier: -5.0
|
||||||
|
pci_weight_multiplier: 0.0
|
||||||
|
ram_weight_multiplier: 0.0
|
||||||
|
soft_affinity_weight_multiplier: 0.0
|
||||||
|
soft_anti_affinity_weight_multiplier: 0.0
|
||||||
|
scheduler:
|
||||||
|
discover_hosts_in_cells_interval: 30
|
||||||
|
periodic_task_interval: -1
|
||||||
|
upgrade_levels: None
|
||||||
|
metrics:
|
||||||
|
required: false
|
||||||
|
network:
|
||||||
|
sshd:
|
||||||
|
enabled: true
|
||||||
|
|
||||||
source:
|
source:
|
||||||
type: tar
|
type: tar
|
||||||
location: http://172.17.0.1/helm_charts/nova-0.1.0.tgz
|
location: http://172.17.0.1/helm_charts/nova-0.1.0.tgz
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
SRC_DIR="sysinv"
|
SRC_DIR="sysinv"
|
||||||
TIS_PATCH_VER=297
|
TIS_PATCH_VER=298
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) 2018 Wind River Systems, Inc.
|
# Copyright (c) 2018-2019 Wind River Systems, Inc.
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
@ -17,23 +17,6 @@ from sysinv.helm import openstack
|
|||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
SCHEDULER_FILTERS_COMMON = [
|
|
||||||
'RetryFilter',
|
|
||||||
'ComputeFilter',
|
|
||||||
'BaremetalFilter',
|
|
||||||
'AvailabilityZoneFilter',
|
|
||||||
'AggregateInstanceExtraSpecsFilter',
|
|
||||||
'ComputeCapabilitiesFilter',
|
|
||||||
'ImagePropertiesFilter',
|
|
||||||
'VCpuModelFilter',
|
|
||||||
'NUMATopologyFilter',
|
|
||||||
'ServerGroupAffinityFilter',
|
|
||||||
'ServerGroupAntiAffinityFilter',
|
|
||||||
'PciPassthroughFilter',
|
|
||||||
'DiskFilter',
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
class NovaHelm(openstack.OpenstackBaseHelm):
|
class NovaHelm(openstack.OpenstackBaseHelm):
|
||||||
"""Class to encapsulate helm operations for the nova chart"""
|
"""Class to encapsulate helm operations for the nova chart"""
|
||||||
|
|
||||||
@ -50,7 +33,6 @@ class NovaHelm(openstack.OpenstackBaseHelm):
|
|||||||
return self.SUPPORTED_NAMESPACES
|
return self.SUPPORTED_NAMESPACES
|
||||||
|
|
||||||
def get_overrides(self, namespace=None):
|
def get_overrides(self, namespace=None):
|
||||||
scheduler_filters = SCHEDULER_FILTERS_COMMON
|
|
||||||
|
|
||||||
ssh_privatekey, ssh_publickey = \
|
ssh_privatekey, ssh_publickey = \
|
||||||
self._get_or_generate_ssh_keys(self.SERVICE_NAME, common.HELM_NS_OPENSTACK)
|
self._get_or_generate_ssh_keys(self.SERVICE_NAME, common.HELM_NS_OPENSTACK)
|
||||||
@ -65,103 +47,16 @@ class NovaHelm(openstack.OpenstackBaseHelm):
|
|||||||
'consoleauth': self._num_controllers(),
|
'consoleauth': self._num_controllers(),
|
||||||
'scheduler': self._num_controllers(),
|
'scheduler': self._num_controllers(),
|
||||||
# set replicas for novncproxy once it's validated.
|
# set replicas for novncproxy once it's validated.
|
||||||
},
|
|
||||||
'user': {
|
|
||||||
'nova': {
|
|
||||||
'uid': 0
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
},
|
|
||||||
'manifests': {
|
|
||||||
'cron_job_cell_setup': False,
|
|
||||||
'cron_job_service_cleaner': False
|
|
||||||
},
|
},
|
||||||
'conf': {
|
'conf': {
|
||||||
'ceph': {
|
|
||||||
'enabled': True
|
|
||||||
},
|
|
||||||
'nova': {
|
'nova': {
|
||||||
'DEFAULT': {
|
|
||||||
'default_mempages_size': 2048,
|
|
||||||
'reserved_host_memory_mb': 0,
|
|
||||||
'compute_monitors': 'cpu.virt_driver',
|
|
||||||
'running_deleted_instance_poll_interval': 60,
|
|
||||||
'mkisofs_cmd': '/usr/bin/genisoimage',
|
|
||||||
'network_allocate_retries': 2,
|
|
||||||
'force_raw_images': False,
|
|
||||||
'concurrent_disk_operations': 2,
|
|
||||||
# Set number of block device allocate retries and interval
|
|
||||||
# for volume create when VM boots and creates a new volume.
|
|
||||||
# The total block allocate retries time is set to 2 hours
|
|
||||||
# to satisfy the volume allocation time on slow RPM disks
|
|
||||||
# which may take 1 hour and a half per volume when several
|
|
||||||
# volumes are created in parallel.
|
|
||||||
'block_device_allocate_retries_interval': 3,
|
|
||||||
'block_device_allocate_retries': 2400,
|
|
||||||
'disk_allocation_ratio': 1.0,
|
|
||||||
'cpu_allocation_ratio': 16.0,
|
|
||||||
'ram_allocation_ratio': 1.0,
|
|
||||||
'remove_unused_original_minimum_age_seconds': 3600,
|
|
||||||
'enable_new_services': False,
|
|
||||||
'map_new_hosts': False
|
|
||||||
},
|
|
||||||
'libvirt': {
|
'libvirt': {
|
||||||
'virt_type': self._get_virt_type(),
|
'virt_type': self._get_virt_type(),
|
||||||
'cpu_mode': 'none',
|
|
||||||
'live_migration_completion_timeout': 180,
|
|
||||||
'live_migration_permit_auto_converge': True,
|
|
||||||
'mem_stats_period_seconds': 0,
|
|
||||||
'rbd_secret_uuid': None,
|
|
||||||
'rbd_user': None,
|
|
||||||
# Allow up to 1 day for resize confirm
|
|
||||||
'remove_unused_resized_minimum_age_seconds': 86400
|
|
||||||
},
|
|
||||||
'database': {
|
|
||||||
'max_overflow': 64,
|
|
||||||
'idle_timeout': 60,
|
|
||||||
'max_pool_size': 1
|
|
||||||
},
|
|
||||||
'api_database': {
|
|
||||||
'max_overflow': 64,
|
|
||||||
'idle_timeout': 60,
|
|
||||||
'max_pool_size': 1
|
|
||||||
},
|
|
||||||
'cell0_database': {
|
|
||||||
'max_overflow': 64,
|
|
||||||
'idle_timeout': 60,
|
|
||||||
'max_pool_size': 1
|
|
||||||
},
|
|
||||||
'placement': {
|
|
||||||
'os_interface': 'internal'
|
|
||||||
},
|
|
||||||
'neutron': {
|
|
||||||
'default_floating_pool': 'public'
|
|
||||||
},
|
|
||||||
'notifications': {
|
|
||||||
'notification_format': 'unversioned'
|
|
||||||
},
|
|
||||||
'filter_scheduler': {
|
|
||||||
'enabled_filters': scheduler_filters,
|
|
||||||
'ram_weight_multiplier': 0.0,
|
|
||||||
'disk_weight_multiplier': 0.0,
|
|
||||||
'io_ops_weight_multiplier': -5.0,
|
|
||||||
'pci_weight_multiplier': 0.0,
|
|
||||||
'soft_affinity_weight_multiplier': 0.0,
|
|
||||||
'soft_anti_affinity_weight_multiplier': 0.0
|
|
||||||
},
|
|
||||||
'scheduler': {
|
|
||||||
'periodic_task_interval': -1,
|
|
||||||
'discover_hosts_in_cells_interval': 30
|
|
||||||
},
|
|
||||||
'metrics': {
|
|
||||||
'required': False,
|
|
||||||
'weight_setting_multi': 'vswitch.multi_avail=100.0',
|
|
||||||
'weight_setting': 'vswitch.max_avail=100.0'
|
|
||||||
},
|
},
|
||||||
'vnc': {
|
'vnc': {
|
||||||
'novncproxy_base_url': self._get_novncproxy_base_url(),
|
'novncproxy_base_url': self._get_novncproxy_base_url(),
|
||||||
},
|
}
|
||||||
'upgrade_levels': 'None'
|
|
||||||
},
|
},
|
||||||
'overrides': {
|
'overrides': {
|
||||||
'nova_compute': {
|
'nova_compute': {
|
||||||
@ -175,7 +70,6 @@ class NovaHelm(openstack.OpenstackBaseHelm):
|
|||||||
'images': self._get_images_overrides(),
|
'images': self._get_images_overrides(),
|
||||||
'network': {
|
'network': {
|
||||||
'sshd': {
|
'sshd': {
|
||||||
'enabled': True,
|
|
||||||
'from_subnet': self._get_ssh_subnet(),
|
'from_subnet': self._get_ssh_subnet(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user