From 9f6787c1f41f4d805761f274b3baa0febf25a2fc Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Tue, 20 Dec 2016 02:18:29 +0000
Subject: [PATCH] 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 | 3 +--
requirements.txt | 5 +----
snap/snap-openstack.yaml | 2 +-
snap/templates/admin.ini.j2 | 2 +-
snap/templates/public.ini.j2 | 2 +-
5 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/bindep.txt b/bindep.txt
index 55a90e5..5816a55 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,2 +1 @@
-libsodium-dev [platform:dpkg]
-libapt-pkg-dev [platform:dpkg]
+snapcraft [platform:dpkg]
diff --git a/requirements.txt b/requirements.txt
index 5f39202..4b00533 100644
--- a/requirements.txt
+++ b/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
diff --git a/snap/snap-openstack.yaml b/snap/snap-openstack.yaml
index be79c44..55cdf5f 100644
--- a/snap/snap-openstack.yaml
+++ b/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"
diff --git a/snap/templates/admin.ini.j2 b/snap/templates/admin.ini.j2
index 199e25d..24151e0 100644
--- a/snap/templates/admin.ini.j2
+++ b/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
diff --git a/snap/templates/public.ini.j2 b/snap/templates/public.ini.j2
index 90d6d14..b63a560 100644
--- a/snap/templates/public.ini.j2
+++ b/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