a3297afea9
The docker nova-compute.yaml file does not have the service_config_settings from the base file. So the collectd and fluentd parameters defined are not got when the service run containerized. The patch get the service_config_settings from the base file and use it on the when is containerized. Closes-Bug: #1757066 Change-Id: I0b3567edd7530d1ae0a69d3ee25bd1442f14fb58
255 lines
8.9 KiB
YAML
255 lines
8.9 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
OpenStack containerized Nova Compute service
|
|
|
|
parameters:
|
|
DockerNovaComputeImage:
|
|
description: image
|
|
type: string
|
|
DockerNovaLibvirtConfigImage:
|
|
description: The container image to use for the nova_libvirt config_volume
|
|
type: string
|
|
ServiceData:
|
|
default: {}
|
|
description: Dictionary packing service data
|
|
type: json
|
|
ServiceNetMap:
|
|
default: {}
|
|
description: Mapping of service_name -> network name. Typically set
|
|
via parameter_defaults in the resource registry. This
|
|
mapping overrides those in ServiceNetMapDefaults.
|
|
type: json
|
|
DefaultPasswords:
|
|
default: {}
|
|
type: json
|
|
RoleName:
|
|
default: ''
|
|
description: Role name on which the service is applied
|
|
type: string
|
|
RoleParameters:
|
|
default: {}
|
|
description: Parameters specific to the role
|
|
type: json
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
type: json
|
|
DockerNovaMigrationSshdPort:
|
|
default: 2022
|
|
description: Port that dockerized nova migration target sshd service
|
|
binds to.
|
|
type: number
|
|
UpgradeLevelNovaCompute:
|
|
type: string
|
|
description: Nova Compute upgrade level
|
|
default: ''
|
|
UpgradeRemoveUnusedPackages:
|
|
default: false
|
|
description: Remove package if the service is being disabled during upgrade
|
|
type: boolean
|
|
CephClientUserName:
|
|
default: openstack
|
|
type: string
|
|
CephClusterName:
|
|
type: string
|
|
default: ceph
|
|
description: The Ceph cluster name.
|
|
constraints:
|
|
- allowed_pattern: "[a-zA-Z0-9]+"
|
|
description: >
|
|
The Ceph cluster name must be at least 1 character and contain only
|
|
letters and numbers.
|
|
NovaComputeOptVolumes:
|
|
default: []
|
|
description: list of optional vo
|
|
type: comma_delimited_list
|
|
NovaComputeOptEnvVars:
|
|
default: []
|
|
description: list of optional en
|
|
type: comma_delimited_list
|
|
|
|
resources:
|
|
|
|
ContainersCommon:
|
|
type: ./containers-common.yaml
|
|
|
|
MySQLClient:
|
|
type: ../../puppet/services/database/mysql-client.yaml
|
|
|
|
NovaComputeBase:
|
|
type: ../../puppet/services/nova-compute.yaml
|
|
properties:
|
|
EndpointMap: {get_param: EndpointMap}
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
NovaLogging:
|
|
type: OS::TripleO::Services::Logging::NovaCommon
|
|
properties:
|
|
DockerNovaImage: {get_param: DockerNovaComputeImage}
|
|
NovaServiceName: 'compute'
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Nova Compute service.
|
|
value:
|
|
service_name: {get_attr: [NovaComputeBase, role_data, service_name]}
|
|
cellv2_discovery: true
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [NovaComputeBase, role_data, config_settings]
|
|
- get_attr: [NovaLogging, config_settings]
|
|
logging_source: {get_attr: [NovaComputeBase, role_data, logging_source]}
|
|
logging_groups: {get_attr: [NovaComputeBase, role_data, logging_groups]}
|
|
service_config_settings: {get_attr: [NovaComputeBase, role_data, service_config_settings]}
|
|
puppet_config:
|
|
config_volume: nova_libvirt
|
|
puppet_tags: nova_config,nova_paste_api_ini
|
|
step_config:
|
|
list_join:
|
|
- "\n"
|
|
- - {get_attr: [NovaComputeBase, role_data, step_config]}
|
|
- {get_attr: [MySQLClient, role_data, step_config]}
|
|
config_image: {get_param: DockerNovaLibvirtConfigImage}
|
|
kolla_config:
|
|
/var/lib/kolla/config_files/nova_compute.json:
|
|
command:
|
|
list_join:
|
|
- ' '
|
|
- - /usr/bin/nova-compute
|
|
- get_attr: [NovaLogging, cmd_extra_args]
|
|
config_files:
|
|
- source: "/var/lib/kolla/config_files/src/*"
|
|
dest: "/"
|
|
merge: true
|
|
preserve_properties: true
|
|
- source: "/var/lib/kolla/config_files/src-iscsid/*"
|
|
dest: "/etc/iscsi/"
|
|
merge: true
|
|
preserve_properties: true
|
|
- source: "/var/lib/kolla/config_files/src-ceph/"
|
|
dest: "/etc/ceph/"
|
|
merge: true
|
|
preserve_properties: true
|
|
permissions:
|
|
- path: /var/log/nova
|
|
owner: nova:nova
|
|
recurse: true
|
|
- path: /var/lib/nova
|
|
owner: nova:nova
|
|
recurse: true
|
|
- path:
|
|
str_replace:
|
|
template: /etc/ceph/CLUSTER.client.USER.keyring
|
|
params:
|
|
CLUSTER: {get_param: CephClusterName}
|
|
USER: {get_param: CephClientUserName}
|
|
owner: nova:nova
|
|
perm: '0600'
|
|
docker_config:
|
|
step_4:
|
|
nova_compute:
|
|
image: &nova_compute_image {get_param: DockerNovaComputeImage}
|
|
ipc: host
|
|
net: host
|
|
privileged: true
|
|
user: nova
|
|
restart: always
|
|
healthcheck:
|
|
test: /openstack/healthcheck
|
|
volumes:
|
|
list_concat:
|
|
- {get_attr: [ContainersCommon, volumes]}
|
|
- {get_attr: [NovaLogging, volumes]}
|
|
- {get_param: NovaComputeOptVolumes}
|
|
-
|
|
- /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro
|
|
- /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
|
|
- /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
|
|
- /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
|
|
- /dev:/dev
|
|
- /lib/modules:/lib/modules:ro
|
|
- /run:/run
|
|
- /var/lib/nova:/var/lib/nova:shared
|
|
- /var/lib/libvirt:/var/lib/libvirt
|
|
- /sys/class/net:/sys/class/net
|
|
- /sys/bus/pci:/sys/bus/pci
|
|
environment:
|
|
list_concat:
|
|
- {get_param: NovaComputeOptEnvVars}
|
|
-
|
|
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
|
host_prep_tasks:
|
|
list_concat:
|
|
- {get_attr: [NovaLogging, host_prep_tasks]}
|
|
- - name: create persistent directories
|
|
file:
|
|
path: "{{ item }}"
|
|
state: directory
|
|
with_items:
|
|
- /var/lib/nova
|
|
- /var/lib/libvirt
|
|
- name: ensure ceph configurations exist
|
|
file:
|
|
path: /etc/ceph
|
|
state: directory
|
|
upgrade_tasks:
|
|
- name: Check if nova_compute is deployed
|
|
command: systemctl is-enabled --quiet openstack-nova-compute
|
|
tags: common
|
|
ignore_errors: True
|
|
register: nova_compute_enabled
|
|
- name: Set compute upgrade level to auto
|
|
when: step|int == 1
|
|
ini_file:
|
|
str_replace:
|
|
template: "dest=/etc/nova/nova.conf section=upgrade_levels option=compute value=LEVEL"
|
|
params:
|
|
LEVEL: {get_param: UpgradeLevelNovaCompute}
|
|
- name: "PreUpgrade step0,validation: Check service openstack-nova-compute is running"
|
|
command: systemctl is-active --quiet openstack-nova-compute
|
|
tags: validation
|
|
when:
|
|
- step|int == 0
|
|
- nova_compute_enabled.rc == 0
|
|
- name: Stop and disable nova-compute service
|
|
when:
|
|
- step|int == 2
|
|
- nova_compute_enabled.rc == 0
|
|
service: name=openstack-nova-compute state=stopped enabled=no
|
|
- name: Set fact for removal of openstack-nova-compute package
|
|
when: step|int == 2
|
|
set_fact:
|
|
remove_nova_compute_package: {get_param: UpgradeRemoveUnusedPackages}
|
|
- name: Remove openstack-nova-compute package if operator requests it
|
|
yum: name=openstack-nova-compute state=removed
|
|
ignore_errors: True
|
|
when:
|
|
- step|int == 2
|
|
- remove_nova_compute_package|bool
|
|
fast_forward_upgrade_tasks:
|
|
- name: Check if nova-compute is deployed
|
|
command: systemctl is-enabled --quiet openstack-nova-compute
|
|
ignore_errors: True
|
|
register: nova_compute_enabled_result
|
|
when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
- name: Set fact nova_compute_enabled
|
|
set_fact:
|
|
nova_compute_enabled: "{{ nova_compute_enabled_result.rc == 0 }}"
|
|
when:
|
|
- step|int == 0
|
|
- release == 'ocata'
|
|
- name: Stop and disable nova-compute service
|
|
service: name=openstack-nova-compute state=stopped
|
|
when:
|
|
- step|int == 1
|
|
- nova_compute_enabled|bool
|
|
- release == 'ocata'
|