openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Switch defaults/tests to use master branch

Browse Source 
Change-Id: Ibc5da056be0ccd8e24670180d4999585fc29da57
This commit is contained in:
Jesse Pretorius 2016-04-03 13:48:39 +01:00
parent bce76ec69e
commit 3bc4de9a54
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
defaults/main.yml
View File

@ -24,19 +24,19 @@ verbose: True
cache_timeout: 600 cache_timeout: 600
neutron_git_repo: https://git.openstack.org/openstack/neutron neutron_git_repo: https://git.openstack.org/openstack/neutron
neutron_git_install_branch: stable/mitaka neutron_git_install_branch: master
neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
neutron_fwaas_git_install_branch: stable/mitaka neutron_fwaas_git_install_branch: master
neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
neutron_lbaas_git_install_branch: stable/mitaka neutron_lbaas_git_install_branch: master
neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
neutron_vpnaas_git_install_branch: stable/mitaka neutron_vpnaas_git_install_branch: master
neutron_requirements_git_repo: https://git.openstack.org/openstack/requirements neutron_requirements_git_repo: https://git.openstack.org/openstack/requirements
neutron_requirements_git_install_branch: stable/mitaka neutron_requirements_git_install_branch: master
neutron_developer_mode: false neutron_developer_mode: false
neutron_developer_constraints: neutron_developer_constraints:

8
tests/test-vars.yml
View File

@ -11,14 +11,14 @@ keystone_container_mysql_password: SuperSecrete
keystone_developer_mode: true keystone_developer_mode: true
keystone_galera_address: 10.100.100.2 keystone_galera_address: 10.100.100.2
keystone_galera_database: keystone keystone_galera_database: keystone
keystone_git_install_branch: stable/mitaka keystone_git_install_branch: master
keystone_rabbitmq_password: secrete keystone_rabbitmq_password: secrete
keystone_rabbitmq_port: 5671 keystone_rabbitmq_port: 5671
keystone_rabbitmq_servers: 10.100.100.2 keystone_rabbitmq_servers: 10.100.100.2
keystone_rabbitmq_use_ssl: false keystone_rabbitmq_use_ssl: false
keystone_rabbitmq_userid: keystone keystone_rabbitmq_userid: keystone
keystone_rabbitmq_vhost: /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: "http://{{ internal_lb_vip_address }}:35357"
keystone_service_adminuri_insecure: false keystone_service_adminuri_insecure: false
keystone_service_adminurl: "{{ keystone_service_adminuri }}/v3" keystone_service_adminurl: "{{ keystone_service_adminuri }}/v3"
@ -34,7 +34,7 @@ neutron_container_mysql_password: SuperSecrete
neutron_developer_mode: true neutron_developer_mode: true
neutron_galera_address: 10.100.100.2 neutron_galera_address: 10.100.100.2
neutron_galera_database: neutron neutron_galera_database: neutron
neutron_git_install_branch: stable/mitaka neutron_git_install_branch: master
neutron_ha_vrrp_auth_password: secrete neutron_ha_vrrp_auth_password: secrete
neutron_management_address: "{{ internal_lb_vip_address }}" neutron_management_address: "{{ internal_lb_vip_address }}"
neutron_provider_networks: neutron_provider_networks:
@ -43,7 +43,7 @@ neutron_provider_networks:
neutron_rabbitmq_password: secrete neutron_rabbitmq_password: secrete
neutron_rabbitmq_userid: neutron neutron_rabbitmq_userid: neutron
neutron_rabbitmq_vhost: /neutron neutron_rabbitmq_vhost: /neutron
neutron_requirements_git_install_branch: stable/mitaka neutron_requirements_git_install_branch: master
neutron_service_password: secrete neutron_service_password: secrete
neutron_venv_tag: testing neutron_venv_tag: testing
nova_keystone_auth_plugin: password nova_keystone_auth_plugin: password