From 158217ba7b30709df42d2cfc345377aaad3a78a9 Mon Sep 17 00:00:00 2001 From: Manjeet Singh Bhatia Date: Tue, 8 Sep 2015 08:53:27 -0400 Subject: [PATCH] Docs update for new fedora atomic 1.0.4 Update examples in docs to use fedora-21-atomic-5 This patch will update documentation for use of magnum as we know new image of fedora 1.0.4 has been built. Change-Id: Ic02428237d12478a7f1e43510865258f5f837d18 Partially-Implements: blueprint kubernetes-v1 --- doc/source/dev/dev-quickstart.rst | 6 +++--- magnum/templates/docker-swarm/README.md | 2 +- specs/container-networking-model.rst | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/dev/dev-quickstart.rst b/doc/source/dev/dev-quickstart.rst index 349b5debb9..7c0f11fb05 100644 --- a/doc/source/dev/dev-quickstart.rst +++ b/doc/source/dev/dev-quickstart.rst @@ -160,7 +160,7 @@ when installing devstack use:: | 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-21-atomic-3 | qcow2 | bare | 770179072 | active | + | 02c312e3-2d30-43fd-ab2d-1d25622c0eaa | fedora-21-atomic-5 | qcow2 | bare | 770179072 | active | +--------------------------------------+---------------------------------+-------------+------------------+-----------+--------+ To list the available commands and resources for magnum, use:: @@ -177,7 +177,7 @@ to magnum how to construct the bay. The coe (Container Orchestration Engine) and keypair need to be specified for the baymodel:: magnum baymodel-create --name k8sbaymodel \ - --image-id fedora-21-atomic-3 \ + --image-id fedora-21-atomic-5 \ --keypair-id testkey \ --external-network-id public \ --dns-nameserver 8.8.8.8 \ @@ -342,7 +342,7 @@ the absence of some Kubernetes-specific arguments and the use of 'swarm' as the coe:: magnum baymodel-create --name swarmbaymodel \ - --image-id fedora-21-atomic-3 \ + --image-id fedora-21-atomic-5 \ --keypair-id testkey \ --external-network-id public \ --dns-nameserver 8.8.8.8 \ diff --git a/magnum/templates/docker-swarm/README.md b/magnum/templates/docker-swarm/README.md index 7948370ce5..9e6eee2692 100644 --- a/magnum/templates/docker-swarm/README.md +++ b/magnum/templates/docker-swarm/README.md @@ -39,7 +39,7 @@ your environment: ssh_key_name: apmelton external_network: 028d70dd-67b8-4901-8bdd-0c62b06cce2d dns_nameserver: 192.168.200.1 - server_image: fedora-21-atomic-3 + server_image: fedora-21-atomic-5 discovery_url: token://d8cdfe5128af6e1075b34aa06ff1cc2c And then create the stack, referencing that environment file: diff --git a/specs/container-networking-model.rst b/specs/container-networking-model.rst index bf62a6d5b1..ad3f006ad9 100644 --- a/specs/container-networking-model.rst +++ b/specs/container-networking-model.rst @@ -182,7 +182,7 @@ Proposed Changes Libnetwork driver: magnum baymodel-create --name k8sbaymodel \ - --image-id fedora-21-atomic-3 \ + --image-id fedora-21-atomic-5 \ --keypair-id testkey \ --external-network-id 1hsdhs88sddds889 \ --dns-nameserver 8.8.8.8 \ @@ -208,7 +208,7 @@ Proposed Changes Libnetwork driver: magnum baymodel-create --name k8sbaymodel \ - --image-id fedora-21-atomic-3 \ + --image-id fedora-21-atomic-5 \ --keypair-id testkey \ --external-network-id ${NIC_ID} \ --dns-nameserver 8.8.8.8 \