Browse Source

Update docs to use the latest image link

In fedora people, we created a link to the latest image:
https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2.
Currently, this link is pointed to
https://fedorapeople.org/groups/magnum/fedora-23-atomic-20160405.qcow2.
It should be updated when a new image is uploaded. For now,
we need to update our docs to point to the new link.

Partial-Bug: #1573361
Change-Id: I8ff21a3372a929511351f5242568729d07b6e26b
changes/33/307633/5
Hua Wang 5 years ago
parent
commit
08b6018616
3 changed files with 16 additions and 29 deletions
  1. +2
    -15
      devstack/plugin.sh
  2. +4
    -4
      doc/source/dev/manual-devstack.rst
  3. +10
    -10
      doc/source/dev/quickstart.rst

+ 2
- 15
devstack/plugin.sh View File

@ -13,21 +13,8 @@ if is_service_enabled magnum-api magnum-cond; then
echo_summary "Installing magnum"
install_magnum
# add image to glance
if [[ "$ENABLED_SERVICES" =~ 'magnum-api' ]]; then
# TODO Add a "latest" link to fedora release process
# TODO(hongbin): Uncomment below when the mirror become stable
#ATOMIC_IMAGE_NAME=$( \
# wget -qO- \
# "https://download.fedoraproject.org/pub/alt/atomic/stable/Cloud-Images/x86_64/Images/" 2>&1 | \
# grep qcow2 | \
# sed 's/^.*>\(.*\)<.*$/\1/' | \
# head -n 1 )
#echo "Atomic Image: $ATOMIC_IMAGE_NAME"
#MAGNUM_GUEST_IMAGE_URL=${MAGNUM_GUEST_IMAGE_URL:-"https://download.fedoraproject.org/pub/alt/atomic/stable/Cloud-Images/x86_64/Images/$ATOMIC_IMAGE_NAME"}
MAGNUM_GUEST_IMAGE_URL=${MAGNUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/magnum/fedora-23-atomic-20160405.qcow2"}
IMAGE_URLS+=",${MAGNUM_GUEST_IMAGE_URL}"
fi
MAGNUM_GUEST_IMAGE_URL=${MAGNUM_GUEST_IMAGE_URL:-"https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2"}
IMAGE_URLS+=",${MAGNUM_GUEST_IMAGE_URL}"
LIBS_FROM_GIT="${LIBS_FROM_GIT},python-magnumclient"


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

@ -115,14 +115,14 @@ likely work with other micro-OS platforms, but each requires individual
support in the heat template.
Store the Fedora Atomic micro-OS in glance. Download the qcow2 Atomic image
from https://getfedora.org/cloud/download/atomic.html and then upload it to
glance::
from https://fedorapeople.org/groups/magnum/fedora-atomic-latest.qcow2 and
then upload it to glance::
glance image-create --name fedora-21-atomic-5 \
glance image-create --name fedora-atomic-latest \
--visibility public \
--disk-format qcow2 \
--os-distro fedora-atomic \
--container-format bare < fedora-atomic.qcow2
--container-format bare < fedora-atomic-latest.qcow2
Create a domain and domain admin for trust::


+ 10
- 10
doc/source/dev/quickstart.rst View File

@ -180,14 +180,14 @@ when installing devstack use::
glance -v image-list
+--------------------------------------+---------------------------------+-------------+------------------+-----------+--------+
| ID | Name | Disk Format | Container Format | Size | Status |
+--------------------------------------+---------------------------------+-------------+------------------+-----------+--------+
| 7f5b6a15-f2fd-4552-aec5-952c6f6d4bc7 | cirros-0.3.4-x86_64-uec | ami | ami | 25165824 | active |
| bd3c0f92-669a-4390-a97d-b3e0a2043362 | cirros-0.3.4-x86_64-uec-kernel | aki | aki | 4979632 | active |
| 843ce0f7-ae51-4db3-8e74-bcb860d06c55 | cirros-0.3.4-x86_64-uec-ramdisk | ari | ari | 3740163 | active |
| 02c312e3-2d30-43fd-ab2d-1d25622c0eaa | fedora-atomic | qcow2 | bare | 770179072 | active |
+--------------------------------------+---------------------------------+-------------+------------------+-----------+--------+
+--------------------------------------+---------------------------------+-------------+------------------+-----------+--------+----------------------------------+
| ID | Name | Disk_format | Container_format | Size | Status | Owner |
+--------------------------------------+---------------------------------+-------------+------------------+-----------+--------+----------------------------------+
| 090de3a2-2c0c-42d5-b5a3-cfcddd6d011b | cirros-0.3.4-x86_64-uec | ami | ami | 25165824 | active | f98b9727094d40c78b1ed40e3bc91e80 |
| 9501d296-f0aa-4c0e-bc24-2a680f8741f0 | cirros-0.3.4-x86_64-uec-kernel | aki | aki | 4979632 | active | f98b9727094d40c78b1ed40e3bc91e80 |
| 01478d1a-59e0-4f36-b69e-0eaf5821ee46 | cirros-0.3.4-x86_64-uec-ramdisk | ari | ari | 3740163 | active | f98b9727094d40c78b1ed40e3bc91e80 |
| f14d6ee3-9e53-4f22-ba42-44e95810c294 | fedora-atomic-latest | qcow2 | bare | 507928064 | active | f98b9727094d40c78b1ed40e3bc91e80 |
+--------------------------------------+---------------------------------+-------------+------------------+-----------+--------+----------------------------------+
To list the available commands and resources for magnum, use::
@ -218,7 +218,7 @@ The coe (Container Orchestration Engine) and keypair need to be specified
as well::
magnum baymodel-create --name k8sbaymodel \
--image-id fedora-atomic \
--image-id fedora-atomic-latest \
--keypair-id testkey \
--external-network-id public \
--dns-nameserver 8.8.8.8 \
@ -438,7 +438,7 @@ the absence of some Kubernetes-specific arguments and the use of 'swarm'
as the coe::
magnum baymodel-create --name swarmbaymodel \
--image-id fedora-atomic \
--image-id fedora-atomic-latest \
--keypair-id testkey \
--external-network-id public \
--dns-nameserver 8.8.8.8 \


Loading…
Cancel
Save