diff --git a/playbooks/roles/bifrost-keystone-install/tasks/bootstrap.yml b/playbooks/roles/bifrost-keystone-install/tasks/bootstrap.yml index bf2def31..a19f838a 100644 --- a/playbooks/roles/bifrost-keystone-install/tasks/bootstrap.yml +++ b/playbooks/roles/bifrost-keystone-install/tasks/bootstrap.yml @@ -22,11 +22,6 @@ --network-interface argument to "bifrost-cli install". when: ('ansible_' + ans_network_interface) not in hostvars[inventory_hostname] -- name: "Get keystone-wsgi-public location" - shell: echo $(dirname $(which keystone-wsgi-public)) - register: keystone_install_prefix - environment: "{{ bifrost_venv_env }}" - # NOTE(sean-k-mooney) only the MySQL db is started during bootstrapping. # all other services are started in the Start phase. - name: "Start database service" @@ -195,18 +190,6 @@ group: "{{ nginx_user }}" # TODO(TheJulia): Split webserver user/group. mode: "0755" -# Note(ashestakov): "copy" module in ansible doesn't support recursive -# copying on remote host. "cp" command used instead. -- name: "Copy keystone-wsgi-public to /var/www/keystone/public" - command: cp -r "{{ keystone_install_prefix.stdout }}/keystone-wsgi-public" /var/www/keystone/public - -- name: "Ensure owner and mode of keystone-wsgi-public" - file: - path: /var/www/keystone/public - owner: "keystone" - group: "{{ nginx_user }}" - mode: "0754" - - name: "Bootstrap uWSGI" include_role: name: bifrost-uwsgi-install diff --git a/playbooks/roles/bifrost-keystone-install/templates/uwsgi-keystone.ini.j2 b/playbooks/roles/bifrost-keystone-install/templates/uwsgi-keystone.ini.j2 index fd24e878..ecad856a 100644 --- a/playbooks/roles/bifrost-keystone-install/templates/uwsgi-keystone.ini.j2 +++ b/playbooks/roles/bifrost-keystone-install/templates/uwsgi-keystone.ini.j2 @@ -1,5 +1,8 @@ # {{ ansible_managed }} [uwsgi] +module = keystone.wsgi.api:application +plugins = python + master = true processes = 2 threads = 2 @@ -18,4 +21,3 @@ uid = keystone gid = {{ nginx_user }} chdir = /var/www/keystone/ -wsgi-file = /var/www/keystone/public diff --git a/releasenotes/notes/keystone-uwsgi-fix-cd7e95d1f1fa8768.yaml b/releasenotes/notes/keystone-uwsgi-fix-cd7e95d1f1fa8768.yaml new file mode 100644 index 00000000..f2fe32f6 --- /dev/null +++ b/releasenotes/notes/keystone-uwsgi-fix-cd7e95d1f1fa8768.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Fixes Keystone start-up by providing the correct WSGI entry point.