x
/
snap-nova-hypervisor
Code Issues Proposed changes

Use both SNAP and SNAP_COMMON with --config-file 

Change-Id: I711d20faed1f0eaf92ad7d4977e35a080b0bed02
This commit is contained in:
Corey Bryant 2017-05-18 18:20:41 +00:00
parent 78c8c92b4b
commit 59790f6b59
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
snap/snap-openstack.yaml
View File

@ -18,9 +18,6 @@ setup:
templates:
nova-snap.conf.j2: "{snap_common}/etc/nova/conf.d/nova-snap.conf"
neutron-snap.conf.j2: "{snap_common}/etc/neutron/conf.d/neutron-snap.conf"
copyfiles:
"{snap}/etc/nova": "{snap_common}/etc/nova"
"{snap}/etc/neutron": "{snap_common}/etc/neutron"
rchown:
"{snap_common}/instances": "snap-nova-hypervisor:snap-nova-hypervisor"
"{snap_common}/lib": "snap-nova-hypervisor:snap-nova-hypervisor"
@ -31,6 +28,7 @@ entry_points:
nova-compute:
binary: "{snap}/bin/nova-compute"
config-files:
- "{snap}/etc/nova/nova.conf"
- "{snap_common}/etc/nova/nova.conf"
config-dirs:
- "{snap_common}/etc/nova/conf.d"
@ -40,6 +38,7 @@ entry_points:
nova-api-metadata:
binary: "{snap}/bin/nova-api-metadata"
config-files:
- "{snap}/etc/nova/nova.conf"
- "{snap_common}/etc/nova/nova.conf"
config-dirs:
- "{snap_common}/etc/nova/conf.d"
@ -49,6 +48,8 @@ entry_points:
neutron-openvswitch-agent:
binary: "{snap}/bin/neutron-openvswitch-agent"
config-files:
- "{snap}/etc/neutron/neutron.conf"
- "{snap}/etc/neutron/plugins/ml2/openvswitch_agent.ini"
- "{snap_common}/etc/neutron/neutron.conf"
- "{snap_common}/etc/neutron/plugins/ml2/openvswitch_agent.ini"
config-dirs:
@ -59,6 +60,7 @@ entry_points:
neutron-ovs-cleanup:
binary: "{snap}/bin/neutron-ovs-cleanup"
config-files:
- "{snap}/etc/neutron/neutron.conf"
- "{snap_common}/etc/neutron/neutron.conf"
config-dirs:
- "{snap_common}/etc/neutron/conf.d"
@ -67,6 +69,7 @@ entry_points:
neutron-netns-cleanup:
binary: "{snap}/bin/neutron-netns-cleanup"
config-files:
- "{snap}/etc/neutron/neutron.conf"
- "{snap_common}/etc/neutron/neutron.conf"
config-dirs:
- "{snap_common}/etc/neutron/conf.d"
@ -75,6 +78,8 @@ entry_points:
neutron-l3-agent:
binary: "{snap}/bin/neutron-l3-agent"
config-files:
- "{snap}/etc/neutron/neutron.conf"
- "{snap}/etc/neutron/l3_agent.ini"
- "{snap_common}/etc/neutron/neutron.conf"
- "{snap_common}/etc/neutron/l3_agent.ini"
config-dirs:
@ -85,6 +90,8 @@ entry_points:
neutron-dhcp-agent:
binary: "{snap}/bin/neutron-dhcp-agent"
config-files:
- "{snap}/etc/neutron/neutron.conf"
- "{snap}/etc/neutron/dhcp_agent.ini"
- "{snap_common}/etc/neutron/neutron.conf"
- "{snap_common}/etc/neutron/dhcp_agent.ini"
config-dirs:
@ -95,6 +102,8 @@ entry_points:
neutron-metadata-agent:
binary: "{snap}/bin/neutron-metadata-agent"
config-files:
- "{snap}/etc/neutron/neutron.conf"
- "{snap}/etc/neutron/metadata_agent.ini"
- "{snap_common}/etc/neutron/neutron.conf"
- "{snap_common}/etc/neutron/metadata_agent.ini"
config-dirs: