Skip to content

Commit

Permalink
Added vendor_data.json support
Browse files Browse the repository at this point in the history
This patch adds the ability for a deployer to add vendor_data.json
for deployments.  It can make things configurable via a simple
dictionary.

Change-Id: If5b061776120c3d7a7ff763eb2757c0b5b184000
(cherry picked from commit b8220a2)
  • Loading branch information
mnaser committed Mar 9, 2018
1 parent c11f823 commit bd3204e
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ nova_nova_conf_overrides: {}
nova_rootwrap_conf_overrides: {}
nova_api_paste_ini_overrides: {}
nova_policy_overrides: {}
nova_vendor_data_overrides: {}
nova_placement_uwsgi_ini_overrides: {}
nova_api_metadata_uwsgi_ini_overrides: {}
nova_api_os_compute_uwsgi_ini_overrides: {}
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/added-vendor-data-c35cb7735b1ee9c7.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
features:
- Added the ability to configure vendor data for Nova in order to be able to
push things via the metadata service or config drive.
4 changes: 4 additions & 0 deletions tasks/nova_post_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
dest: "/etc/nova/api-paste.ini"
config_overrides: "{{ nova_api_paste_ini_overrides }}"
config_type: "ini"
- src: "vendor_data.json.j2"
dest: "/etc/nova/vendor_data.json"
config_overrides: "{{ nova_vendor_data_overrides }}"
config_type: "json"
- src: "policy.json.j2"
dest: "/etc/nova/policy.json-{{ nova_venv_tag }}"
config_overrides: "{{ nova_policy_overrides }}"
Expand Down
1 change: 1 addition & 0 deletions templates/nova.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ secure_proxy_ssl_header = {{ nova_secure_proxy_ssl_header }}
auth_strategy = keystone
enable_instance_password = {{ nova_enable_instance_password }}
use_forwarded_for = {{ nova_network_services[nova_network_type]['use_forwarded_for'] | bool }}
vendordata_jsonfile_path = /etc/nova/vendor_data.json

[scheduler]
max_attempts = {{ nova_scheduler_max_attempts }}
Expand Down
2 changes: 2 additions & 0 deletions templates/vendor_data.json.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}

0 comments on commit bd3204e

Please sign in to comment.