x/snap-nova-hypervisor
Code Issues Proposed changes

Use full paths to binaries and set instances_path

Browse Source 
Change-Id: Iedcf8b72ab96120df24d59b5fe9a56955f3cd690
This commit is contained in:
Corey Bryant 2017-04-25 12:31:41 +00:00
parent 7529ca1b81
commit 8cdd348c85
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
snap/snap-openstack.yaml
View File

@ -16,21 +16,21 @@ setup:
"{snap}/etc/neutron": "{snap_common}/etc/neutron" "{snap}/etc/neutron": "{snap_common}/etc/neutron"
entry_points: entry_points:
nova-compute: nova-compute:
binary: nova-compute binary: "{snap}/bin/nova-compute"
config-files: config-files:
- "{snap_common}/etc/nova/nova.conf" - "{snap_common}/etc/nova/nova.conf"
config-dirs: config-dirs:
- "{snap_common}/etc/nova/conf.d" - "{snap_common}/etc/nova/conf.d"
log-file: "{snap_common}/log/nova-compute.log" log-file: "{snap_common}/log/nova-compute.log"
nova-api-metadata: nova-api-metadata:
binary: nova-api-metadata binary: "{snap}/bin/nova-api-metadata"
config-files: config-files:
- "{snap_common}/etc/nova/nova.conf" - "{snap_common}/etc/nova/nova.conf"
config-dirs: config-dirs:
- "{snap_common}/etc/nova/conf.d" - "{snap_common}/etc/nova/conf.d"
log-file: "{snap_common}/log/nova-api-metadata.log" log-file: "{snap_common}/log/nova-api-metadata.log"
neutron-openvswitch-agent: neutron-openvswitch-agent:
binary: neutron-openvswitch-agent binary: "{snap}/bin/neutron-openvswitch-agent"
config-files: config-files:
- "{snap_common}/etc/neutron/neutron.conf" - "{snap_common}/etc/neutron/neutron.conf"
- "{snap_common}/etc/neutron/plugins/ml2/openvswitch_agent.ini" - "{snap_common}/etc/neutron/plugins/ml2/openvswitch_agent.ini"
@ -38,19 +38,19 @@ entry_points:
- "{snap_common}/etc/neutron/conf.d" - "{snap_common}/etc/neutron/conf.d"
log-file: "{snap_common}/log/neutron-openvswitch-agent.log" log-file: "{snap_common}/log/neutron-openvswitch-agent.log"
neutron-ovs-cleanup: neutron-ovs-cleanup:
binary: neutron-ovs-cleanup binary: "{snap}/bin/neutron-ovs-cleanup"
config-files: config-files:
- "{snap_common}/etc/neutron/neutron.conf" - "{snap_common}/etc/neutron/neutron.conf"
config-dirs: config-dirs:
- "{snap_common}/etc/neutron/conf.d" - "{snap_common}/etc/neutron/conf.d"
neutron-netns-cleanup: neutron-netns-cleanup:
binary: neutron-netns-cleanup binary: "{snap}/bin/neutron-netns-cleanup"
config-files: config-files:
- "{snap_common}/etc/neutron/neutron.conf" - "{snap_common}/etc/neutron/neutron.conf"
config-dirs: config-dirs:
- "{snap_common}/etc/neutron/conf.d" - "{snap_common}/etc/neutron/conf.d"
neutron-l3-agent: neutron-l3-agent:
binary: neutron-l3-agent binary: "{snap}/bin/neutron-l3-agent"
config-files: config-files:
- "{snap_common}/etc/neutron/neutron.conf" - "{snap_common}/etc/neutron/neutron.conf"
- "{snap_common}/etc/neutron/l3_agent.ini" - "{snap_common}/etc/neutron/l3_agent.ini"
@ -58,7 +58,7 @@ entry_points:
- "{snap_common}/etc/neutron/conf.d" - "{snap_common}/etc/neutron/conf.d"
log-file: "{snap_common}/log/neutron-l3-agent.log" log-file: "{snap_common}/log/neutron-l3-agent.log"
neutron-dhcp-agent: neutron-dhcp-agent:
binary: neutron-dhcp-agent binary: "{snap}/bin/neutron-dhcp-agent"
config-files: config-files:
- "{snap_common}/etc/neutron/neutron.conf" - "{snap_common}/etc/neutron/neutron.conf"
- "{snap_common}/etc/neutron/dhcp_agent.ini" - "{snap_common}/etc/neutron/dhcp_agent.ini"
@ -66,7 +66,7 @@ entry_points:
- "{snap_common}/etc/neutron/conf.d" - "{snap_common}/etc/neutron/conf.d"
log-file: "{snap_common}/log/neutron-dhcp-agent.log" log-file: "{snap_common}/log/neutron-dhcp-agent.log"
neutron-metadata-agent: neutron-metadata-agent:
binary: neutron-metadata-agent binary: "{snap}/bin/neutron-metadata-agent"
config-files: config-files:
- "{snap_common}/etc/neutron/neutron.conf" - "{snap_common}/etc/neutron/neutron.conf"
- "{snap_common}/etc/neutron/metadata_agent.ini" - "{snap_common}/etc/neutron/metadata_agent.ini"

3
snap/templates/nova-snap.conf.j2
View File

@ -2,6 +2,9 @@
# Set state path to writable directory # Set state path to writable directory
state_path = {{ snap_common }}/lib state_path = {{ snap_common }}/lib
# Where instances are stored on the hypervisor’s disk
instances_path = {{ snap_common }}/instances
[oslo_concurrency] [oslo_concurrency]
# Oslo Concurrency lock path # Oslo Concurrency lock path
lock_path = {{ snap_common }}/lock lock_path = {{ snap_common }}/lock