Log file updates for keystone and uwsgi

Enable the uwsgi log file in snap-openstack.yaml and enable the keystone
log file in the uwsgi templates.

Update bindep and requirements to use snapcraft from packages until
fully installable from git source.

Change-Id: I6342254a5ebd322e430ea90df5f7ec2d29ae6704

bindep.txt

@@ -1,2 +1 @@
-libsodium-dev [platform:dpkg]
-libapt-pkg-dev [platform:dpkg]
+snapcraft [platform:dpkg]

requirements.txt

@@ -1,5 +1,2 @@
 # Requirements to build snap
-git+https://github.com/openstack-snaps/snapcraft@fixup-install-requires#egg_name=snapcraft
-# PyPi less dependencies
-https://launchpad.net/ubuntu/+archive/primary/+files/python-apt_1.1.0~beta1build1.tar.xz
-https://launchpad.net/python-distutils-extra/trunk/2.39/+download/python-distutils-extra-2.39.tar.gz
+# NOTE empty for now until snapcraft installable from branch

snap/snap-openstack.yaml

@@ -22,4 +22,4 @@ entry_points:
   keystone-api:
     type: uwsgi
     uwsgi-dir: "{snap_common}/etc/uwsgi"
-    log-file: "{snap_common}/log/keystone.log"
+    log-file: "{snap_common}/log/uwsgi.log"

snap/templates/admin.ini.j2

@@ -9,4 +9,4 @@ processes = 4
 thunder-lock = true
 plugins = python
 lazy-apps = true
-pyargv = --config-file={{ snap }}/etc/keystone/keystone.conf --config-dir={{ snap_common }}/etc/keystone.conf.d
+pyargv = --config-file={{ snap }}/etc/keystone/keystone.conf --config-dir={{ snap_common }}/etc/keystone.conf.d --log-file={{ snap_common }}/log/keystone.log

snap/templates/public.ini.j2

@@ -9,4 +9,4 @@ processes = 4
 thunder-lock = true
 plugins = python
 lazy-apps = true
-pyargv = --config-file={{ snap }}/etc/keystone/keystone.conf --config-dir={{ snap_common }}/etc/keystone.conf.d
+pyargv = --config-file={{ snap }}/etc/keystone/keystone.conf --config-dir={{ snap_common }}/etc/keystone.conf.d --log-file={{ snap_common }}/log/keystone.log