openstack/magnum
Code Issues Proposed changes

Merge "Update usage of glance client"

Browse Source
This commit is contained in:
Jenkins 2015-11-10 09:00:53 +00:00 committed by Gerrit Code Review
commit 820274f566
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/dev/dev-heat-mesos.rst
View File

@ -58,7 +58,7 @@ can be built and uploaded to glance as follows:
$ glance image-create --name ubuntu-mesos --visibility public \ $ glance image-create --name ubuntu-mesos --visibility public \
--disk-format=qcow2 --container-format=bare \ --disk-format=qcow2 --container-format=bare \
--property os_distro=ubuntu --file=ubuntu-mesos.qcow2 --os-distro=ubuntu --file=ubuntu-mesos.qcow2
Docker Docker
^^^^^^ ^^^^^^
@ -76,9 +76,9 @@ as ``/tmp/ubuntu-mesos.qcow2``
$ sudo docker run -v /tmp:/output --rm -ti --privileged magnum/mesos-builder $ sudo docker run -v /tmp:/output --rm -ti --privileged magnum/mesos-builder
... ...
Image file /output/ubuntu-mesos.qcow2 created... Image file /output/ubuntu-mesos.qcow2 created...
$ glance image-create --name ubuntu-mesos --is-public True \ $ glance image-create --name ubuntu-mesos --visibility public \
--disk-format=qcow2 --container-format=bare \ --disk-format=qcow2 --container-format=bare \
--property os_distro=ubuntu --file=/tmp/ubuntu-mesos.qcow2 --os-distro=ubuntu --file=/tmp/ubuntu-mesos.qcow2
Creating the stack Creating the stack
------------------ ------------------

4
doc/source/dev/dev-manual-devstack.rst
View File

@ -127,9 +127,9 @@ made Atomic images available at https://fedorapeople.org/groups/magnum)::
cd ~ cd ~
wget https://fedorapeople.org/groups/magnum/fedora-21-atomic-5.qcow2 wget https://fedorapeople.org/groups/magnum/fedora-21-atomic-5.qcow2
glance image-create --name fedora-21-atomic-5 \ glance image-create --name fedora-21-atomic-5 \
--is-public True \ --visibility public \
--disk-format qcow2 \ --disk-format qcow2 \
--property os_distro='fedora-atomic'\ --os-distro fedora-atomic \
--container-format bare < fedora-21-atomic-5.qcow2 --container-format bare < fedora-21-atomic-5.qcow2
Create a keypair for use with the baymodel:: Create a keypair for use with the baymodel::

6
magnum/templates/heat-kubernetes/elements/README.md
View File

@ -24,6 +24,6 @@ An example fedora based image and uploaded to glance with the following:
kubernetes \ kubernetes \
-o fedora-21-kubernetes.qcow2 -o fedora-21-kubernetes.qcow2
KERNEL_ID=`glance image-create --name fedora-k8s-kernel --is-public True --disk-format=aki --container-format=aki --file=fedora-21-kubernetes.vmlinuz | grep id | tr -d '| ' | cut --bytes=3-57` KERNEL_ID=`glance image-create --name fedora-k8s-kernel --visibility public --disk-format=aki --container-format=aki --file=fedora-21-kubernetes.vmlinuz | grep id | tr -d '| ' | cut --bytes=3-57`
RAMDISK_ID=`glance image-create --name fedora-k8s-ramdisk --is-public True --disk-format=ari --container-format=ari --file=fedora-21-kubernetes.initrd | grep id | tr -d '| ' | cut --bytes=3-57` RAMDISK_ID=`glance image-create --name fedora-k8s-ramdisk --visibility public --disk-format=ari --container-format=ari --file=fedora-21-kubernetes.initrd | grep id | tr -d '| ' | cut --bytes=3-57`
BASE_ID=`glance image-create --name fedora-k8s --is-public True --disk-format=qcow2 --container-format=bare --property kernel_id=$KERNEL_ID --property ramdisk_id=$RAMDISK_ID --file=fedora-21-kubernetes.qcow2 | grep -v kernel | grep -v ramdisk | grep id | tr -d '| ' | cut --bytes=3-57` BASE_ID=`glance image-create --name fedora-k8s --visibility public --disk-format=qcow2 --container-format=bare --property kernel_id=$KERNEL_ID --property ramdisk_id=$RAMDISK_ID --file=fedora-21-kubernetes.qcow2 | grep -v kernel | grep -v ramdisk | grep id | tr -d '| ' | cut --bytes=3-57`