From e1943d9711c4d1fc6193a269cf4d6b49a251b22e Mon Sep 17 00:00:00 2001 From: tianhui Date: Sat, 29 Sep 2018 09:35:34 +0000 Subject: [PATCH] Fix ADMIN output examples Update the response of openstack server list Change-Id: I08b1476b07c4623982f3faef972f89bc7c51a1f3 --- doc/source/admin/config-address-scopes.rst | 12 +++---- doc/source/admin/config-dhcp-ha.rst | 30 ++++++++--------- doc/source/admin/config-dns-int-ext-serv.rst | 32 +++++++++---------- doc/source/admin/config-service-subnets.rst | 10 +++--- doc/source/admin/deploy-ovs-ha-dvr.rst | 10 +++--- .../deploy-ha-vrrp-verifynetworkoperation.txt | 10 +++--- ...deploy-provider-verifynetworkoperation.txt | 10 +++--- ...loy-selfservice-verifynetworkoperation.txt | 10 +++--- 8 files changed, 62 insertions(+), 62 deletions(-) diff --git a/doc/source/admin/config-address-scopes.rst b/doc/source/admin/config-address-scopes.rst index 60d0e737a01..21cb8f79612 100644 --- a/doc/source/admin/config-address-scopes.rst +++ b/doc/source/admin/config-address-scopes.rst @@ -490,12 +490,12 @@ with address scopes. .. code-block:: console $ openstack server list - +--------------+-----------+---------------------------------------------------------------------------+------------+ - | ID | Name | Networks | Image Name | - +--------------+-----------+---------------------------------------------------------------------------+------------+ - | 97e49c8e-... | instance1 | network1=2001:db8:80d2:c4d3:f816:3eff:fe52:b69f, 198.51.100.3, 203.0.113.3| cirros | - | ceba9638-... | instance2 | network2=203.0.113.3, 2001:db8:a583:0:f816:3eff:fe42:1eeb, 203.0.113.4 | centos | - +--------------+-----------+---------------------------------------------------------------------------+------------+ + +--------------+-----------+---------------------------------------------------------------------------+--------+----------+ + | ID | Name | Networks | Image | Flavor | + +--------------+-----------+---------------------------------------------------------------------------+--------+----------+ + | 97e49c8e-... | instance1 | network1=2001:db8:80d2:c4d3:f816:3eff:fe52:b69f, 198.51.100.3, 203.0.113.3| cirros | m1.tiny | + | ceba9638-... | instance2 | network2=203.0.113.3, 2001:db8:a583:0:f816:3eff:fe42:1eeb, 203.0.113.4 | centos | m1.small | + +--------------+-----------+---------------------------------------------------------------------------+--------+----------+ Regardless of address scopes, the floating IPs can be pinged from the external network: diff --git a/doc/source/admin/config-dhcp-ha.rst b/doc/source/admin/config-dhcp-ha.rst index 811e91f4795..777dcc49054 100644 --- a/doc/source/admin/config-dhcp-ha.rst +++ b/doc/source/admin/config-dhcp-ha.rst @@ -183,13 +183,13 @@ To experiment, you need VMs and a neutron network: .. code-block:: console $ openstack server list - +--------------------------------------+-----------+--------+----------------+------------+ - | ID | Name | Status | Networks | Image Name | - +--------------------------------------+-----------+--------+----------------+------------+ - | c394fcd0-0baa-43ae-a793-201815c3e8ce | myserver1 | ACTIVE | net1=192.0.2.3 | cirros | - | 2d604e05-9a6c-4ddb-9082-8a1fbdcc797d | myserver2 | ACTIVE | net1=192.0.2.4 | ubuntu | - | c7c0481c-3db8-4d7a-a948-60ce8211d585 | myserver3 | ACTIVE | net1=192.0.2.5 | centos | - +--------------------------------------+-----------+--------+----------------+------------+ + +--------------------------------------+-----------+--------+----------------+--------+----------+ + | ID | Name | Status | Networks | Image | Flavor | + +--------------------------------------+-----------+--------+----------------+--------+----------+ + | c394fcd0-0baa-43ae-a793-201815c3e8ce | myserver1 | ACTIVE | net1=192.0.2.3 | cirros | m1.tiny | + | 2d604e05-9a6c-4ddb-9082-8a1fbdcc797d | myserver2 | ACTIVE | net1=192.0.2.4 | ubuntu | m1.small | + | c7c0481c-3db8-4d7a-a948-60ce8211d585 | myserver3 | ACTIVE | net1=192.0.2.5 | centos | m1.small | + +--------------------------------------+-----------+--------+----------------+--------+----------+ $ openstack network list +--------------------------------------+------+--------------------------------------+ @@ -403,14 +403,14 @@ in turn to see if the VM can still get the desired IP. --nic net-id=9b96b14f-71b8-4918-90aa-c5d705606b1a ... $ openstack server list - +--------------------------------------+-----------+--------+-------------------+------------+ - | ID | Name | Status | Networks | Image Name | - +--------------------------------------+-----------+--------+-------------------+------------+ - | c394fcd0-0baa-43ae-a793-201815c3e8ce | myserver1 | ACTIVE | net1=192.0.2.3 | cirros | - | 2d604e05-9a6c-4ddb-9082-8a1fbdcc797d | myserver2 | ACTIVE | net1=192.0.2.4 | ubuntu | - | c7c0481c-3db8-4d7a-a948-60ce8211d585 | myserver3 | ACTIVE | net1=192.0.2.5 | centos | - | f62f4731-5591-46b1-9d74-f0c901de567f | myserver4 | ACTIVE | net2=198.51.100.2 | cirros1 | - +--------------------------------------+-----------+--------+-------------------+------------+ + +--------------------------------------+-----------+--------+-------------------+---------+----------+ + | ID | Name | Status | Networks | Image | Flavor | + +--------------------------------------+-----------+--------+-------------------+---------+----------+ + | c394fcd0-0baa-43ae-a793-201815c3e8ce | myserver1 | ACTIVE | net1=192.0.2.3 | cirros | m1.tiny | + | 2d604e05-9a6c-4ddb-9082-8a1fbdcc797d | myserver2 | ACTIVE | net1=192.0.2.4 | ubuntu | m1.small | + | c7c0481c-3db8-4d7a-a948-60ce8211d585 | myserver3 | ACTIVE | net1=192.0.2.5 | centos | m1.small | + | f62f4731-5591-46b1-9d74-f0c901de567f | myserver4 | ACTIVE | net2=198.51.100.2 | cirros1 | m1.tiny | + +--------------------------------------+-----------+--------+-------------------+---------+----------+ #. Make sure both DHCP agents hosting ``net2``: diff --git a/doc/source/admin/config-dns-int-ext-serv.rst b/doc/source/admin/config-dns-int-ext-serv.rst index 2cf4ec101c1..effe4fad1a1 100644 --- a/doc/source/admin/config-dns-int-ext-serv.rst +++ b/doc/source/admin/config-dns-int-ext-serv.rst @@ -196,11 +196,11 @@ Following is an example of these steps: +--------------------------------------+----------------------------------------------------------------+ $ openstack server list - +--------------------------------------+-------+--------+------------+-------------+----------------------------------------------------------+------------+ - | ID | Name | Status | Task State | Power State | Networks | Image Name | - +--------------------------------------+-------+--------+------------+-------------+----------------------------------------------------------+------------+ - | 43f328bb-b2d1-4cf1-a36f-3b2593397cb1 | my_vm | ACTIVE | - | Running | private=fda4:653e:71b0:0:f816:3eff:fe16:b5f2, 192.0.2.15 | cirros | - +--------------------------------------+-------+--------+------------+-------------+----------------------------------------------------------+------------+ + +--------------------------------------+-------+--------+----------------------------------------------------------+--------+---------+ + | ID | Name | Status | Networks | Image | Flavor | + +--------------------------------------+-------+--------+----------------------------------------------------------+--------+---------+ + | 43f328bb-b2d1-4cf1-a36f-3b2593397cb1 | my_vm | ACTIVE | private=fda4:653e:71b0:0:f816:3eff:fe16:b5f2, 192.0.2.15 | cirros | m1.nano | + +--------------------------------------+-------+--------+----------------------------------------------------------+--------+---------+ $ openstack port list --device-id 43f328bb-b2d1-4cf1-a36f-3b2593397cb1 +--------------------------------------+------+-------------------+-------------------------------------------------------------------------------------------------------------+--------+ @@ -391,18 +391,18 @@ allocated for the instance: +--------------------------------------+----------------------------------------------------------------+ $ openstack server list - +--------------------------------------+-------+--------+------------+-------------+----------------------------------------------------------+------------+ - | ID | Name | Status | Task State | Power State | Networks | Image Name | - +--------------------------------------+-------+--------+------------+-------------+----------------------------------------------------------+------------+ - | 71fb4ac8-eed8-4644-8113-0641962bb125 | my_vm | ACTIVE | - | Running | private=fda4:653e:71b0:0:f816:3eff:fe24:8614, 192.0.2.16 | cirros | - +--------------------------------------+-------+--------+------------+-------------+----------------------------------------------------------+------------+ + +--------------------------------------+-------+--------+----------------------------------------------------------+--------+---------+ + | ID | Name | Status | Networks | Image | Flavor | + +--------------------------------------+-------+--------+----------------------------------------------------------+--------+---------+ + | 71fb4ac8-eed8-4644-8113-0641962bb125 | my_vm | ACTIVE | private=fda4:653e:71b0:0:f816:3eff:fe24:8614, 192.0.2.16 | cirros | m1.nano | + +--------------------------------------+-------+--------+----------------------------------------------------------+--------+---------+ $ openstack port list --device-id 71fb4ac8-eed8-4644-8113-0641962bb125 +--------------------------------------+------+-------------------+-----------------------------------------------------------------------------------------------------+--------+ | ID | Name | MAC Address | Fixed IP Addresses | Status | +--------------------------------------+------+-------------------+-----------------------------------------------------------------------------------------------------+--------+ | 1e7033fb-8e9d-458b-89ed-8312cafcfdcb | | fa:16:3e:24:86:14 | ip_address='192.0.2.16', subnet_id='5b9282a1-0be1-4ade-b478-7868ad2a16ff' | ACTIVE | - | | | | ip_address='fda4:653e:71b0:0:f816:3eff:fe24:8614', subnet_id='43414c53-62ae-49bc-aa6c-c9dd7705818a' | | + | | | | ip_address='fda4:653e:71b0:0:f816:3eff:fe24:8614', subnet_id='43414c53-62ae-49bc-aa6c-c9dd7705818a' | | +--------------------------------------+------+-------------------+-----------------------------------------------------------------------------------------------------+--------+ $ openstack port show 1e7033fb-8e9d-458b-89ed-8312cafcfdcb @@ -670,11 +670,11 @@ external DNS service. This is an example: +--------------------------------------+----------------------------------------------------------------+ $ openstack server list - +--------------------------------------+-------+--------+------------+-------------+--------------------------------------+------------+ - | ID | Name | Status | Task State | Power State | Networks | Image Name | - +--------------------------------------+-------+--------+------------+-------------+--------------------------------------+------------+ - | 62c19691-d1c7-4d7b-a88e-9cc4d95d4f41 | my_vm | ACTIVE | - | Running | external=203.0.113.9, 2001:db8:10::9 | cirros | - +--------------------------------------+-------+--------+------------+-------------+--------------------------------------+------------+ + +--------------------------------------+-------+--------+--------------------------------------+--------+---------+ + | ID | Name | Status | Networks | Image | Flavor | + +--------------------------------------+-------+--------+--------------------------------------+--------+---------+ + | 62c19691-d1c7-4d7b-a88e-9cc4d95d4f41 | my_vm | ACTIVE | external=203.0.113.9, 2001:db8:10::9 | cirros | m1.nano | + +--------------------------------------+-------+--------+--------------------------------------+--------+---------+ In this example the port is created manually by the user and then used to boot an instance. Notice that: diff --git a/doc/source/admin/config-service-subnets.rst b/doc/source/admin/config-service-subnets.rst index feaf6f795fb..7c5e1a12056 100644 --- a/doc/source/admin/config-service-subnets.rst +++ b/doc/source/admin/config-service-subnets.rst @@ -177,11 +177,11 @@ to allow users to experiment with configuring service subnets. .. code-block:: console $ openstack server list - +--------------------------------------+-----------------+---------+---------------------+ - | ID | Name | Status | Networks | - +--------------------------------------+-----------------+---------+---------------------+ - | 20181f46-5cd2-4af8-9af0-f4cf5c983008 | demo-instance1 | ACTIVE | demo-net1=192.0.2.3 | - +--------------------------------------+-----------------+---------+---------------------+ + +--------------------------------------+-----------------+---------+---------------------+--------+---------+ + | ID | Name | Status | Networks | Image | Flavor | + +--------------------------------------+-----------------+---------+---------------------+--------+---------+ + | 20181f46-5cd2-4af8-9af0-f4cf5c983008 | demo-instance1 | ACTIVE | demo-net1=192.0.2.3 | cirros | m1.tiny | + +--------------------------------------+-----------------+---------+---------------------+--------+---------+ Example 2 - DVR configuration ----------------------------- diff --git a/doc/source/admin/deploy-ovs-ha-dvr.rst b/doc/source/admin/deploy-ovs-ha-dvr.rst index ea26fc7e718..c2c16aac855 100644 --- a/doc/source/admin/deploy-ovs-ha-dvr.rst +++ b/doc/source/admin/deploy-ovs-ha-dvr.rst @@ -334,11 +334,11 @@ Verify network operation .. code-block:: console $ openstack server list - +--------------------------------------+-----------------------+--------+---------------------------------------------------------------------------+ - | ID | Name | Status | Networks | - +--------------------------------------+-----------------------+--------+---------------------------------------------------------------------------+ - | bde64b00-77ae-41b9-b19a-cd8e378d9f8b | selfservice-instance2 | ACTIVE | selfservice2=fd00:192:0:2:f816:3eff:fe71:e93e, 192.0.2.4 | - +--------------------------------------+-----------------------+--------+---------------------------------------------------------------------------+ + +--------------------------------------+-----------------------+--------+----------------------------------------------------------+--------+---------+ + | ID | Name | Status | Networks | Image | Flavor | + +--------------------------------------+-----------------------+--------+----------------------------------------------------------+--------+---------+ + | bde64b00-77ae-41b9-b19a-cd8e378d9f8b | selfservice-instance2 | ACTIVE | selfservice2=fd00:192:0:2:f816:3eff:fe71:e93e, 192.0.2.4 | cirros | m1.tiny | + +--------------------------------------+-----------------------+--------+----------------------------------------------------------+--------+---------+ #. Create a floating IPv4 address on the provider network. diff --git a/doc/source/admin/shared/deploy-ha-vrrp-verifynetworkoperation.txt b/doc/source/admin/shared/deploy-ha-vrrp-verifynetworkoperation.txt index c4e3fb46090..38a7295a431 100644 --- a/doc/source/admin/shared/deploy-ha-vrrp-verifynetworkoperation.txt +++ b/doc/source/admin/shared/deploy-ha-vrrp-verifynetworkoperation.txt @@ -121,11 +121,11 @@ .. code-block:: console $ openstack server list - +--------------------------------------+-----------------------+--------+---------------------------------------------------------------------------+ - | ID | Name | Status | Networks | - +--------------------------------------+-----------------------+--------+---------------------------------------------------------------------------+ - | bde64b00-77ae-41b9-b19a-cd8e378d9f8b | selfservice-instance2 | ACTIVE | selfservice2=fd00:198:51:100:f816:3eff:fe71:e93e, 198.51.100.4 | - +--------------------------------------+-----------------------+--------+---------------------------------------------------------------------------+ + +--------------------------------------+-----------------------+--------+----------------------------------------------------------------+--------+---------+ + | ID | Name | Status | Networks | Image | Flavor | + +--------------------------------------+-----------------------+--------+----------------------------------------------------------------+--------+---------+ + | bde64b00-77ae-41b9-b19a-cd8e378d9f8b | selfservice-instance2 | ACTIVE | selfservice2=fd00:198:51:100:f816:3eff:fe71:e93e, 198.51.100.4 | cirros | m1.tiny | + +--------------------------------------+-----------------------+--------+----------------------------------------------------------------+--------+---------+ #. Create a floating IPv4 address on the provider network. diff --git a/doc/source/admin/shared/deploy-provider-verifynetworkoperation.txt b/doc/source/admin/shared/deploy-provider-verifynetworkoperation.txt index 831540bbb25..68b80b24962 100644 --- a/doc/source/admin/shared/deploy-provider-verifynetworkoperation.txt +++ b/doc/source/admin/shared/deploy-provider-verifynetworkoperation.txt @@ -26,11 +26,11 @@ .. code-block:: console $ openstack server list - +--------------------------------------+--------------------+--------+------------------------------------------------------------+------------+ - | ID | Name | Status | Networks | Image Name | - +--------------------------------------+--------------------+--------+------------------------------------------------------------+------------+ - | 018e0ae2-b43c-4271-a78d-62653dd03285 | provider-instance1 | ACTIVE | provider1=203.0.113.13, fd00:203:0:113:f816:3eff:fe58:be4e | cirros | - +--------------------------------------+--------------------+--------+------------------------------------------------------------+------------+ + +--------------------------------------+--------------------+--------+------------------------------------------------------------+--------+---------+ + | ID | Name | Status | Networks | Image | Flavor | + +--------------------------------------+--------------------+--------+------------------------------------------------------------+--------+---------+ + | 018e0ae2-b43c-4271-a78d-62653dd03285 | provider-instance1 | ACTIVE | provider1=203.0.113.13, fd00:203:0:113:f816:3eff:fe58:be4e | cirros | m1.tiny | + +--------------------------------------+--------------------+--------+------------------------------------------------------------+--------+---------+ #. On the controller node or any host with access to the provider network, ``ping`` the IPv4 and IPv6 addresses of the instance. diff --git a/doc/source/admin/shared/deploy-selfservice-verifynetworkoperation.txt b/doc/source/admin/shared/deploy-selfservice-verifynetworkoperation.txt index 44b9b48b2f0..2deae609253 100644 --- a/doc/source/admin/shared/deploy-selfservice-verifynetworkoperation.txt +++ b/doc/source/admin/shared/deploy-selfservice-verifynetworkoperation.txt @@ -33,11 +33,11 @@ .. code-block:: console $ openstack server list - +--------------------------------------+-----------------------+--------+--------------------------------------------------------------+ - | ID | Name | Status | Networks | - +--------------------------------------+-----------------------+--------+--------------------------------------------------------------+ - | c055cdb0-ebb4-4d65-957c-35cbdbd59306 | selfservice-instance1 | ACTIVE | selfservice1=192.0.2.4, fd00:192:0:2:f816:3eff:fe30:9cb0 | - +--------------------------------------+-----------------------+--------+--------------------------------------------------------------+ + +--------------------------------------+-----------------------+--------+----------------------------------------------------------+--------+---------+ + | ID | Name | Status | Networks | Image | Flavor | + +--------------------------------------+-----------------------+--------+----------------------------------------------------------+--------+---------+ + | c055cdb0-ebb4-4d65-957c-35cbdbd59306 | selfservice-instance1 | ACTIVE | selfservice1=192.0.2.4, fd00:192:0:2:f816:3eff:fe30:9cb0 | cirros | m1.tiny | + +--------------------------------------+-----------------------+--------+----------------------------------------------------------+--------+---------+ .. warning::