openstack
/
magnum
Code Issues Proposed changes

Modify documentation to point to kubernetes-0.11 atomic image 

The current fedora atomic image uses kubernetes 0.6.0.  The latest
atomic image uses 0.11.0.  Unfortunately the Fedora community doesn't
release updates to atomic until a major release.

Change-Id: I6ab93469b7e57e1eeeb730189bcc63f1cd5da0bb
Closes-bug: #1434468
This commit is contained in:
Steven Dake 2015-03-22 16:47:55 -07:00
parent d8093029fb
commit d915e4e063
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/devstack/extras.d/70-magnum.sh
View File

@ -10,7 +10,7 @@ if is_service_enabled m-api m-cond; then
# add image to glance
if [[ "$ENABLED_SERVICES" =~ 'm-api' ]]; then
MANGUM_GUEST_IMAGE_URL=${MANGUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/heat/kolla/fedora-21-atomic.qcow2"}
MANGUM_GUEST_IMAGE_URL=${MANGUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/heat/kolla/fedora-21-atomic-2.qcow2"}
IMAGE_URLS+=",${MANGUM_GUEST_IMAGE_URL}"
fi

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

@ -93,11 +93,11 @@ Create a new shell, and source the devstack openrc script::
source ~/devstack/openrc admin admin
cd ~
wget https://fedorapeople.org/groups/heat/kolla/fedora-21-atomic.qcow2
glance image-create --name fedora-21-atomic \
wget https://fedorapeople.org/groups/heat/kolla/fedora-21-atomic-2.qcow2
glance image-create --name fedora-21-atomic-2 \
--is-public True \
--disk-format qcow2 \
--container-format bare < fedora-21-atomic.qcow2
--container-format bare < fedora-21-atomic-2.qcow2
test -f ~/.ssh/id_rsa.pub || ssh-keygen
nova keypair-add --pub-key ~/.ssh/id_rsa.pub testkey

6
doc/source/dev/dev-quickstart.rst
View File

@ -144,8 +144,8 @@ At this time, Magnum has only been tested with the Fedora Atomic micro-OS.
Magnum will likely work with other micro-OS platforms, but each one requires
individual support in the heat template.
The fedora-atomic-21 image will automatically be added to glance, you can still
add your own images to use manually through glance.
The fedora-21-atomic-2 image will automatically be added to glance. You can
still add your own images to use manually through glance.
Create a new shell, and source the devstack openrc script::
@ -163,7 +163,7 @@ First create a baymodel, which is similar in nature to a flavor. It informs
Magnum in which way to construct a bay.::
NIC_ID=$(neutron net-show public | awk '/ id /{print $4}')
magnum baymodel-create --name testbaymodel --image-id fedora-21-atomic \
magnum baymodel-create --name testbaymodel --image-id fedora-21-atomic-2 \
--keypair-id testkey \
--external-network-id $NIC_ID \
--dns-nameserver 8.8.8.8 --flavor-id m1.small \