openstack
/
magnum
Code Issues Proposed changes

Merge "functional: bump atomic version to latest"

This commit is contained in:
Zuul 2018-12-12 00:06:08 +00:00 committed by Gerrit Code Review
parent 2784cbcd93 d16479709a
commit e52cfa7a3f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -13,7 +13,7 @@ if is_service_enabled magnum-api magnum-cond; then
echo_summary "Installing magnum" echo_summary "Installing magnum"
install_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}" IMAGE_URLS+=",${MAGNUM_GUEST_IMAGE_URL}"
LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient" LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient"

6
doc/source/contributor/quickstart.rst
View File

@ -220,7 +220,7 @@ when installing devstack use::
+--------------------------------------+------------------------------------+--------+ +--------------------------------------+------------------------------------+--------+
| ID | Name | Status | | 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 | | 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:: Fedora Atomic::
openstack coe cluster template create k8s-cluster-template \ 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 \ --keypair testkey \
--external-network public \ --external-network public \
--dns-nameserver 8.8.8.8 \ --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:: 'swarm' as the COE::
openstack coe cluster template create swarm-cluster-template \ 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 \ --keypair testkey \
--external-network public \ --external-network public \
--dns-nameserver 8.8.8.8 \ --dns-nameserver 8.8.8.8 \

4
doc/source/install/launch-instance.rst
View File

@ -116,7 +116,7 @@ and tested by the Magnum team.
.. code-block:: console .. 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 #. Register the image to the Image service setting the ``os_distro`` property
to ``fedora-atomic``: to ``fedora-atomic``:
@ -126,7 +126,7 @@ and tested by the Magnum team.
$ openstack image create \ $ openstack image create \
--disk-format=qcow2 \ --disk-format=qcow2 \
--container-format=bare \ --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' \ --property os_distro='fedora-atomic' \
fedora-atomic-latest fedora-atomic-latest
+------------------+------------------------------------------------------+ +------------------+------------------------------------------------------+

4
magnum/tests/contrib/gate_hook.sh
View File

@ -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_SPECS_DISK=10"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=5" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=5"
else 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_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-20180212.2.x86_64'" export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='Fedora-Atomic-27-20180419.0.x86_64'"
fi fi
# Enable magnum plugin in the last step # Enable magnum plugin in the last step