From ba2e60762253a9eddee8709660a0c995aef1f6f3 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 7 Dec 2016 09:59:57 +0100 Subject: [PATCH] Update ctlplane network range to use 192.168.24.0 Per instack change I1393d65ffb20b1396ff068def237418958ed3289 (git commit a38b0adfcbc0bf2a713101cbb33b563fb978c416) we now default our network range on the Undercloud to 192.168.24.0. This change updates the docs to follow suite which gives a better chance for these examples to work out of the box with stock instack environments. Change-Id: I3d4cde016786903d32508ba7bc6fdd0d756df821 --- .../advanced_deployment/baremetal_overcloud.rst | 12 ++++++------ doc/source/advanced_deployment/deploy_swift.rst | 6 +++--- doc/source/advanced_deployment/network_isolation.rst | 4 ++-- .../advanced_deployment/network_isolation_virt.rst | 6 +++--- .../troubleshooting/troubleshooting-overcloud.rst | 12 ++++++------ 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/source/advanced_deployment/baremetal_overcloud.rst b/doc/source/advanced_deployment/baremetal_overcloud.rst index 9d725552..cc5cdc87 100644 --- a/doc/source/advanced_deployment/baremetal_overcloud.rst +++ b/doc/source/advanced_deployment/baremetal_overcloud.rst @@ -213,8 +213,8 @@ parameters:: openstack network create --share --provider-network-type flat \ --provider-physical-network datacentre --external external openstack subnet create --network external \ - --subnet-range 192.0.2.0/24 --gateway 192.0.2.40 \ - --allocation-pool start=192.0.2.41,end=192.0.2.100 external-subnet + --subnet-range 192.168.24.0/24 --gateway 192.168.24.40 \ + --allocation-pool start=192.168.24.41,end=192.168.24.100 external-subnet .. warning:: Network types other than "flat" are not supported. @@ -562,7 +562,7 @@ After some time (depending on the image), you will see the prepared instance:: +--------------------------------------+------------+--------+------------------------+ | ID | Name | Status | Networks | +--------------------------------------+------------+--------+------------------------+ - | 2022d237-e249-44bd-b864-e7f536a8e439 | instance-0 | ACTIVE | external=192.0.2.50 | + | 2022d237-e249-44bd-b864-e7f536a8e439 | instance-0 | ACTIVE | external=192.168.24.50 | +--------------------------------------+------------+--------+------------------------+ .. note:: @@ -581,11 +581,11 @@ Let's check that it actually got scheduled on a bare metal machine:: You can now log into it:: - $ ssh centos@192.0.2.50 - The authenticity of host '192.0.2.50 (192.0.2.50)' can't be established. + $ ssh centos@192.168.24.50 + The authenticity of host '192.168.24.50 (192.168.24.50)' can't be established. ECDSA key fingerprint is eb:35:45:c5:ed:d9:8a:e8:4b:20:db:06:10:6f:05:74. Are you sure you want to continue connecting (yes/no)? yes - Warning: Permanently added '192.0.2.50' (ECDSA) to the list of known hosts. + Warning: Permanently added '192.168.24.50' (ECDSA) to the list of known hosts. [centos@instance-0 ~]$ Now let's try the same with a virtual instance:: diff --git a/doc/source/advanced_deployment/deploy_swift.rst b/doc/source/advanced_deployment/deploy_swift.rst index 5086404d..c1a1c9a8 100644 --- a/doc/source/advanced_deployment/deploy_swift.rst +++ b/doc/source/advanced_deployment/deploy_swift.rst @@ -88,9 +88,9 @@ output will display all the nodes in the Ring like this:: The minimum number of hours before a partition can be reassigned is 1 The overload factor is 0.00% (0.000000) Devices: id region zone ip address port replication ip replication port name weight partitions balance meta - 0 1 1 192.0.2.22 6000 192.0.2.22 6000 d1 100.00 1024 0.00 - 1 1 1 192.0.2.24 6000 192.0.2.24 6000 d1 100.00 1024 0.00 - 2 1 1 192.0.2.6 6000 192.0.2.6 6000 d1 100.00 1024 0.00 + 0 1 1 192.168.24.22 6000 192.168.24.22 6000 d1 100.00 1024 0.00 + 1 1 1 192.168.24.24 6000 192.168.24.24 6000 d1 100.00 1024 0.00 + 2 1 1 192.168.24.6 6000 192.168.24.6 6000 d1 100.00 1024 0.00 Ring configuration be verified by checking the hash of the ``*.ring.gz`` files. It should be the same on all nodes in the ring.:: diff --git a/doc/source/advanced_deployment/network_isolation.rst b/doc/source/advanced_deployment/network_isolation.rst index 91855b81..b7fc98b9 100644 --- a/doc/source/advanced_deployment/network_isolation.rst +++ b/doc/source/advanced_deployment/network_isolation.rst @@ -179,9 +179,9 @@ Example:: # Set to the router gateway on the external network ExternalInterfaceDefaultRoute: 10.1.2.1 # Gateway router for the provisioning network (or Undercloud IP) - ControlPlaneDefaultRoute: 192.0.2.254 + ControlPlaneDefaultRoute: 192.168.24.1 # Generally the IP of the Undercloud - EC2MetadataIp: 192.0.2.1 + EC2MetadataIp: 192.168.24.1 # Define the DNS servers (maximum 2) for the overcloud nodes DnsServers: ["8.8.8.8","8.8.4.4"] InternalApiNetworkVlanID: 201 diff --git a/doc/source/advanced_deployment/network_isolation_virt.rst b/doc/source/advanced_deployment/network_isolation_virt.rst index 417c907f..476da2bf 100644 --- a/doc/source/advanced_deployment/network_isolation_virt.rst +++ b/doc/source/advanced_deployment/network_isolation_virt.rst @@ -47,10 +47,10 @@ metadata, we need to specify a couple of extra Heat parameters. Create a file called ``/home/stack/custom.yaml`` with the following contents:: parameter_defaults: - EC2MetadataIp: 192.0.2.1 - ControlPlaneDefaultRoute: 192.0.2.1 + EC2MetadataIp: 192.168.24.1 + ControlPlaneDefaultRoute: 192.168.24.1 -Note that the specified IP addresses ``192.0.2.1`` are the same as the +Note that the specified IP addresses ``192.168.24.1`` are the same as the undercloud IP address. Modify Your Overcloud Deploy to Enable Network Isolation diff --git a/doc/source/troubleshooting/troubleshooting-overcloud.rst b/doc/source/troubleshooting/troubleshooting-overcloud.rst index 172c235d..13301219 100644 --- a/doc/source/troubleshooting/troubleshooting-overcloud.rst +++ b/doc/source/troubleshooting/troubleshooting-overcloud.rst @@ -147,9 +147,9 @@ Debugging Using Heat +------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | attributes | {} | | description | | - | links | http://192.0.2.1:8004/v1/cea2a0c78d2447bc9a0f7caa35c9224c/stacks/overcloud/ec3e3251-f949-4df9-92be-dbd37c6992a1/resources/ControllerNodesPostDeployment (self) | - | | http://192.0.2.1:8004/v1/cea2a0c78d2447bc9a0f7caa35c9224c/stacks/overcloud/ec3e3251-f949-4df9-92be-dbd37c6992a1 (stack) | - | | http://192.0.2.1:8004/v1/cea2a0c78d2447bc9a0f7caa35c9224c/stacks/overcloud-ControllerNodesPostDeployment-6kcqm5zuymqu/e551e472-f2db-4468-b586-0374678d71a3 (nested) | + | links | http://192.168.24.1:8004/v1/cea2a0c78d2447bc9a0f7caa35c9224c/stacks/overcloud/ec3e3251-f949-4df9-92be-dbd37c6992a1/resources/ControllerNodesPostDeployment (self) | + | | http://192.168.24.1:8004/v1/cea2a0c78d2447bc9a0f7caa35c9224c/stacks/overcloud/ec3e3251-f949-4df9-92be-dbd37c6992a1 (stack) | + | | http://192.168.24.1:8004/v1/cea2a0c78d2447bc9a0f7caa35c9224c/stacks/overcloud-ControllerNodesPostDeployment-6kcqm5zuymqu/e551e472-f2db-4468-b586-0374678d71a3 (nested) | | logical_resource_id | ControllerNodesPostDeployment | | physical_resource_id | e551e472-f2db-4468-b586-0374678d71a3 | | required_by | BlockStorageNodesPostDeployment | @@ -176,8 +176,8 @@ Debugging Using Heat +--------------------------------------+-------------------------------------------------------+--------+------------+-------------+---------------------+ | ID | Name | Status | Task State | Power State | Networks | +--------------------------------------+-------------------------------------------------------+--------+------------+-------------+---------------------+ - | 18014b02-b143-4ca2-aeb9-5553bec93cff | ov-4tvbtgpv7w-0-soqocxy2w4fr-NovaCompute-nlrxd3lgmmlt | ACTIVE | - | Running | ctlplane=192.0.2.13 | - | 96a57a46-1e48-4c66-adaa-342ee4e98972 | ov-rf4hby6sblk-0-iso3zlqmyzfe-Controller-xm2imjkzalhi | ACTIVE | - | Running | ctlplane=192.0.2.14 | + | 18014b02-b143-4ca2-aeb9-5553bec93cff | ov-4tvbtgpv7w-0-soqocxy2w4fr-NovaCompute-nlrxd3lgmmlt | ACTIVE | - | Running | ctlplane=192.168.24.13 | + | 96a57a46-1e48-4c66-adaa-342ee4e98972 | ov-rf4hby6sblk-0-iso3zlqmyzfe-Controller-xm2imjkzalhi | ACTIVE | - | Running | ctlplane=192.168.24.14 | +--------------------------------------+-------------------------------------------------------+--------+------------+-------------+---------------------+ Login as the ``heat-admin`` user to one of the deployed nodes. In this @@ -186,7 +186,7 @@ Debugging Using Heat :: - $ ssh heat-admin@192.0.2.14 + $ ssh heat-admin@192.168.24.14 While logged in to the controller node, examine the log for the ``os-collect-config`` log for a possible reason for the failure.