From 95aa652995ac2b07bfe34789caae3030496e44f7 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 20 Apr 2018 15:38:53 -0600 Subject: [PATCH] Switch default to queens Change-Id: Iac589425091493c1a22fa7fbf9f1af9e95294817 --- README.rst | 2 +- quickstart.sh | 2 +- roles/common/defaults/main.yml | 2 +- roles/libvirt/defaults/main.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index e9ca51f00..bd0f2c49f 100644 --- a/README.rst +++ b/README.rst @@ -85,7 +85,7 @@ run the quickstart playbook. Note, the quickstart playbook will delete the ``stack`` user on ``$VIRTHOST`` and recreate it. This script will output instructions at the end to access the deployed -undercloud. If a release name is not given, ``pike`` is used. +undercloud. If a release name is not given, ``queens`` is used. Deploying without instructions ------------------------------ diff --git a/quickstart.sh b/quickstart.sh index 4421b26c8..e3e7736ef 100755 --- a/quickstart.sh +++ b/quickstart.sh @@ -18,7 +18,7 @@ ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner : ${OPT_BOOTSTRAP:=0} : ${OPT_CLEAN:=0} : ${OPT_PLAYBOOK:=quickstart-extras.yml} -: ${OPT_RELEASE:=pike} +: ${OPT_RELEASE:=queens} : ${OPT_RETAIN_INVENTORY_FILE:=0} : ${OPT_SYSTEM_PACKAGES:=0} : ${OPT_TAGS:=$DEFAULT_OPT_TAGS} diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml index c4f1d57ac..a3bd66410 100644 --- a/roles/common/defaults/main.yml +++ b/roles/common/defaults/main.yml @@ -188,7 +188,7 @@ enable_vnc_console: true # # TODO(trown): It would be better to write a release into the image itself # and set this variable from there. -release: pike +release: queens # This option controls whether or not to use the repo setup for TripleO # development. Since this requires some other options to be funtional, diff --git a/roles/libvirt/defaults/main.yml b/roles/libvirt/defaults/main.yml index 9879eca1a..51edabf83 100644 --- a/roles/libvirt/defaults/main.yml +++ b/roles/libvirt/defaults/main.yml @@ -1,5 +1,5 @@ # Which image should we download? -release: pike +release: queens undercloud_image_url: http://artifacts.ci.centos.org/rdo/images/{{ release }}/delorean/consistent/stable/undercloud.qcow2 overcloud_image_url: http://artifacts.ci.centos.org/rdo/images/{{ release }}/delorean/consisten/stable/overcloud-full.tar ipa_image_url: http://artifacts.ci.centos.org/rdo/images/{{ release }}/delorean/consistent/stable/ironic-python-agent.tar