Merge "Allow operators to customise Nova vendor info"

This commit is contained in:
Zuul 2018-12-05 10:35:04 +00:00 committed by Gerrit Code Review
commit daec9a177d
4 changed files with 40 additions and 1 deletions

View File

@ -287,6 +287,7 @@
or nova_conf.changed | bool
or policy_overwriting.changed | bool
or vcenter_ca_file | bool
or nova_compute_release_file | bool
or nova_compute_container.changed | bool
- name: Restart nova-compute-ironic container

View File

@ -178,6 +178,25 @@
notify:
- Restart nova-compute container
- name: Copying 'release' file for nova_compute
vars:
service: "{{ nova_services['nova-compute'] }}"
copy:
src: "{{ item }}"
dest: "{{ node_config_directory }}/nova-compute/release"
with_first_found:
- files:
- "{{ node_custom_config }}/nova_compute/{{ inventory_hostname }}/release"
- "{{ node_custom_config }}/nova_compute/release"
- "{{ node_custom_config }}/nova/release"
skip: true
register: nova_compute_release_file
when:
- inventory_hostname in groups[service.group]
- service.enabled | bool
notify:
- Restart nova-compute container
- name: Copying over existing policy file
become: true
vars:

View File

@ -24,7 +24,14 @@
"dest": "/etc/nova/vmware_ca",
"owner": "nova",
"perm": "0600"
}{% endif %}
}{% endif %},
{
"source": "{{ container_config_directory }}/release",
"dest": "/etc/nova/release",
"owner": "nova",
"perm": "0600",
"optional": true
}
],
"permissions": [
{

View File

@ -0,0 +1,12 @@
---
features:
- |
You can customise vendor info that is used through out Nova via the
'release' file. To do this place a file called 'release' in one of the
following locations:
/etc/kolla/config/nova/release
/etc/kolla/config/nova_compute/release
/etc/kolla/config/nova_compute/{{ inventory_hostname }}/release
An example of the file can be seen at
https://github.com/openstack/nova/blob/master/etc/nova/release.sample