Added config files to snap.
This is part of a transition to storing the config files in the snap, rather than in snapstack. Also updated .gitignore to ignore emacs temp files and snapcraft cruft. Change-Id: Ic08196c14649ed27178453335935acc7ea990455
This commit is contained in:
parent
c3a469e00e
commit
6a11f694d4
9
.gitignore
vendored
9
.gitignore
vendored
@ -3,3 +3,12 @@ prime
|
|||||||
stage
|
stage
|
||||||
*.snap
|
*.snap
|
||||||
.tox
|
.tox
|
||||||
|
|
||||||
|
# Snapcraft
|
||||||
|
.snapcraft
|
||||||
|
__pycache__
|
||||||
|
.cache
|
||||||
|
|
||||||
|
# emacs
|
||||||
|
*~
|
||||||
|
\#*
|
||||||
|
3
tests/etc/neutron/metadata_agent.ini
Normal file
3
tests/etc/neutron/metadata_agent.ini
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[DEFAULT]
|
||||||
|
nova_metadata_ip = localhost
|
||||||
|
metadata_proxy_shared_secret = supersecret
|
10
tests/etc/neutron/plugins/ml2/openvswitch_agent.ini
Normal file
10
tests/etc/neutron/plugins/ml2/openvswitch_agent.ini
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
[securitygroup]
|
||||||
|
enable_security_group = True
|
||||||
|
firewall_driver = iptables_hybrid
|
||||||
|
|
||||||
|
[AGENT]
|
||||||
|
tunnel_types = geneve,vxlan,gre
|
||||||
|
|
||||||
|
[ovs]
|
||||||
|
local_ip = 127.0.0.1
|
||||||
|
bridge_mappings = physnet1:br-ex
|
@ -0,0 +1,2 @@
|
|||||||
|
[glance]
|
||||||
|
api_servers = http://localhost:9292
|
@ -0,0 +1,13 @@
|
|||||||
|
[DEFAULT]
|
||||||
|
auth_strategy = keystone
|
||||||
|
|
||||||
|
[keystone_authtoken]
|
||||||
|
auth_uri = http://localhost:5000
|
||||||
|
auth_url = http://localhost:35357
|
||||||
|
memcached_servers = localhost:11211
|
||||||
|
auth_type = password
|
||||||
|
project_domain_name = default
|
||||||
|
user_domain_name = default
|
||||||
|
project_name = service
|
||||||
|
username = nova
|
||||||
|
password = nova
|
17
tests/etc/snap-nova-hypervisor/nova/nova.conf.d/neutron.conf
Normal file
17
tests/etc/snap-nova-hypervisor/nova/nova.conf.d/neutron.conf
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
[DEFAULT]
|
||||||
|
use_neutron = True
|
||||||
|
firewall_driver = nova.virt.firewall.NoopFirewallDriver
|
||||||
|
|
||||||
|
[neutron]
|
||||||
|
url = http://localhost:9696
|
||||||
|
auth_url = http://localhost:35357
|
||||||
|
memcached_servers = localhost:11211
|
||||||
|
auth_type = password
|
||||||
|
project_domain_name = default
|
||||||
|
user_domain_name = default
|
||||||
|
region_name = RegionOne
|
||||||
|
project_name = service
|
||||||
|
username = neutron
|
||||||
|
password = neutron
|
||||||
|
service_metadata_proxy = True
|
||||||
|
metadata_proxy_shared_secret = supersecret
|
@ -0,0 +1,9 @@
|
|||||||
|
[placement]
|
||||||
|
os_region_name = RegionOne
|
||||||
|
project_domain_name = default
|
||||||
|
project_name = service
|
||||||
|
auth_type = password
|
||||||
|
user_domain_name = default
|
||||||
|
auth_url = http://localhost:35357
|
||||||
|
username = placement
|
||||||
|
password = placement
|
@ -0,0 +1,2 @@
|
|||||||
|
[DEFAULT]
|
||||||
|
transport_url = rabbit://openstack:rabbitmq@localhost
|
13
tests/nova-hypervisor_cleanup.sh
Executable file
13
tests/nova-hypervisor_cleanup.sh
Executable file
@ -0,0 +1,13 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -x
|
||||||
|
|
||||||
|
# Manually define aliases if snap isn't installed from snap store.
|
||||||
|
# Otherwise, snap store defines these aliases automatically.
|
||||||
|
snap aliases nova-hypervisor | grep neutron-ovs-cleanup || \
|
||||||
|
sudo snap alias nova-hypervisor.neutron-ovs-cleanup neutron-ovs-cleanup
|
||||||
|
snap aliases nova-hypervisor | grep neutron-netns-cleanup || \
|
||||||
|
sudo snap alias nova-hypervisor.neutron-netns-cleanup neutron-netns-cleanup
|
||||||
|
|
||||||
|
sudo neutron-ovs-cleanup
|
||||||
|
sudo neutron-netns-cleanup
|
Loading…
x
Reference in New Issue
Block a user