From 9769a13faffa9a2a505510d226328f6854d66581 Mon Sep 17 00:00:00 2001 From: Matthew Kassawara <mkassawara@gmail.com> Date: Fri, 21 Nov 2014 10:48:29 -0600 Subject: [PATCH] Improve container network descriptions I improved the container network descriptions in the rpc_user_config files. Fixes rcbops/privatecloud-docs#736 --- etc/rpc_deploy/rpc_user_config.yml | 14 ++++++++------ etc/rpc_deploy/rpc_user_config.yml.example | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/etc/rpc_deploy/rpc_user_config.yml b/etc/rpc_deploy/rpc_user_config.yml index 82b01cd9e1..0d706531ed 100644 --- a/etc/rpc_deploy/rpc_user_config.yml +++ b/etc/rpc_deploy/rpc_user_config.yml @@ -17,16 +17,18 @@ # this will ensure consistency when deploying. environment_version: 3511a43b8e4cc39af4beaaa852b5f917 -# User defined CIDR used for containers -# Global cidr/s used for everything. +# User defined container networks in CIDR notation. The inventory generator +# assigns IP addresses to network interfaces inside containers from these +# ranges. cidr_networks: - # Cidr used in the Management network + # Management (same range as br-mgmt on the target hosts) container: 172.29.236.0/22 - # Cidr used in the Service network + # Service (optional, same range as br-snet on the target hosts) snet: 172.29.248.0/22 - # Cidr used in the VM network + # Tunnel endpoints for VXLAN tenant networks + # (same range as br-vxlan on the target hosts) tunnel: 172.29.240.0/22 - # Cidr used in the Storage network + # Storage (same range as br-storage on the target hosts) storage: 172.29.244.0/22 # User defined list of consumed IP addresses that may intersect diff --git a/etc/rpc_deploy/rpc_user_config.yml.example b/etc/rpc_deploy/rpc_user_config.yml.example index 9ea369d8ab..0293b4c0fc 100644 --- a/etc/rpc_deploy/rpc_user_config.yml.example +++ b/etc/rpc_deploy/rpc_user_config.yml.example @@ -17,16 +17,18 @@ # this will ensure consistency when deploying. environment_version: 5e7155d022462c5a82384c1b2ed8b946 -# User defined CIDR used for containers -# Global cidr/s used for everything. +# User defined container networks in CIDR notation. The inventory generator +# assigns IP addresses to network interfaces inside containers from these +# ranges. cidr_networks: - # Cidr used in the Management network + # Management (same range as br-mgmt on the target hosts) container: 172.29.236.0/22 - # Cidr used in the Service network + # Service (optional, same range as br-snet on the target hosts) snet: 172.29.248.0/22 - # Cidr used in the VM network + # Tunnel endpoints for VXLAN tenant networks + # (same range as br-vxlan on the target hosts) tunnel: 172.29.240.0/22 - # Cidr used in the Storage network + # Storage (same range as br-storage on the target hosts) storage: 172.29.244.0/22 # User defined list of consumed IP addresses that may intersect