From 6fdac130d9bd0eda0d248afdce49470e43a50fd3 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Wed, 1 Aug 2018 19:17:21 +0100
Subject: [PATCH] Add Rocky UCA for bionic

Bionic now has UCA for Rocky, so we add it.

Change-Id: I7d852f9307232af3c38ec4fa0e6fd37b4b094b61
---
 defaults/main.yml     |  3 ++-
 vars/ubuntu-16.04.yml |  2 ++
 vars/ubuntu-18.04.yml | 14 ++++++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 166caf43..c37a7244 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -139,7 +139,8 @@ openstack_host_sysstat_cron_mode: '0755'
 openstack_hosts_centos_mirror_url: 'http://mirror.centos.org/centos'
 openstack_hosts_rdo_mirror_url: 'https://trunk.rdoproject.org'
 # Ubuntu cloud archive data
-uca_repo: "deb {{ uca_apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_lsb.codename }}-updates/queens main"
+uca_repo: "{{ _uca_repo }}"
+
 # Default opensuse mirrors URLs
 opensuse_mirror: "http://download.opensuse.org"
 opensuse_mirror_obs: "{{ opensuse_mirror }}"
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index 70602b46..90327f63 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -102,3 +102,5 @@ _package_repos:
   - repo: "{{ uca_repo }}"
     state: present
     filename: "uca"
+
+_uca_repo: "deb {{ uca_apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_lsb.codename }}-updates/queens main"
diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml
index 8a9ebbd0..3c092eec 100644
--- a/vars/ubuntu-18.04.yml
+++ b/vars/ubuntu-18.04.yml
@@ -93,8 +93,14 @@ _package_repos_keys: []
 #   url:
 #   state:
 
-# Bionic Rocky has no UCA
-_package_list: []
+_package_list:
+  - name: ubuntu-cloud-keyring
+    state: "{{ openstack_hosts_package_state }}"
 
-# Bionic Rocky has no UCA.
-_package_repos: []
+_package_repos:
+  # Implement the current UCA repo configuration
+  - repo: "{{ uca_repo }}"
+    state: present
+    filename: "uca"
+
+_uca_repo: "deb {{ uca_apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_lsb.codename }}-updates/rocky main"