From 4be25a11a51f54ff7594214a2102020291c75443 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Tue, 29 Nov 2016 14:53:15 +0000
Subject: [PATCH] Add nova-api-metadata agent for local access for
 neutron-metadata-agent

---
 snap/etc/neutron/plugins/ml2/openvswitch_agent.ini |  3 +++
 snap/snap-openstack.yaml                           |  8 ++++++++
 snapcraft.yaml                                     | 14 +++++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/snap/etc/neutron/plugins/ml2/openvswitch_agent.ini b/snap/etc/neutron/plugins/ml2/openvswitch_agent.ini
index 3ee456b..aa86beb 100644
--- a/snap/etc/neutron/plugins/ml2/openvswitch_agent.ini
+++ b/snap/etc/neutron/plugins/ml2/openvswitch_agent.ini
@@ -1 +1,4 @@
 # Snap provided defaults for neutron-openvswitch-agent
+[securitygroup]
+enable_security_group = True
+firewall_driver = neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
diff --git a/snap/snap-openstack.yaml b/snap/snap-openstack.yaml
index 713f9bb..6b105a1 100644
--- a/snap/snap-openstack.yaml
+++ b/snap/snap-openstack.yaml
@@ -20,6 +20,14 @@ entry_points:
     config-dirs:
       - "{snap_common}/etc/nova.conf.d"
     log-file: "{snap_common}/log/nova-compute.log"
+  nova-api-metadata:
+    binary: nova-api-metadata
+    config-files:
+      - "{snap}/etc/nova/nova.conf"
+      - "{snap_common}/etc/nova/nova.conf"
+    config-dirs:
+      - "{snap_common}/etc/nova.conf.d"
+    log-file: "{snap_common}/log/nova-api-metadata.log"
   neutron-openvswitch-agent:
     binary: neutron-openvswitch-agent
     config-files:
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 4982fe9..dfd2693 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -29,6 +29,13 @@ apps:
       - system-trace
       - libvirt
 #      - openvswitch
+  nova-api-metadata:
+    command: snap-openstack nova-api-metadata
+    daemon: simple
+    plugs:
+      - network
+      - network-bind
+      - firewall-control
   neutron-openvswitch-agent:
     command: snap-openstack neutron-openvswitch-agent
     daemon: simple
@@ -68,7 +75,6 @@ apps:
     plugs:
       - network
       - network-bind
-      - network-control
   neutron-ovs-cleanup:
     command: snap-openstack neutron-ovs-cleanup
     plugs:
@@ -81,6 +87,12 @@ apps:
       - network
       - network-control
 parts:
+  ipset:
+    source: http://ipset.netfilter.org/ipset-6.30.tar.bz2
+    plugin: autotools
+    build-packages:
+      - libltdl-dev
+      - libmnl-dev
   dnsmasq:
     source: http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.76.tar.xz
     plugin: make