From 55fdd62e0bc8952589cfe4e9d361c80f364ba4be Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Fri, 25 Nov 2016 09:02:44 +0000
Subject: [PATCH] Add metadata daemon, rename conf->snap

---
 {conf => snap}/etc/nova/nova.conf          | 0
 {conf => snap}/etc/nova/policy.yaml        | 0
 {conf => snap}/snap-openstack.yaml         | 8 ++++++++
 {conf => snap}/templates/nova-snap.conf.j2 | 0
 snapcraft.yaml                             | 8 +++++++-
 5 files changed, 15 insertions(+), 1 deletion(-)
 rename {conf => snap}/etc/nova/nova.conf (100%)
 rename {conf => snap}/etc/nova/policy.yaml (100%)
 rename {conf => snap}/snap-openstack.yaml (85%)
 rename {conf => snap}/templates/nova-snap.conf.j2 (100%)

diff --git a/conf/etc/nova/nova.conf b/snap/etc/nova/nova.conf
similarity index 100%
rename from conf/etc/nova/nova.conf
rename to snap/etc/nova/nova.conf
diff --git a/conf/etc/nova/policy.yaml b/snap/etc/nova/policy.yaml
similarity index 100%
rename from conf/etc/nova/policy.yaml
rename to snap/etc/nova/policy.yaml
diff --git a/conf/snap-openstack.yaml b/snap/snap-openstack.yaml
similarity index 85%
rename from conf/snap-openstack.yaml
rename to snap/snap-openstack.yaml
index 7006123..1c368a9 100644
--- a/conf/snap-openstack.yaml
+++ b/snap/snap-openstack.yaml
@@ -16,6 +16,14 @@ entry_points:
     config-dirs:
       - "{snap_common}/etc/nova.conf.d"
     log-file: "{snap_common}/log/nova-api-os-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"
   nova-conductor:
     binary: nova-conductor
     config-files:
diff --git a/conf/templates/nova-snap.conf.j2 b/snap/templates/nova-snap.conf.j2
similarity index 100%
rename from conf/templates/nova-snap.conf.j2
rename to snap/templates/nova-snap.conf.j2
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 3b2152e..7b04aec 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -24,6 +24,12 @@ apps:
     plugs:
       - network
       - network-bind
+  metadata:
+    command: snap-openstack nova-api-metadata
+    daemon: simple
+    plugs:
+      - network
+      - network-bind
   conductor:
     command: snap-openstack nova-conductor
     daemon: simple
@@ -67,7 +73,7 @@ parts:
     after:
       - nova
     plugin: dump
-    source: conf
+    source: snap
   config:
     after:
       - nova