Move UCA repo URL var to role defaults

In order to expose the var in role documentation and to allow the use
of dynamically set facts to override the value in CI environments the
variable is moved from the role vars to the role defaults.

The uca_openstack_release var is also changed for Ubuntu 16.04 to
'newton' in order to match the current cycle appropriately. A note is
added to the Ubuntu 14.04 vars to make it clear that there will never
be a Newton UCA release for Trusty.

A small correction to the task description which sets the URL for the
AIO build in OpenStack-CI is also made to be more accurate.

Change-Id: I35b8e99e6e3f127ca507907d6480542b91a4107d
This commit is contained in:
Jesse Pretorius 2016-07-16 20:24:38 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 4d01d409f6
commit 045cfe56e1
3 changed files with 14 additions and 5 deletions

View File

@ -38,9 +38,12 @@
# unlike the other options does not attempt to manage package keys or add additional
# package repositories.
ceph_pkg_source: ceph
ceph_apt_pinned_packages: [{ package: "*", release: Inktank, priority: 1001 }]
# Ubuntu Cloud Archive mirror URL
# This is only used if 'uca' is the selected option for ceph_pkg_source
uca_apt_repo_url: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
# Ceph Authentication
cephx: true
@ -63,19 +66,26 @@ ceph_mons: []
glance_ceph_client: glance
cinder_ceph_client: cinder
cinder_backup_ceph_client: cinder-backup
# by default we assume you use rbd for both cinder and nova, and as libvirt
# needs to access both volumes (cinder) as boot disks (nova) we default to
# reuse the cinder_ceph_client
# only need to change this if you'd use ceph for boot disks and not for volumes
nova_ceph_client: '{{ cinder_ceph_client }}'
# overruled in user_secrets:
# TODO(odyssey4me) - the uuid should be removed, there should be no defaults for secrets
nova_ceph_client_uuid: 457eb676-33da-42ec-9a8c-9293d545c337
cephkeys_access_group: cephkeys
openstack_service_system_user: null
ceph_cinder_service_names:
- cinder-volume
- cinder-backup
ceph_nova_service_names:
- nova-compute
ceph_glance_service_names:
- glance-api

View File

@ -35,8 +35,9 @@ ceph_stable_release: hammer
ceph_apt_repo_url: "http://{{ ceph_apt_repo_url_region }}.ceph.com/debian-{{ ceph_stable_release }}/"
# Ubuntu Cloud Archive variables
# There are no UCA packages for Trusty beyond Mitaka, so the selected
# release here has to remain at Mitaka.
uca_openstack_release: mitaka
uca_apt_repo_url: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
# Apt repositories

View File

@ -35,9 +35,7 @@ ceph_stable_release: hammer
ceph_apt_repo_url: "http://{{ ceph_apt_repo_url_region }}.ceph.com/debian-{{ ceph_stable_release }}/"
# Ubuntu Cloud Archive variables
# TODO(smatzek) Revisit the default uca release for 16.04 at newton-1
uca_openstack_release: mitaka
uca_apt_repo_url: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
uca_openstack_release: newton
uca_repo_dist: "{{ ansible_lsb.codename }}-updates/{{ uca_openstack_release }}"
# Apt repositories