From ea0309e5050b76be03174adc2e3de4a03bf91170 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Tue, 8 Sep 2015 18:49:45 +0200 Subject: [PATCH] Updated the configuration to current dynamic inventory standards documentation is outdated for management network (cidr section) in openstack_user_config. cidr_networks: management: 172.29.236.0/22 moved to: cidr_networks: container: 172.29.236.0/22 This fixes the documentation DocImpact Closes-Bug: #1493451 Change-Id: I1669b58408ed2eb297209bb4b2e4171008b08e0f --- doc/source/install-guide/configure-networking.rst | 2 +- etc/openstack_deploy/openstack_user_config.yml.example | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/install-guide/configure-networking.rst b/doc/source/install-guide/configure-networking.rst index 3add32077d..07ee10aa5a 100644 --- a/doc/source/install-guide/configure-networking.rst +++ b/doc/source/install-guide/configure-networking.rst @@ -13,7 +13,7 @@ configure target host networking. cidr_networks: # Management (same range as br-mgmt on the target hosts) - management: CONTAINER_MGMT_CIDR + container: CONTAINER_MGMT_CIDR # Tunnel endpoints for VXLAN tenant networks # (same range as br-vxlan on the target hosts) tunnel: TUNNEL_CIDR diff --git a/etc/openstack_deploy/openstack_user_config.yml.example b/etc/openstack_deploy/openstack_user_config.yml.example index 45433c3f8a..80d08699c7 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.example +++ b/etc/openstack_deploy/openstack_user_config.yml.example @@ -57,7 +57,7 @@ # as cinder and swift. # # cidr_networks: -# management: 172.29.236.0/22 +# container: 172.29.236.0/22 # tunnel: 172.29.240.0/22 # storage: 172.29.244.0/22 #