From d16479709a00adf8523b20b32a9dda1249b3a0f6 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Fri, 7 Dec 2018 22:33:17 -0500 Subject: [PATCH] functional: bump atomic version to latest This patch brings the Fedora Atomic version used in gating to the latest one which includes some improvements alongside a newer version of Docker (which seems to run things better overall). Change-Id: Iad0a1f57b29aec9a0cdb2a104fdaa5970133cfb4 --- devstack/plugin.sh | 2 +- doc/source/contributor/quickstart.rst | 6 +++--- doc/source/install/launch-instance.rst | 4 ++-- magnum/tests/contrib/gate_hook.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index d5322d3f3a..bfbd8d5176 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -13,7 +13,7 @@ if is_service_enabled magnum-api magnum-cond; then echo_summary "Installing magnum" install_magnum - MAGNUM_GUEST_IMAGE_URL=${MAGNUM_GUEST_IMAGE_URL:-"https://download.fedoraproject.org/pub/alt/atomic/stable/Fedora-Atomic-27-20180212.2/CloudImages/x86_64/images/Fedora-Atomic-27-20180212.2.x86_64.qcow2"} + MAGNUM_GUEST_IMAGE_URL=${MAGNUM_GUEST_IMAGE_URL:-"https://download.fedoraproject.org/pub/alt/atomic/stable/Fedora-Atomic-27-20180419.0/CloudImages/x86_64/images/Fedora-Atomic-27-20180419.0.x86_64.qcow2"} IMAGE_URLS+=",${MAGNUM_GUEST_IMAGE_URL}" LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient" diff --git a/doc/source/contributor/quickstart.rst b/doc/source/contributor/quickstart.rst index b2449bced3..76b9c8a817 100644 --- a/doc/source/contributor/quickstart.rst +++ b/doc/source/contributor/quickstart.rst @@ -220,7 +220,7 @@ when installing devstack use:: +--------------------------------------+------------------------------------+--------+ | ID | Name | Status | +--------------------------------------+------------------------------------+--------+ - | 0bc132b1-ee91-4bd8-b0fd-19deb57fb39f | Fedora-Atomic-27-20180212.2.x86_64 | active | + | 0bc132b1-ee91-4bd8-b0fd-19deb57fb39f | Fedora-Atomic-27-20180419.0.x86_64 | active | | 7537bbf2-f1c3-47da-97bb-38c09007e146 | cirros-0.3.5-x86_64-disk | active | +--------------------------------------+------------------------------------+--------+ @@ -265,7 +265,7 @@ Atomic image so the clusters which use this ClusterTemplate will be based on Fedora Atomic:: openstack coe cluster template create k8s-cluster-template \ - --image Fedora-Atomic-27-20180212.2.x86_64 \ + --image Fedora-Atomic-27-20180419.0.x86_64 \ --keypair testkey \ --external-network public \ --dns-nameserver 8.8.8.8 \ @@ -541,7 +541,7 @@ except for the absence of some Kubernetes-specific arguments and the use of 'swarm' as the COE:: openstack coe cluster template create swarm-cluster-template \ - --image Fedora-Atomic-27-20180212.2.x86_64 \ + --image Fedora-Atomic-27-20180419.0.x86_64 \ --keypair testkey \ --external-network public \ --dns-nameserver 8.8.8.8 \ diff --git a/doc/source/install/launch-instance.rst b/doc/source/install/launch-instance.rst index 07aba4d4e6..675313b51e 100644 --- a/doc/source/install/launch-instance.rst +++ b/doc/source/install/launch-instance.rst @@ -116,7 +116,7 @@ and tested by the Magnum team. .. code-block:: console - $ wget https://download.fedoraproject.org/pub/alt/atomic/stable/Fedora-Atomic-27-20180212.2/CloudImages/x86_64/images/Fedora-Atomic-27-20180212.2.x86_64.qcow2 + $ wget https://download.fedoraproject.org/pub/alt/atomic/stable/Fedora-Atomic-27-20180419.0/CloudImages/x86_64/images/Fedora-Atomic-27-20180419.0.x86_64.qcow2 #. Register the image to the Image service setting the ``os_distro`` property to ``fedora-atomic``: @@ -126,7 +126,7 @@ and tested by the Magnum team. $ openstack image create \ --disk-format=qcow2 \ --container-format=bare \ - --file=Fedora-Atomic-27-20180212.2.x86_64.qcow2\ + --file=Fedora-Atomic-27-20180419.0.x86_64.qcow2\ --property os_distro='fedora-atomic' \ fedora-atomic-latest +------------------+------------------------------------------------------+ diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh index 9fe5fba5e8..b4026959fb 100755 --- a/magnum/tests/contrib/gate_hook.sh +++ b/magnum/tests/contrib/gate_hook.sh @@ -88,8 +88,8 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_DISK=10" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=5" else - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='${NODEPOOL_ATOMIC_MIRROR}/atomic/stable/Fedora-Atomic-27-20180212.2/CloudImages/x86_64/images/Fedora-Atomic-27-20180212.2.x86_64.qcow2'" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='Fedora-Atomic-27-20180212.2.x86_64'" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='${NODEPOOL_ATOMIC_MIRROR}/atomic/stable/Fedora-Atomic-27-20180419.0/CloudImages/x86_64/images/Fedora-Atomic-27-20180419.0.x86_64.qcow2'" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='Fedora-Atomic-27-20180419.0.x86_64'" fi # Enable magnum plugin in the last step