openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Merge "Use upper-constraints file in developer mode"

Browse Source
This commit is contained in:
Jenkins 2016-03-14 20:02:27 +00:00 committed by Gerrit Code Review
commit 3f8ef3c97f
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -25,6 +25,8 @@ cache_timeout: 600
nova_git_repo: https://git.openstack.org/openstack/nova nova_git_repo: https://git.openstack.org/openstack/nova
nova_git_install_branch: master nova_git_install_branch: master
nova_requirements_git_repo: https://git.openstack.org/openstack/requirements
nova_requirements_git_install_branch: master
nova_developer_mode: false nova_developer_mode: false
nova_developer_constraints: nova_developer_constraints:
- "git+{{ nova_git_repo }}@{{ nova_git_install_branch }}#egg=nova" - "git+{{ nova_git_repo }}@{{ nova_git_install_branch }}#egg=nova"

21
tasks/nova_install.yml
View File

@ -56,15 +56,30 @@
- nova-install - nova-install
- nova-pip-packages - nova-pip-packages
- name: Set constraint file fact for developer mode - name: Clone requirements git repository
set_fact: git:
pip_install_options: "{{ pip_install_options|default('') }} --constraint /opt/developer-pip-constraints.txt" repo: "{{ nova_requirements_git_repo }}"
dest: "/opt/requirements"
clone: yes
update: yes
version: "{{ nova_requirements_git_install_branch }}"
when: when:
- nova_developer_mode | bool - nova_developer_mode | bool
tags: tags:
- nova-install - nova-install
- nova-pip-packages - nova-pip-packages
- name: Add constraints to pip_install_options fact for developer mode
set_fact:
pip_install_options: "{{ pip_install_options|default('') }} --constraint /opt/developer-pip-constraints.txt --constraint /opt/requirements/upper-constraints.txt"
when:
- nova_developer_mode | bool
- "'/opt/developer-pip-constraints.txt' not in pip_install_options|default('')"
- "'/opt/requirements/upper-constraints.txt' not in pip_install_options|default('')"
tags:
- nova-install
- nova-pip-packages
- name: Install requires pip packages - name: Install requires pip packages
pip: pip:
name: "{{ item }}" name: "{{ item }}"

2
tests/test.yml
View File

@ -201,6 +201,7 @@
keystone_venv_tag: "testing" keystone_venv_tag: "testing"
keystone_developer_mode: true keystone_developer_mode: true
keystone_git_install_branch: a55128044f763f5cfe2fdc57c738eaca97636448 keystone_git_install_branch: a55128044f763f5cfe2fdc57c738eaca97636448
keystone_requirements_git_install_branch: 332278d456e06870150835564342570ec9d5f5a0
keystone_auth_admin_token: "SuperSecreteTestToken" keystone_auth_admin_token: "SuperSecreteTestToken"
keystone_auth_admin_password: "SuperSecretePassword" keystone_auth_admin_password: "SuperSecretePassword"
keystone_service_password: "secrete" keystone_service_password: "secrete"
@ -296,6 +297,7 @@
nova_venv_tag: "testing" nova_venv_tag: "testing"
nova_developer_mode: true nova_developer_mode: true
nova_git_install_branch: deb1ee440923b0b292f3536a2f8bda672c03984a nova_git_install_branch: deb1ee440923b0b292f3536a2f8bda672c03984a
nova_requirements_git_install_branch: 332278d456e06870150835564342570ec9d5f5a0
nova_service_password: "secrete" nova_service_password: "secrete"
nova_container_mysql_password: "SuperSecrete" nova_container_mysql_password: "SuperSecrete"
nova_api_container_mysql_password: "SuperSecrete" nova_api_container_mysql_password: "SuperSecrete"