 -  - galera_client
 +  - { role: 'galera_client', when: ansible_architecture != 'ppc64le' }
    - openstack_openrc
-diff -Naur '--exclude=.galaxy_install_info' a/etc/ansible/roles/os_nova/tasks/nova_virt_detect.yml b/etc/ansible/roles/os_nova/tasks/nova_virt_detect.yml
---- a/etc/ansible/roles/os_nova/tasks/nova_virt_detect.yml	2016-06-07 05:15:52.051288402 -0400
-+++ b/etc/ansible/roles/os_nova/tasks/nova_virt_detect.yml	2016-06-07 05:14:35.407434201 -0400
+diff -Naur '--exclude=.*' a/etc/ansible/roles/os_nova/tasks/nova_compute_kvm_install.yml b/etc/ansible/roles/os_nova/tasks/nova_compute_kvm_install.yml
+--- a/etc/ansible/roles/os_nova/tasks/nova_compute_kvm_install.yml	2016-06-10 03:53:19.283946903 -0500
++++ b/etc/ansible/roles/os_nova/tasks/nova_compute_kvm_install.yml	2016-06-10 03:43:06.827078565 -0500
+@@ -12,6 +12,25 @@
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
++- name: Add ubuntu cloud archive key package
++  apt:
++    pkg: ubuntu-cloud-keyring
++  when: nova_uca_enable
++  register: add_keys
++  tags:
++    - add-apt-keys
++
++- name: Add UCA repo(s)
++  apt_repository:
++    repo: "{{ uca_repo }}"
++    state: present
++  register: add_repo
++  when: nova_uca_enable
++  until: add_repo|success
++  retries: 5
++  delay: 2
++  tags:
++    - add-uca-repo
+ 
+ #TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
+ #when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
+@@ -27,7 +46,8 @@
+ - name: Update apt if needed
+   apt:
+     update_cache: yes
+-  when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
++  when: ("ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}" or
++        add_keys|changed or add_repo|changed)
+   tags:
+     - nova-apt-packages
+     - nova-compute-kvm-apt-packages
+diff -Naur '--exclude=.*' a/etc/ansible/roles/os_nova/tasks/nova_virt_detect.yml b/etc/ansible/roles/os_nova/tasks/nova_virt_detect.yml
+--- a/etc/ansible/roles/os_nova/tasks/nova_virt_detect.yml	2016-06-10 03:53:19.283946903 -0500
++++ b/etc/ansible/roles/os_nova/tasks/nova_virt_detect.yml	2016-06-10 03:43:06.827078565 -0500
 @@ -15,7 +15,7 @@
  
  - name: Get virt type value and store as var

   - python-libvirt
   - qemu
   - qemu-utils
diff -Naur '--exclude=.galaxy_install_info' a/etc/ansible/roles/os_nova/meta/main.yml b/etc/ansible/roles/os_nova/meta/main.yml
--- a/etc/ansible/roles/os_nova/meta/main.yml	2016-06-07 05:15:52.047288410 -0400
+++ b/etc/ansible/roles/os_nova/meta/main.yml	2016-06-07 05:19:29.310841609 -0400
@@ -37,5 +37,5 @@
     when:
       - nova_developer_mode | bool

diff -Naur '--exclude=.*' a/etc/ansible/roles/os_nova/defaults/main.yml b/etc/ansible/roles/os_nova/defaults/main.yml
--- a/etc/ansible/roles/os_nova/defaults/main.yml	2016-06-10 03:53:19.283946903 -0500
+++ b/etc/ansible/roles/os_nova/defaults/main.yml	2016-06-10 04:24:32.933894137 -0500
@@ -364,7 +364,7 @@
   - kpartx
   - libvirt-bin
   - open-iscsi
