From 0ff5b25d59a6e8d35344e18a321fb92527f019b6 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Fri, 6 Jan 2017 14:55:05 +0000
Subject: [PATCH] Misc updates

Drop nova-api-metadata; metadata services are best placed
on hypervisor or network nodes to ensure that failure domains
are as isolated as possible.

Add alias for nova-manage.

Change-Id: Ibbb73ed115d8d15e80f6eff5b05d8717cd4741aa
---
 snap/snap-openstack.yaml | 8 --------
 snapcraft.yaml           | 9 ++-------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/snap/snap-openstack.yaml b/snap/snap-openstack.yaml
index 1c368a9..7006123 100644
--- a/snap/snap-openstack.yaml
+++ b/snap/snap-openstack.yaml
@@ -16,14 +16,6 @@ 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/snapcraft.yaml b/snapcraft.yaml
index 43ab3b8..a4aad09 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -24,13 +24,6 @@ apps:
     plugs:
       - network
       - network-bind
-  metadata:
-    command: snap-openstack nova-api-metadata
-    daemon: simple
-    plugs:
-      - network
-      - network-bind
-      - firewall-control
   conductor:
     command: snap-openstack nova-conductor
     daemon: simple
@@ -53,6 +46,8 @@ apps:
     command: snap-openstack nova-manage
     plugs:
       - network
+    aliases:
+      - nova-manage
 parts:
   nova:
     plugin: python