Skip to content

Commit 18c73b9

Browse files
vurmilbbezak
authored andcommitted
Fix missing vendordata.json file for nova-metadata
Closes-Bug: #2111328 Change-Id: I3b3b2c434b393dd268e129d2b2d90cca0d0d67d2 Signed-off-by: Piotr Milewski <[email protected]> (cherry picked from commit 10f7714)
1 parent 6a0a641 commit 18c73b9

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

ansible/roles/nova/tasks/config.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,21 @@
103103
- service | service_enabled_and_mapped_to_host
104104
- nova_wsgi_provider == "apache"
105105

106+
- name: Copying over vendordata file for nova services
107+
vars:
108+
service: "{{ nova_services[item] }}"
109+
copy:
110+
src: "{{ vendordata_file_path }}"
111+
dest: "{{ node_config_directory }}/{{ item }}/vendordata.json"
112+
mode: "0660"
113+
become: True
114+
when:
115+
- vendordata_file_path is defined
116+
- service | service_enabled_and_mapped_to_host
117+
loop:
118+
- "nova-metadata"
119+
- "nova-api"
120+
106121
- name: "Configure uWSGI for Nova"
107122
include_role:
108123
name: service-uwsgi-config
@@ -123,15 +138,3 @@
123138
loop:
124139
- { name: "nova-api", port: "{{ nova_api_listen_port }}" }
125140
- { name: "nova-metadata", port: "{{ nova_metadata_listen_port }}" }
126-
127-
- name: Copying over vendordata file
128-
vars:
129-
service: "{{ nova_services['nova-api'] }}"
130-
copy:
131-
src: "{{ vendordata_file_path }}"
132-
dest: "{{ node_config_directory }}/nova-api/vendordata.json"
133-
mode: "0660"
134-
become: True
135-
when:
136-
- vendordata_file_path is defined
137-
- service | service_enabled_and_mapped_to_host
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes an issue where vendordata.json, if defined,
5+
was not being copied to the nova-metadata directory.
6+
`LP#2111328 <https://launchpad.net/bugs/2111328>`__

0 commit comments

Comments
 (0)