Go back to installing files to SNAP_COMMON

The install 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: I6a7b60ad22739bca55a556d936731f37788f623e

snap/etc/keystone/keystone.conf

@@ -1,3 +1,3 @@
-# Snap distribution defaults - do not change, override in $SNAP_COMMON/etc/conf.d
+# Snap distribution defaults - do not change, override in $SNAP_COMMON/etc/keystone/conf.d
 [database]
 max_retries = -1

snap/snap-openstack.yaml

@@ -1,41 +1,40 @@
 setup:
-  install: classic
   dirs:
-    - "/etc/keystone"
+    - "{snap_common}/etc/keystone"
-    - "/etc/keystone/conf.d"
+    - "{snap_common}/etc/keystone/conf.d"
-    - "/etc/keystone/fernet-keys"
+    - "{snap_common}/etc/keystone/fernet-keys"
-    - "/etc/nginx/keystone/sites-enabled"
+    - "{snap_common}/etc/nginx"
-    - "/etc/uwsgi/keystone"
+    - "{snap_common}/etc/uwsgi"
-    - "/var/lib/keystone"
+    - "{snap_common}/lib"
-    - "/var/lib/nginx/keystone"
+    - "{snap_common}/lock"
-    - "/var/lock/keystone"
+    - "{snap_common}/log"
-    - "/var/log/keystone"
+    - "{snap_common}/run"
-    - "/var/log/uwsgi/keystone"
+    # NOTE(coreycb): Drop /var/*/nginx dirs once nginx is compiled from source.
-    - "/var/log/nginx/keystone"
+    # nginx hardcodes paths at compile time without override capability.
-    - "/var/run/keystone"
+    - "/var/lib/nginx"
-    - "/var/run/nginx/keystone"
+    - "/var/log/nginx"
   templates:
-    keystone-snap.conf.j2: "/etc/keystone/conf.d/keystone-snap.conf"
+    keystone-snap.conf.j2: "{snap_common}/etc/keystone/conf.d/keystone-snap.conf"
-    admin.ini.j2: "/etc/uwsgi/keystone/admin.ini"
+    admin.ini.j2: "{snap_common}/etc/uwsgi/admin.ini"
-    public.ini.j2: "/etc/uwsgi/keystone/public.ini"
+    public.ini.j2: "{snap_common}/etc/uwsgi/public.ini"
-    keystone-nginx.conf.j2: "/etc/nginx/keystone/sites-enabled/keystone.conf"
+    keystone-nginx.conf.j2: "{snap_common}/etc/nginx/sites-enabled/keystone.conf"
     # NOTE(coreycb): drop nginx.conf template when support lands for
     # dropping permissions to regular user.
-    nginx.conf.j2: "/etc/nginx/keystone/nginx.conf"
+    nginx.conf.j2: "{snap_common}/etc/nginx/nginx.conf"
   copyfiles:
-    "{snap}/etc/keystone": "/etc/keystone"
+    "{snap}/etc/keystone": "{snap_common}/etc/keystone"
-    "{snap}/etc/nginx/": "/etc/nginx/keystone"
+    "{snap}/etc/nginx": "{snap_common}/etc/nginx"
 entry_points:
   keystone-manage:
     binary: "{snap}/bin/keystone-manage"
     config-files:
-      - "/etc/keystone/keystone.conf"
+      - "{snap_common}/etc/keystone/keystone.conf"
     config-dirs:
-      - "/etc/keystone/conf.d"
+      - "{snap_common}/etc/keystone/conf.d"
   keystone-uwsgi:
     type: uwsgi
-    uwsgi-dir: "/etc/uwsgi/keystone"
+    uwsgi-dir: "{snap_common}/etc/uwsgi"
-    log-file: "/var/log/uwsgi/keystone/uwsgi.log"
+    log-file: "{snap_common}/log/uwsgi.log"
   keystone-nginx:
     type: nginx
-    config-file: "/etc/nginx/keystone/nginx.conf"
+    config-file: "{snap_common}/etc/nginx/nginx.conf"

snap/templates/admin.ini.j2

@@ -1,11 +1,11 @@
 [uwsgi]
 wsgi-file = {{ snap }}/bin/keystone-wsgi-admin
-uwsgi-socket = /var/run/keystone/admin.sock
+uwsgi-socket = {{ snap_common }}/run/admin.sock
 buffer-size = 65535
 master = true
 enable-threads = true
 processes = 4
 thunder-lock = true
 lazy-apps = true
-pyargv = --config-file=/etc/keystone/keystone.conf --config-dir=/etc/keystone/conf.d --log-file=/var/log/keystone/keystone.log
+pyargv = --config-file={{ snap_common }}/etc/keystone/keystone.conf --config-dir={{ snap_common }}/etc/keystone/conf.d --log-file={{ snap_common }}/log/keystone.log
 home = {{ snap }}/usr

snap/templates/keystone-nginx.conf.j2

@@ -1,20 +1,20 @@
 server {
     listen 5000;
-    access_log /var/log/nginx/keystone/access.log;
+    access_log {{ snap_common }}/log/nginx-access.log;
-    error_log /var/log/nginx/keystone/error.log;
+    error_log {{ snap_common }}/log/nginx-error.log;
     location / {
         include uwsgi_params;
         uwsgi_param SCRIPT_NAME '';
-        uwsgi_pass unix:///var/run/keystone/admin.sock;
+        uwsgi_pass unix://{{ snap_common }}/run/admin.sock;
     }
 }
 server {
     listen 35357;
-    access_log /var/log/nginx/keystone/access.log;
+    access_log {{ snap_common }}/log/nginx-access.log;
-    error_log /var/log/nginx/keystone/error.log;
+    error_log {{ snap_common }}/log/nginx-error.log;
     location / {
         include uwsgi_params;
         uwsgi_param SCRIPT_NAME '';
-        uwsgi_pass unix:///var/run/keystone/public.sock;
+        uwsgi_pass unix://{{ snap_common }}/run/public.sock;
     }
 }

snap/templates/keystone-snap.conf.j2

@@ -1,11 +1,11 @@
 [DEFAULT]
 # Set state path to writable directory
-state_path = /var/lib/keystone
+state_path = {{ snap_common }}/lib
 
 [oslo_concurrency]
 # Oslo Concurrency lock path
-lock_path = /var/lock/keystone
+lock_path = {{ snap_common }}/lock
 
 [fernet_tokens]
 # Fernet key repository
-key_repository = /etc/keystone/fernet-keys
+key_repository = {{ snap_common }}/etc/fernet-keys

snap/templates/nginx.conf.j2

@@ -1,7 +1,7 @@
 user root;
 worker_processes auto;
-pid /var/run/nginx/keystone/nginx.pid;
+pid {{ snap_common }}/run/nginx.pid;
-include /etc/nginx/keystone/modules-enabled/*.conf;
+include {{ snap_common }}/etc/nginx/modules-enabled/*.conf;
 
 events {
         worker_connections 768;
@@ -19,7 +19,7 @@ http {
         keepalive_timeout 65;
         types_hash_max_size 2048;
 
-        include /etc/nginx/keystone/mime.types;
+        include {{ snap_common }}/etc/nginx/mime.types;
         default_type application/octet-stream;
 
         ##
@@ -33,8 +33,8 @@ http {
         # Logging Settings
         ##
 
-        access_log /var/log/nginx/keystone/access.log;
+        access_log {{ snap_common }}/log/nginx-access.log;
-        error_log /var/log/nginx/keystone/error.log;
+        error_log {{ snap_common }}/log/nginx-error.log;
 
         ##
         # Gzip Settings
@@ -43,6 +43,6 @@ http {
         gzip on;
         gzip_disable "msie6";
 
-        include /etc/nginx/keystone/conf.d/*.conf;
+        include {{ snap_common }}/etc/nginx/conf.d/*.conf;
-        include /etc/nginx/keystone/sites-enabled/*;
+        include {{ snap_common }}/etc/nginx/sites-enabled/*;
 }

snap/templates/public.ini.j2

@@ -1,11 +1,11 @@
 [uwsgi]
 wsgi-file = {{ snap }}/bin/keystone-wsgi-public
-uwsgi-socket = /var/run/keystone/public.sock
+uwsgi-socket = {{ snap_common }}/run/public.sock
 buffer-size = 65535
 master = true
 enable-threads = true
 processes = 4
 thunder-lock = true
 lazy-apps = true
-pyargv = --config-file=/etc/keystone/keystone.conf --config-dir=/etc/keystone/conf.d --log-file=/var/log/keystone/keystone.log
+pyargv = --config-file={{ snap_common }}/etc/keystone/keystone.conf --config-dir={{ snap_common }}/etc/keystone/conf.d --log-file={{ snap_common }}/log/keystone.log
 home = {{ snap }}/usr