openstack
/
magnum
Code Issues Proposed changes

Merge "Update name of ubuntu-mesos image"

This commit is contained in:
Jenkins 2016-09-22 13:32:25 +00:00 committed by Gerrit Code Review
parent caeb9e2e92 31d04e312d
commit a3a5817eeb
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/dev/quickstart.rst
View File

@ -639,10 +639,10 @@ pre-installed. To build and upload such image, please refer to
Alternatively, you can download and upload a pre-built image::
wget https://fedorapeople.org/groups/magnum/ubuntu-14.04.3-mesos-0.25.0.qcow2
wget https://fedorapeople.org/groups/magnum/ubuntu-mesos-latest.qcow2
glance image-create --name ubuntu-mesos --visibility public \
--disk-format=qcow2 --container-format=bare \
--os-distro=ubuntu --file=ubuntu-14.04.3-mesos-0.25.0.qcow2
--os-distro=ubuntu --file=ubuntu-mesos-latest.qcow2
Then, create a ClusterTemplate by using 'mesos' as the COE, with the rest of
arguments similar to the Kubernetes ClusterTemplate::

6
doc/source/userguide.rst
View File

@ -1121,7 +1121,7 @@ Image (image-id)
for the Mesos master and slave. The image binary is loaded in
Glance with the attribute 'os_distro = ubuntu'. You can download
the `ready-built image
<https://fedorapeople.org/groups/magnum/ubuntu-14.04.3-mesos-0.25.0.qcow2>`_,
<https://fedorapeople.org/groups/magnum/ubuntu-mesos-latest.qcow2>`_,
or you can create the image as described below in the `Building
Mesos image`_ section.
@ -2398,8 +2398,8 @@ Mesos on Ubuntu
This image is built manually using diskimagebuilder. The instructions are
provided in the section `Diskimage-builder`_.
The Fedora site hosts the current image `ubuntu-14.04.3-mesos-0.25.0.qcow2
<https://fedorapeople.org/groups/magnum/ubuntu-14.04.3-mesos-0.25.0.qcow2>`_.
The Fedora site hosts the current image `ubuntu-mesos-latest.qcow2
<https://fedorapeople.org/groups/magnum/ubuntu-mesos-latest.qcow2>`_.
+-------------+-----------+
| OS/software | version |

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

@ -28,7 +28,7 @@ if [ "${coe}${special}" != "k8s-ironic" ]; then
fi
if [ "$coe" = "mesos" ]; then
echo "MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-14.04.3-mesos-0.25.0.qcow2" >> $BASE/new/devstack/localrc
echo "MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-mesos-latest.qcow2" >> $BASE/new/devstack/localrc
elif [ "$coe" = "k8s-coreos" ]; then
echo "MAGNUM_GUEST_IMAGE_URL=http://beta.release.core-os.net/amd64-usr/current/coreos_production_openstack_image.img.bz2" >> $BASE/new/devstack/localrc
elif [ "${coe}${special}" = "k8s-ironic" ]; then

2
magnum/tests/contrib/post_test_hook.sh
View File

@ -30,7 +30,7 @@ function create_test_data {
coe=$1
special=$2
if [ $coe == 'mesos' ]; then
local image_name="ubuntu-14.04"
local image_name="ubuntu.*mesos"
local container_format="bare"
elif [ $coe == 'k8s-coreos' ]; then
local image_name="coreos"