ceph-defaults: set ceph_stable_openstack_release_uca to queens

Liberty is no longer available in the UCA. The last available release there
is currently Queens.

Signed-off-by: Christian Berendt <berendt@betacloud-solutions.de>

diff --git a/docs/source/installation/methods.rst b/docs/source/installation/methods.rst
index bb54005d5a27da655bf68acd1c64194639a23200..682b6d0a0ee5e5883ac36551f94bca7aa0455a9d 100644 (file)
--- a/docs/source/installation/methods.rst
+++ b/docs/source/installation/methods.rst
@@ -41,7 +41,7 @@ UCA repository
 
 If ``ceph_repository`` is set to ``uca``, packages you will be by default installed from http://ubuntu-cloud.archive.canonical.com/ubuntu, this can be changed by tweaking ``ceph_stable_repo_uca``.
 You can also decide which OpenStack version the Ceph packages should come from by tweaking ``ceph_stable_openstack_release_uca``.
-For example, ``ceph_stable_openstack_release_uca: liberty``.
+For example, ``ceph_stable_openstack_release_uca: queens``.
 
 Dev repository
 ~~~~~~~~~~~~~~

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index e6f95f4fab108a57764e99ca2c8dba6cba0ce466..cb3cbc72d0175ddaf3e68df490b092d9f0b3ef04 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -213,7 +213,7 @@ dummy:
 #
 #
 #ceph_stable_repo_uca: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
-#ceph_stable_openstack_release_uca: liberty
+#ceph_stable_openstack_release_uca: queens
 #ceph_stable_release_uca: "{{ansible_lsb.codename}}-updates/{{ceph_stable_openstack_release_uca}}"
 
 # REPOSITORY: openSUSE OBS

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index cabb77279ee2e39dfbe1cf2f8076b583d7e37210..64dda884581c2f49e1c6ff2ece1a22af611da99e 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -213,7 +213,7 @@ ceph_rhcs_version: 3
 #
 #
 #ceph_stable_repo_uca: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
-#ceph_stable_openstack_release_uca: liberty
+#ceph_stable_openstack_release_uca: queens
 #ceph_stable_release_uca: "{{ansible_lsb.codename}}-updates/{{ceph_stable_openstack_release_uca}}"
 
 # REPOSITORY: openSUSE OBS

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 511b2294b8bb37a220ddfdd39e63102d9bd85f2a..307328aa5cdb1ce1eb409a6a1fdd68b725734d14 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -205,7 +205,7 @@ ceph_rhcs_cdn_debian_repo_version: "/3-release/" # for GA, later for updates use
 #
 #
 #ceph_stable_repo_uca: "http://ubuntu-cloud.archive.canonical.com/ubuntu"
-#ceph_stable_openstack_release_uca: liberty
+#ceph_stable_openstack_release_uca: queens
 #ceph_stable_release_uca: "{{ansible_lsb.codename}}-updates/{{ceph_stable_openstack_release_uca}}"
 
 # REPOSITORY: openSUSE OBS