From 12da197e1f8271a9f90f97e8b8a46bac42e24e9c Mon Sep 17 00:00:00 2001 From: Stephen Watson Date: Thu, 26 May 2016 13:03:42 -0700 Subject: [PATCH] Fix Kubernetes-related deprecation in quickstart Using the built docs for Magnum and following the quickstart guide for "Using Kubernetes Bay" as-is, the "magnum bay-show k8sbay" command is missing rows of text from current output on a devstack. Additionally, fix 2 references to deprecated heat commands, and udpate them to relevant openstack commands. Closes-Bug: #1586123 Change-Id: Id6a40963d4c02eab06e9519d28f68f9345dc80ec --- doc/source/dev/quickstart.rst | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/doc/source/dev/quickstart.rst b/doc/source/dev/quickstart.rst index cae9b7c223..2c044c72d7 100644 --- a/doc/source/dev/quickstart.rst +++ b/doc/source/dev/quickstart.rst @@ -275,17 +275,17 @@ specific bay: To check the list of all bay stacks:: - heat stack-list + openstack stack list To check an individual bay's stack:: - heat stack-show + openstack stack show Monitoring bay status in detail (e.g., creating, updating):: - BAY_HEAT_NAME=$(heat stack-list | awk "/\sk8sbay-/{print \$4}") + BAY_HEAT_NAME=$(openstack stack list | awk "/\sk8sbay-/{print \$4}") echo ${BAY_HEAT_NAME} - heat resource-list ${BAY_HEAT_NAME} + openstack stack resource list ${BAY_HEAT_NAME} Building a Kubernetes Bay - Based on CoreOS =========================================== @@ -423,24 +423,25 @@ redis-master is running:: | Property | Value | +--------------------+------------------------------------------------------------+ | status | CREATE_COMPLETE | - | uuid | 481685d2-bc16-4daf-9aac-9e830c7da3f7 | + | uuid | cff82cd0-189c-4ede-a9cb-2c0af6997709 | | status_reason | Stack CREATE completed successfully | - | created_at | 2015-09-22T20:02:39+00:00 | - | updated_at | 2015-09-22T20:05:00+00:00 | + | created_at | 2016-05-26T17:45:57+00:00 | + | updated_at | 2016-05-26T17:50:02+00:00 | | bay_create_timeout | 0 | - | api_address | 192.168.19.84:8080 | - | baymodel_id | 194a4b7e-0125-4956-8660-7551469ae1ed | + | api_address | https://172.24.4.4:6443 | + | baymodel_id | e73298e7-e621-4d42-b35b-7a1952b97158 | + | master_addresses | ['172.24.4.6'] | | node_count | 1 | - | node_addresses | [u'192.168.19.86'] | + | node_addresses | ['172.24.4.5'] | | master_count | 1 | - | discovery_url | https://discovery.etcd.io/373452625d4f52263904584b9d3616b1 | + | discovery_url | https://discovery.etcd.io/4caaa65f297d4d49ef0a085a7aecf8e0 | | name | k8sbay | +--------------------+------------------------------------------------------------+ The output here indicates the redis-master is running on the bay host with IP -address 192.168.19.86. To access the redis master:: +address 172.24.4.5. To access the redis master:: - ssh minion@192.168.19.86 + ssh minion@172.24.4.5 REDIS_ID=$(sudo docker ps | grep redis:v1 | grep k8s_master | awk '{print $1}') sudo docker exec -i -t $REDIS_ID redis-cli @@ -454,7 +455,7 @@ Log into one of the other container hosts and access a redis slave from it. You can use `nova list` to enumerate the kube-minions. For this example we will use the same host as above:: - ssh minion@192.168.19.86 + ssh minion@172.24.4.5 REDIS_ID=$(sudo docker ps | grep redis:v1 | grep k8s_redis | awk '{print $1}') sudo docker exec -i -t $REDIS_ID redis-cli