Go back to installing files to SNAP_COMMON

The symlinks setup key is dropped, and SNAP_COMMON is used as the
root directory where setup dirs, templates, and copyfiles are
installed. This aligns better with how snaps should behave.

Change-Id: I9b18b703f3f00f5ac8db61253e8abfe024a51b50

snap/snap-openstack.yaml

@@ -1,51 +1,46 @@
 setup:
   dirs:
     - "{snap_common}/etc/nova/conf.d"
-    - "{snap_common}/lib/nova"
-    - "{snap_common}/log/nova"
-    - "{snap_common}/lock/nova"
-    - "{snap_common}/run/nova"
-  symlinks:
-    "{snap_common}/etc/nova": /etc/nova
-    "{snap_common}/lib/nova": /var/lib/nova
-    "{snap_common}/log/nova": /var/log/nova
-    "{snap_common}/lock/nova": /var/lock/nova
+    - "{snap_common}/lib"
+    - "{snap_common}/log"
+    - "{snap_common}/lock"
+    - "{snap_common}/run"
   templates:
     nova-snap.conf.j2: "{snap_common}/etc/nova/conf.d/nova-snap.conf"
   copyfiles:
     "{snap}/etc/nova": "{snap_common}/etc/nova"
 entry_points:
   nova-api-os-compute:
-    binary: nova-api-os-compute
+    binary: "{snap}/bin/nova-api-os-compute"
     config-files:
-      - "/etc/nova/nova.conf"
+      - "{snap_common}/etc/nova/nova.conf"
     config-dirs:
-      - "/etc/nova/conf.d"
-    log-file: "/var/log/nova/nova-api-os-compute.log"
+      - "{snap_common}/etc/nova/conf.d"
+    log-file: "{snap_common}/log/nova-api-os-compute.log"
   nova-conductor:
-    binary: nova-conductor
+    binary: "{snap}/bin/nova-conductor"
     config-files:
-      - "/etc/nova/nova.conf"
+      - "{snap_common}/etc/nova/nova.conf"
     config-dirs:
-      - "/etc/nova/conf.d"
-    log-file: "/var/log/nova/nova-conductor.log"
+      - "{snap_common}/etc/nova/conf.d"
+    log-file: "{snap_common}/log/nova-conductor.log"
   nova-scheduler:
-    binary: nova-scheduler
+    binary: "{snap}/bin/nova-scheduler"
     config-files:
-      - "/etc/nova/nova.conf"
+      - "{snap_common}/etc/nova/nova.conf"
     config-dirs:
-      - "/etc/nova/conf.d"
-    log-file: "/var/log/nova/nova-scheduler.log"
+      - "{snap_common}/etc/nova/conf.d"
+    log-file: "{snap_common}/log/nova-scheduler.log"
   nova-consoleauth:
-    binary: nova-consoleauth
+    binary: "{snap}/bin/nova-consoleauth"
     config-files:
-      - "/etc/nova/nova.conf"
+      - "{snap_common}/etc/nova/nova.conf"
     config-dirs:
-      - "/etc/nova/conf.d"
-    log-file: "/var/log/nova/nova-consoleauth.log"
+      - "{snap_common}/etc/nova/conf.d"
+    log-file: "{snap_common}/log/nova-consoleauth.log"
   nova-manage:
-    binary: nova-manage
+    binary: "{snap}/bin/nova-manage"
     config-files:
-      - "/etc/nova/nova.conf"
+      - "{snap_common}/etc/nova/nova.conf"
     config-dirs:
-      - "/etc/nova/conf.d"
+      - "{snap_common}/etc/nova/conf.d"

snap/templates/nova-snap.conf.j2

@@ -1,7 +1,7 @@
 [DEFAULT]
 # Set state path to writable directory
-state_path = /var/lib/nova
+state_path = {{ snap_common }}/lib
 
 [oslo_concurrency]
 # Oslo Concurrency lock path
-lock_path = /var/lock/nova
+lock_path = {{ snap_common }}/lock