Use master git branches
Update defaults, test vars, and test role dependencies to use the master branch of git repositories for consistency with other roles. Change-Id: I905b1fd7e76b45113554e031dcd3488bf618b6f1
This commit is contained in:
parent
45afc91aaf
commit
0492a82c10
@ -16,9 +16,9 @@ debug: False
|
||||
verbose: True
|
||||
|
||||
sahara_git_repo: https://git.openstack.org/openstack/sahara
|
||||
sahara_git_install_branch: stable/mitaka
|
||||
sahara_git_install_branch: master
|
||||
sahara_requirements_git_repo: https://git.openstack.org/openstack/requirements
|
||||
sahara_requirements_git_install_branch: stable/mitaka
|
||||
sahara_requirements_git_install_branch: master
|
||||
sahara_developer_mode: false
|
||||
sahara_developer_constraints:
|
||||
- "git+{{ sahara_git_repo }}@{{ sahara_git_install_branch }}#egg=sahara"
|
||||
|
@ -1,4 +1,4 @@
|
||||
## Sahara service
|
||||
sahara_git_repo: https://git.openstack.org/openstack/sahara
|
||||
sahara_git_install_branch: stable/mitaka
|
||||
sahara_git_install_branch: master
|
||||
sahara_git_dest: "/opt/sahara_{{ sahara_git_install_branch | replace('/', '_') }}"
|
||||
|
@ -1,55 +1,55 @@
|
||||
- name: apt_package_pinning
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
|
||||
scm: git
|
||||
version: origin/stable/mitaka
|
||||
version: master
|
||||
- name: pip_install
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-pip_install
|
||||
scm: git
|
||||
version: origin/stable/mitaka
|
||||
version: master
|
||||
- name: pip_lock_down
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-pip_lock_down
|
||||
scm: git
|
||||
version: origin/stable/mitaka
|
||||
version: master
|
||||
- name: memcached_server
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
|
||||
scm: git
|
||||
version: origin/stable/mitaka
|
||||
version: master
|
||||
- name: lxc_hosts
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
|
||||
scm: git
|
||||
version: origin/stable/mitaka
|
||||
version: master
|
||||
- name: lxc_container_create
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
|
||||
scm: git
|
||||
version: origin/stable/mitaka
|
||||
version: master
|
||||
- name: openstack_hosts
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
|
||||
scm: git
|
||||
version: origin/stable/mitaka
|
||||
version: master
|
||||
- name: galera_client
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-galera_client
|
||||
scm: git
|
||||
version: origin/stable/mitaka
|
||||
version: master
|
||||
- name: galera_server
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-galera_server
|
||||
scm: git
|
||||
version: origin/stable/mitaka
|
||||
version: master
|
||||
- name: rabbitmq_server
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
|
||||
scm: git
|
||||
version: origin/stable/mitaka
|
||||
version: master
|
||||
- name: os_keystone
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
|
||||
scm: git
|
||||
version: origin/stable/mitaka
|
||||
version: master
|
||||
- name: os_nova
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-os_nova
|
||||
scm: git
|
||||
version: origin/stable/mitaka
|
||||
version: master
|
||||
- name: openstack_openrc
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
|
||||
scm: git
|
||||
version: origin/stable/mitaka
|
||||
version: master
|
||||
- name: os_tempest
|
||||
src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
|
||||
scm: git
|
||||
|
@ -41,7 +41,7 @@ nova_container_mysql_password: "SuperSecrete"
|
||||
nova_developer_mode: true
|
||||
nova_galera_address: 10.100.100.2
|
||||
nova_galera_database: nova
|
||||
nova_git_install_branch: stable/mitaka
|
||||
nova_git_install_branch: master
|
||||
nova_keystone_auth_plugin: password
|
||||
nova_management_address: "10.100.100.3"
|
||||
nova_metadata_port: 8775
|
||||
@ -51,7 +51,7 @@ nova_novncproxy_vncserver_proxyclient_address: localhost
|
||||
nova_rabbitmq_password: "secrete"
|
||||
nova_rabbitmq_userid: nova
|
||||
nova_rabbitmq_vhost: /nova
|
||||
nova_requirements_git_install_branch: stable/mitaka
|
||||
nova_requirements_git_install_branch: master
|
||||
nova_service_adminurl: "http://{{ internal_lb_vip_address }}:8774"
|
||||
nova_service_password: "secrete"
|
||||
nova_service_project_domain_id: default
|
||||
@ -64,7 +64,7 @@ nova_venv_tag: "testing"
|
||||
nova_virt_type: qemu
|
||||
keystone_venv_tag: "testing"
|
||||
keystone_developer_mode: true
|
||||
keystone_git_install_branch: stable/mitaka
|
||||
keystone_git_install_branch: master
|
||||
keystone_service_password: "secrete"
|
||||
keystone_galera_address: 10.100.100.2
|
||||
keystone_galera_database: keystone
|
||||
@ -86,14 +86,14 @@ keystone_rabbitmq_password: "secrete"
|
||||
keystone_rabbitmq_use_ssl: false
|
||||
keystone_rabbitmq_port: 5672
|
||||
keystone_rabbitmq_servers: 10.100.100.2
|
||||
keystone_requirements_git_install_branch: stable/mitaka
|
||||
keystone_requirements_git_install_branch: master
|
||||
openrc_os_auth_url: "{{ keystone_service_internalurl }}"
|
||||
openrc_os_password: "{{ keystone_auth_admin_password }}"
|
||||
openrc_os_domain_name: "Default"
|
||||
sahara_venv_tag: "testing"
|
||||
sahara_developer_mode: true
|
||||
sahara_git_install_branch: stable/mitaka
|
||||
sahara_requirements_git_install_branch: stable/mitaka
|
||||
sahara_git_install_branch: master
|
||||
sahara_requirements_git_install_branch: master
|
||||
sahara_service_password: "secrete"
|
||||
sahara_galera_address: 10.100.100.2
|
||||
sahara_galera_database: sahara
|
||||
|
Loading…
x
Reference in New Issue
Block a user