Skip to content

Commit 5cdcb93

Browse files
committed
Fix Keystone after their migration from WSGI scripts
Change-Id: I689d404c123dc1f00cba2f8c8b4b9d55b7b4a75a
1 parent b4d738f commit 5cdcb93

File tree

3 files changed

+7
-18
lines changed

3 files changed

+7
-18
lines changed

playbooks/roles/bifrost-keystone-install/tasks/bootstrap.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
--network-interface argument to "bifrost-cli install".
2323
when: ('ansible_' + ans_network_interface) not in hostvars[inventory_hostname]
2424

25-
- name: "Get keystone-wsgi-public location"
26-
shell: echo $(dirname $(which keystone-wsgi-public))
27-
register: keystone_install_prefix
28-
environment: "{{ bifrost_venv_env }}"
29-
3025
# NOTE(sean-k-mooney) only the MySQL db is started during bootstrapping.
3126
# all other services are started in the Start phase.
3227
- name: "Start database service"
@@ -195,18 +190,6 @@
195190
group: "{{ nginx_user }}" # TODO(TheJulia): Split webserver user/group.
196191
mode: "0755"
197192

198-
# Note(ashestakov): "copy" module in ansible doesn't support recursive
199-
# copying on remote host. "cp" command used instead.
200-
- name: "Copy keystone-wsgi-public to /var/www/keystone/public"
201-
command: cp -r "{{ keystone_install_prefix.stdout }}/keystone-wsgi-public" /var/www/keystone/public
202-
203-
- name: "Ensure owner and mode of keystone-wsgi-public"
204-
file:
205-
path: /var/www/keystone/public
206-
owner: "keystone"
207-
group: "{{ nginx_user }}"
208-
mode: "0754"
209-
210193
- name: "Bootstrap uWSGI"
211194
include_role:
212195
name: bifrost-uwsgi-install

playbooks/roles/bifrost-keystone-install/templates/uwsgi-keystone.ini.j2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# {{ ansible_managed }}
22
[uwsgi]
3+
module = keystone.wsgi.api:application
4+
plugins = python
5+
36
master = true
47
processes = 2
58
threads = 2
@@ -18,4 +21,3 @@ uid = keystone
1821
gid = {{ nginx_user }}
1922

2023
chdir = /var/www/keystone/
21-
wsgi-file = /var/www/keystone/public
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes Keystone start-up by providing the correct WSGI entry point.

0 commit comments

Comments
 (0)