Update repo for stable/ocata

There are no new tags for the 3rd party repositories, so for now we will
have to use master branch. This should be fixed once we can get tags
or branches created for these repositories.

Additionally, the mirror that is used by default in the upstream
ansible-kafka role is not currently working, we can overwrite this with
a var in the meta/main.yml file.

Change-Id: Ia7dfb8f87bd65ccc20564b31bad991b4136a9815

defaults/main.yml

@@ -62,32 +62,32 @@ monasca_bin: "/openstack/venvs/monasca-{{ monasca_venv_tag }}/bin"
 monasca_developer_mode: false
 
 monasca_api_git_repo: "https://git.openstack.org/openstack/monasca-api"
-monasca_api_git_install_branch: master
+monasca_api_git_install_branch: stable/ocata
 
 monasca_log_api_bind_port: 5607
 monasca_log_api_git_repo: "https://git.openstack.org/openstack/monasca-log-api"
-monasca_log_api_git_install_branch: master
+monasca_log_api_git_install_branch: stable/ocata
 
 monasca_ceilometer_git_repo: "https://git.openstack.org/openstack/monasca-ceilometer"
-monasca_ceilometer_git_install_branch: master
+monasca_ceilometer_git_install_branch: stable/ocata
 
 monasca_common_git_repo: "https://git.openstack.org/openstack/monasca-common"
-monasca_common_git_install_branch: master
+monasca_common_git_install_branch: stable/ocata
 
 monasca_thresh_git_repo: "https://git.openstack.org/openstack/monasca-thresh"
-monasca_thresh_git_install_branch: master
+monasca_thresh_git_install_branch: stable/ocata
 
 monasca_transform_git_repo: "https://git.openstack.org/openstack/monasca-transform"
 monasca_transform_git_install_branch: master
 
 monasca_notification_git_repo: "https://git.openstack.org/openstack/monasca-notification"
-monasca_notification_git_install_branch: master
+monasca_notification_git_install_branch: stable/ocata
 
 monasca_persister_git_repo: "https://git.openstack.org/openstack/monasca-persister"
-monasca_persister_git_install_branch: master
+monasca_persister_git_install_branch: stable/ocata
 
 monasca_python_client_git_repo: "https://git.openstack.org/openstack/python-monascaclient"
-monasca_python_client_git_install_branch: master
+monasca_python_client_git_install_branch: stable/ocata
 
 monasca_developer_constraints:
   - "git+{{ monasca_api_git_repo }}@{{ monasca_api_git_install_branch }}#egg=monasca-api"
@@ -164,3 +164,6 @@ monasca_persister_yml_overrides: {}
 # pip packages required by this role. The value is picked up
 # by the py_pkgs lookup.
 monasca_role_project_group: monasca_all
+
+# Specify Ansible-Kafka mirror for the ansible-kafka role
+monasca_ansible_kafka_mirror: http://mirror.ox.ac.uk/sites/rsync.apache.org

meta/main.yml

@@ -45,6 +45,7 @@ dependencies:
   - role: ansible-zookeeper
     tags: skip_ansible_lint
   - role: ansible-kafka
+    apache_mirror: "{{ monasca_ansible_kafka_mirror }}"
     tags: skip_ansible_lint
   - role: ansible-storm
     tags: skip_ansible_lint

tests/ansible-role-requirements.yml

@@ -1,59 +1,59 @@
 - name: apt_package_pinning
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: pip_install
   src: https://git.openstack.org/openstack/openstack-ansible-pip_install
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: memcached_server
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: openstack_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: lxc_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: lxc_container_create
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: memcached_server
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: galera_client
   src: https://git.openstack.org/openstack/openstack-ansible-galera_client
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: galera_server
   src: https://git.openstack.org/openstack/openstack-ansible-galera_server
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: rabbitmq_server
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: openstack_openrc
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: os_keystone
   src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: openstack_hosts
   src: https://github.com/openstack/openstack-ansible-openstack_hosts
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: os_tempest
   src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
   scm: git
-  version: master
+  version: origin/stable/ocata
 - name: ansible-zookeeper
   src: https://github.com/Chillisystems/ansible-zookeeper
   scm: git
@@ -77,4 +77,4 @@
 - name: ansible-monasca-schema
   src: https://github.com/Chillisystems/ansible-monasca-schema
   scm: git
-  version: master
+  version: master