Change from kubernetes 0.11 to 0.15

This change introduces kubernetes 0.15 into the system.

Co-Authored-By: Andrew Melton <andrew.melton@rackspace.com>

Change-Id: Ia81910546a06a0663a96302aa81c901e144d463f
Partially-implements: blueprint python-k8scient
This commit is contained in:
Steven Dake 2015-04-23 19:21:35 -07:00
parent 5b11908528
commit 8345c27c5d
6 changed files with 10 additions and 10 deletions

View File

@ -8,7 +8,7 @@ Refer the quickstart guide for more information on using devstack and magnum.
Running devstack with magnum for the first time may take a long time as it
needs to download an atomic fedora 21 qcow image. If you already have this image
you can copy it to /opt/stack/devstack/files/fedora-21-atomic.qcow2 to save you
you can copy it to /opt/stack/devstack/files/fedora-21-atomic-3.qcow2 to save you
this time.
To install magnum into devstack, add the following settings to enable magnum plugin: ::

View File

@ -25,7 +25,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/magnum/fedora-21-atomic-2.qcow2"}
MANGUM_GUEST_IMAGE_URL=${MANGUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/magnum/fedora-21-atomic-3.qcow2"}
IMAGE_URLS+=",${MANGUM_GUEST_IMAGE_URL}"
fi

View File

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

View File

@ -152,7 +152,7 @@ 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-21-atomic-2 image will automatically be added to glance. You can
The fedora-21-atomic-3 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::
@ -171,7 +171,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-2 \
magnum baymodel-create --name testbaymodel --image-id fedora-21-atomic-3 \
--keypair-id testkey \
--external-network-id $NIC_ID \
--dns-nameserver 8.8.8.8 --flavor-id m1.small \
@ -279,7 +279,7 @@ Next, create a baymodel, it is very similar to the Kubernetes baymodel,
it is only missing some Kubernetes specific arguments.::
NIC_ID=$(neutron net-show public | awk '/ id /{print $4}')
magnum baymodel-create --name swarmbaymodel --image-id fedora-21-atomic-2 \
magnum baymodel-create --name swarmbaymodel --image-id fedora-21-atomic-3 \
--keypair-id testkey \
--external-network-id $NIC_ID \
--dns-nameserver 8.8.8.8 --flavor-id m1.small

View File

@ -39,7 +39,7 @@ your environment:
ssh_key_name: apmelton
external_network_id: 028d70dd-67b8-4901-8bdd-0c62b06cce2d
dns_nameserver: 192.168.200.1
server_image: fedora-21-atomic
server_image: fedora-21-atomic-3
discovery_url: token://d8cdfe5128af6e1075b34aa06ff1cc2c
And then create the stack, referencing that environment file:

View File

@ -40,7 +40,7 @@ popd
# First we test Magnum's command line to see if we can stand up
# a baymodel, bay and a pod
export NIC_ID=$(neutron net-show public | awk '/ id /{print $4}')
export IMAGE_ID=$(glance image-show fedora-21-atomic-2 | awk '/ id /{print $4}')
export IMAGE_ID=$(glance image-show fedora-21-atomic-3 | awk '/ id /{print $4}')
echo_summary "Running magnum-template-manage"
magnum-template-manage list-templates