Skip to content

Commit

Permalink
Switch to using the monasca virtual env for the keystoneclient.
Browse files Browse the repository at this point in the history
  • Loading branch information
tkuhlman committed Apr 20, 2015
1 parent 0fe05ee commit 5239147
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Monasca Keystone
Performs some Keystone setup for Monasca

Performs some Keystone setup for Monasca.
The role requires python-keystoneclient and by default will use the version installed in the Monasca virtualenv.
This role adds one or more users/projects/roles to Keystone, as specified in keystone_users:

```
Expand Down
1 change: 1 addition & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ keystone_users:
role: monasca-agent
keystone_service_script: /usr/local/bin/create_monasca_service.py
monasca_api_url: http://localhost:8080/v2.0
monasca_virtualenv_dir: /opt/monasca
skip_install: False
4 changes: 2 additions & 2 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- name: Keystone User - Install dependencies
pip: name=python-keystoneclient state=present
pip: name=python-keystoneclient state=present virtualenv="{{monasca_virtualenv_dir}}"
when: not skip_install

# These tasks need a Keystone v2 endpoint
Expand All @@ -19,4 +19,4 @@
template: src=create_monasca_service.py.j2 dest={{ keystone_service_script }} mode=0700

- name: Keystone Service - Execute the script
command: python {{ keystone_service_script }}
command: "{{monasca_virtualenv_dir}}/bin/python {{ keystone_service_script }}"

0 comments on commit 5239147

Please sign in to comment.