openstack
/
openstack-ansible-os_barbican
Code Issues Proposed changes

Use master git branches when testing 

In the test vars, change the barbican, keystone, and requirements git
install branches to master for consistency with other roles.

Change-Id: Id12f601334a4c696970f77daf50fb46931d71776
This commit is contained in:
Jimmy McCrory 2016-05-05 09:55:15 -07:00
parent e2e0d0d0c2
commit b39a432e04
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
other-requirements.txt
View File

@ -9,3 +9,7 @@
# is better to have this file empty, otherwise OpenStack-CI
# will fall back to installing its default packages which
# will potentially be detrimental to the tests executed.
# Requirements for Paramiko 2.0
libssl-dev
libffi-dev

8
tests/test-vars.yml
View File

@ -11,14 +11,14 @@ keystone_container_mysql_password: SuperSecrete
keystone_developer_mode: true
keystone_galera_address: 10.100.100.2
keystone_galera_database: keystone
keystone_git_install_branch: stable/mitaka
keystone_git_install_branch: master
keystone_rabbitmq_password: secrete
keystone_rabbitmq_port: 5671
keystone_rabbitmq_servers: 10.100.100.2
keystone_rabbitmq_use_ssl: false
keystone_rabbitmq_userid: keystone
keystone_rabbitmq_vhost: /keystone
keystone_requirements_git_install_branch: stable/mitaka
keystone_requirements_git_install_branch: master
keystone_service_adminuri: "http://{{ internal_lb_vip_address }}:35357"
keystone_service_adminuri_insecure: false
keystone_service_adminurl: "{{ keystone_service_adminuri }}/v3"
@ -34,11 +34,11 @@ barbican_galera_password: SuperSecrete
barbican_developer_mode: true
barbican_galera_address: 10.100.100.2
barbican_galera_database: barbican
barbican_git_install_branch: stable/mitaka
barbican_git_install_branch: master
barbican_rabbitmq_password: secrete
barbican_rabbitmq_userid: barbican
barbican_rabbitmq_vhost: /barbican
barbican_requirements_git_install_branch: stable/mitaka
barbican_requirements_git_install_branch: master
barbican_service_password: secrete
barbican_venv_tag: testing
openrc_os_auth_url: "http://127.0.0.1:5000/v3"