diff --git a/doc/install-guide/source/figures/hwreqs.graffle b/doc/install-guide/source/figures/hwreqs.graffle index 40a7263216..522bb03cba 100644 Binary files a/doc/install-guide/source/figures/hwreqs.graffle and b/doc/install-guide/source/figures/hwreqs.graffle differ diff --git a/doc/install-guide/source/figures/hwreqs.png b/doc/install-guide/source/figures/hwreqs.png index 9f43310046..5c7e2d0e8b 100644 Binary files a/doc/install-guide/source/figures/hwreqs.png and b/doc/install-guide/source/figures/hwreqs.png differ diff --git a/doc/install-guide/source/figures/hwreqs.svg b/doc/install-guide/source/figures/hwreqs.svg index 09e236fb8a..0b58db752f 100644 --- a/doc/install-guide/source/figures/hwreqs.svg +++ b/doc/install-guide/source/figures/hwreqs.svg @@ -1,3 +1,3 @@ - Produced by OmniGraffle 6.5.1 2016-03-07 18:27:09 +0000Canvas 1Layer 1Controller NodeCompute Node 11-2CPUBlock Storage Node 1Object Storage Node 1Object Storage Node 2Hardware RequirementsCore componentOptional component8 GBRAM100 GBStorage2-4+CPU8+ GBRAM100+ GBStorage1-2CPU4 GBRAM2NIC2NIC1NIC1NIC4+ GBRAM1-2CPU1NIC100+ GBStorage100+ GBStorage100+ GBStorage/dev/sdb/dev/sdb/dev/sdc/dev/sdb/dev/sdc1-2CPU4+ GBRAM + Produced by OmniGraffle 6.5.2 2016-04-26 14:57:28 +0000Canvas 1Layer 1Controller NodeCompute Node 11-2CPUBlock Storage Node 1Object Storage Node 1Object Storage Node 2Hardware RequirementsCore componentOptional component8 GBRAM100 GBStorage2-4+CPU8+ GBRAM100+ GBStorage1-2CPU4 GBRAM2NIC2NIC1NIC1NIC4+ GBRAM1-2CPU1NIC100+ GBStorage100+ GBStorage/dev/sdb/dev/sdb/dev/sdc/dev/sdb/dev/sdc1-2CPU4+ GBRAM100+ GBStorage/dev/sdc diff --git a/doc/install-guide/source/figures/network1-connectivity.png b/doc/install-guide/source/figures/network1-connectivity.png index d912e92206..172bae0ec6 100644 Binary files a/doc/install-guide/source/figures/network1-connectivity.png and b/doc/install-guide/source/figures/network1-connectivity.png differ diff --git a/doc/install-guide/source/figures/network1-connectivity.svg b/doc/install-guide/source/figures/network1-connectivity.svg index d49d5ac10e..ebebb9faa4 100644 --- a/doc/install-guide/source/figures/network1-connectivity.svg +++ b/doc/install-guide/source/figures/network1-connectivity.svg @@ -1,3 +1,3 @@ - Produced by OmniGraffle 6.5.1 2016-02-29 17:04:23 +0000Canvas 1Layer 1Controller NodeCompute NodeNetworking Option 1: Provider NetworksConnectivityProvider physical network203.0.113.0/24DHCP NamespaceqdhcpProvider BridgebrqProvider virtual network203.0.113.0/24tapPorttapInterface 2(unnumbered)ProviderInstanceProvider Bridgebrqeth0PorttapiptablesInterface 2(unnumbered)PhysicalNetworkInfrastructureInternet + Produced by OmniGraffle 6.5.2 2016-02-29 17:04:23 +0000Canvas 1Layer 1Controller NodeCompute NodeNetworking Option 1: Provider NetworksConnectivityProvider physical network203.0.113.0/24DHCP NamespaceqdhcpProvider BridgebrqProvider virtual network203.0.113.0/24tapPorttapInterface 2(unnumbered)ProviderInstanceProvider Bridgebrqeth0PorttapiptablesInterface 2(unnumbered)PhysicalNetworkInfrastructureInternet diff --git a/doc/install-guide/source/figures/network1-overview.png b/doc/install-guide/source/figures/network1-overview.png index 5e99e21b72..0a27ddc5b8 100644 Binary files a/doc/install-guide/source/figures/network1-overview.png and b/doc/install-guide/source/figures/network1-overview.png differ diff --git a/doc/install-guide/source/figures/network1-overview.svg b/doc/install-guide/source/figures/network1-overview.svg index 8df11695e4..43a69b70f4 100644 --- a/doc/install-guide/source/figures/network1-overview.svg +++ b/doc/install-guide/source/figures/network1-overview.svg @@ -1,3 +1,3 @@ - Produced by OmniGraffle 6.5.1 2016-02-29 17:03:10 +0000Canvas 1Layer 1Networking Option 1: Provider NetworksOverview Controller NodeLinux Network UtilitiesLinux Bridge AgentDHCPAgentDHCP Namespaceqdhcp Compute NodeLinux Network UtilitiesLinux Bridge AgentSecurityGroupsProvider BridgebrqProvider BridgebrqInstanceMetadataAgentInterface 2(unnumbered)Interface 2(unnumbered)Provider physical network203.0.113.0/24InternetPhysicalNetworkInfrastructure + Produced by OmniGraffle 6.5.2 2016-02-29 17:03:10 +0000Canvas 1Layer 1Networking Option 1: Provider NetworksOverview Controller NodeLinux Network UtilitiesLinux Bridge AgentDHCPAgentDHCP Namespaceqdhcp Compute NodeLinux Network UtilitiesLinux Bridge AgentSecurityGroupsProvider BridgebrqProvider BridgebrqInstanceMetadataAgentInterface 2(unnumbered)Interface 2(unnumbered)Provider physical network203.0.113.0/24InternetPhysicalNetworkInfrastructure diff --git a/doc/install-guide/source/figures/network1-services.graffle b/doc/install-guide/source/figures/network1-services.graffle index 99882f5149..3e5bea9c61 100644 Binary files a/doc/install-guide/source/figures/network1-services.graffle and b/doc/install-guide/source/figures/network1-services.graffle differ diff --git a/doc/install-guide/source/figures/network1-services.png b/doc/install-guide/source/figures/network1-services.png index 0c55faaeb6..e83bf5bbf6 100644 Binary files a/doc/install-guide/source/figures/network1-services.png and b/doc/install-guide/source/figures/network1-services.png differ diff --git a/doc/install-guide/source/figures/network1-services.svg b/doc/install-guide/source/figures/network1-services.svg index 142bf6998b..153385b16a 100644 --- a/doc/install-guide/source/figures/network1-services.svg +++ b/doc/install-guide/source/figures/network1-services.svg @@ -1,3 +1,3 @@ - Produced by OmniGraffle 6.5.1 2016-03-07 18:27:39 +0000Canvas 1Layer 1 Controller NodeSQL DatabaseServiceBlock Storage Nodes Object Storage NodesNetworking Option 1: Provider NetworksService LayoutCore componentOptional componentMessage QueueIdentityImage ServiceComputeManagementNetworkingManagementBlock StorageManagementNetwork Time ServiceOrchestrationTelemetryManagementObject StorageProxy ServiceNetworkingDHCP Agent Compute NodesKVM HypervisorComputeNetworkingLinux Bridge AgentTelemetryAgentTelemetryAgent(s)NetworkingML2 Plug-inObject StorageAccount ServiceObject StorageContainer ServiceObject StorageObject ServiceBlock StorageVolume ServiceTelemetryAgentiSCSI TargetServiceNetworkingLinux Bridge AgentLinux NetworkUtilitiesLinux NetworkUtilitiesShared File SystemServiceShared File SystemManagementNoSQL DatabaseServiceNetworkingMetadata Agent + Produced by OmniGraffle 6.5.2 2016-04-26 14:56:09 +0000Canvas 1Layer 1 Controller NodeSQL DatabaseServiceBlock Storage Nodes Object Storage NodesNetworking Option 1: Provider NetworksService LayoutCore componentOptional componentMessage QueueIdentityImage ServiceComputeManagementNetworkingManagementBlock StorageManagementNetwork Time ServiceOrchestrationTelemetryManagementObject StorageProxy ServiceNetworkingDHCP Agent Compute NodesKVM HypervisorComputeNetworkingLinux Bridge AgentTelemetryAgentTelemetryAgent(s)NetworkingML2 Plug-inObject StorageAccount ServiceObject StorageContainer ServiceObject StorageObject ServiceBlock StorageVolume ServiceTelemetryAgentiSCSI TargetServiceNetworkingLinux Bridge AgentLinux NetworkUtilitiesLinux NetworkUtilitiesShared File SystemServiceShared File SystemManagementNoSQL DatabaseServiceNetworkingMetadata AgentDatabaseManagement diff --git a/doc/install-guide/source/figures/network2-connectivity.png b/doc/install-guide/source/figures/network2-connectivity.png index c8cf335272..7c8631aa58 100644 Binary files a/doc/install-guide/source/figures/network2-connectivity.png and b/doc/install-guide/source/figures/network2-connectivity.png differ diff --git a/doc/install-guide/source/figures/network2-connectivity.svg b/doc/install-guide/source/figures/network2-connectivity.svg index 9cd7246fa0..d736205d98 100644 --- a/doc/install-guide/source/figures/network2-connectivity.svg +++ b/doc/install-guide/source/figures/network2-connectivity.svg @@ -1,3 +1,3 @@ - Produced by OmniGraffle 6.5.1 2016-02-29 17:03:40 +0000Canvas 1Layer 1Controller NodeCompute NodeManagement physical network10.0.1.0/24Provider physical network203.0.113.0/24DHCP NamespaceqdhcpProvider BridgebrqRouter NamespaceqrouterMetadataAgentSelf-service BridgebrqqrPorttapqgProvider virtual network203.0.113.0/24DHCP NamespaceqdhcpInterface 110.0.0.11/24tapPorttapPorttapVXLAN InterfacePorttaptapiptablesSelf-service virtual network172.16.1.0/24Networking Option 2: Self-service NetworksConnectivityProviderInstanceProvider Bridgebrqeth0PorttapSelf-service BridgebrqSelf-serviceInstanceiptablesPorttapeth0VXLANInterfaceiptablesInterface 110.0.0.31/24PhysicalNetworkInfrastructureVXLANTunnelsInterface 2(unnumbered)InternetInterface 2(unnumbered) + Produced by OmniGraffle 6.5.2 2016-02-29 17:03:40 +0000Canvas 1Layer 1Controller NodeCompute NodeManagement physical network10.0.1.0/24Provider physical network203.0.113.0/24DHCP NamespaceqdhcpProvider BridgebrqRouter NamespaceqrouterMetadataAgentSelf-service BridgebrqqrPorttapqgProvider virtual network203.0.113.0/24DHCP NamespaceqdhcpInterface 110.0.0.11/24tapPorttapPorttapVXLAN InterfacePorttaptapiptablesSelf-service virtual network172.16.1.0/24Networking Option 2: Self-service NetworksConnectivityProviderInstanceProvider Bridgebrqeth0PorttapSelf-service BridgebrqSelf-serviceInstanceiptablesPorttapeth0VXLANInterfaceiptablesInterface 110.0.0.31/24PhysicalNetworkInfrastructureVXLANTunnelsInterface 2(unnumbered)InternetInterface 2(unnumbered) diff --git a/doc/install-guide/source/figures/network2-overview.png b/doc/install-guide/source/figures/network2-overview.png index 06edc8fe5d..75b2f41059 100644 Binary files a/doc/install-guide/source/figures/network2-overview.png and b/doc/install-guide/source/figures/network2-overview.png differ diff --git a/doc/install-guide/source/figures/network2-overview.svg b/doc/install-guide/source/figures/network2-overview.svg index e6bba06aae..c015b424f6 100644 --- a/doc/install-guide/source/figures/network2-overview.svg +++ b/doc/install-guide/source/figures/network2-overview.svg @@ -1,3 +1,3 @@ - Produced by OmniGraffle 6.5.1 2016-02-29 17:02:51 +0000Canvas 1Layer 1 Controller NodeNetworking Option 2: Self-Service NetworksOverviewManagement physical network10.0.0.0/24Provider physical network203.0.113.0/24MetadataAgentLinux Network UtilitiesL3 AgentRouterNamespaceqrouterLinux Bridge AgentDHCPAgentDHCP NamespaceqdhcpSelf-service BridgebrqInterface 110.0.0.11/24VXLAN InterfacevxlanInterface 2(unnumbered)Provider Bridgebrq Compute NodeInstanceLinux Network UtilitiesLinux Bridge AgentSecurityGroupsSelf-service BridgebrqVXLAN InterfacevxlanProvider BridgebrqInterface 110.0.0.31/24Interface 2(unnumbered)InternetVXLANTunnelsPhysicalNetworkInfrastructure + Produced by OmniGraffle 6.5.2 2016-02-29 17:02:51 +0000Canvas 1Layer 1 Controller NodeNetworking Option 2: Self-Service NetworksOverviewManagement physical network10.0.0.0/24Provider physical network203.0.113.0/24MetadataAgentLinux Network UtilitiesL3 AgentRouterNamespaceqrouterLinux Bridge AgentDHCPAgentDHCP NamespaceqdhcpSelf-service BridgebrqInterface 110.0.0.11/24VXLAN InterfacevxlanInterface 2(unnumbered)Provider Bridgebrq Compute NodeInstanceLinux Network UtilitiesLinux Bridge AgentSecurityGroupsSelf-service BridgebrqVXLAN InterfacevxlanProvider BridgebrqInterface 110.0.0.31/24Interface 2(unnumbered)InternetVXLANTunnelsPhysicalNetworkInfrastructure diff --git a/doc/install-guide/source/figures/network2-services.graffle b/doc/install-guide/source/figures/network2-services.graffle index 38212407cd..3642050ea6 100644 Binary files a/doc/install-guide/source/figures/network2-services.graffle and b/doc/install-guide/source/figures/network2-services.graffle differ diff --git a/doc/install-guide/source/figures/network2-services.png b/doc/install-guide/source/figures/network2-services.png index 49213235ed..72b1fc915b 100644 Binary files a/doc/install-guide/source/figures/network2-services.png and b/doc/install-guide/source/figures/network2-services.png differ diff --git a/doc/install-guide/source/figures/network2-services.svg b/doc/install-guide/source/figures/network2-services.svg index 07173be7eb..4ff05a0c90 100644 --- a/doc/install-guide/source/figures/network2-services.svg +++ b/doc/install-guide/source/figures/network2-services.svg @@ -1,3 +1,3 @@ - Produced by OmniGraffle 6.5.1 2016-03-07 18:28:40 +0000Canvas 1Layer 1 Controller NodeSQL DatabaseServiceBlock Storage Nodes Object Storage NodesNetworking Option 2: Self-Service NetworksService LayoutCore componentOptional componentMessage QueueIdentityImage ServiceComputeManagementNetworkingManagementBlock StorageManagementNetwork Time ServiceOrchestrationTelemetryManagementObject StorageProxy ServiceNetworkingL3 AgentNetworkingDHCP Agent Compute NodesKVM HypervisorComputeNetworkingLinux Bridge AgentTelemetryAgentTelemetryAgent(s)NetworkingML2 Plug-inObject StorageAccount ServiceObject StorageContainer ServiceObject StorageObject ServiceBlock StorageVolume ServiceShared File SystemServiceiSCSI TargetServiceNetworkingMetadata AgentNetworkingLinux Bridge AgentLinux NetworkUtilitiesLinux NetworkUtilitiesShared File SystemManagementTelemetryAgentNoSQL DatabaseService + Produced by OmniGraffle 6.5.2 2016-04-26 14:55:33 +0000Canvas 1Layer 1 Controller NodeSQL DatabaseServiceBlock Storage Nodes Object Storage NodesNetworking Option 2: Self-Service NetworksService LayoutCore componentOptional componentMessage QueueIdentityImage ServiceComputeManagementNetworkingManagementBlock StorageManagementNetwork Time ServiceOrchestrationDatabaseManagementObject StorageProxy ServiceNetworkingL3 AgentNetworkingDHCP Agent Compute NodesKVM HypervisorComputeNetworkingLinux Bridge AgentTelemetryAgentTelemetryAgent(s)NetworkingML2 Plug-inObject StorageAccount ServiceObject StorageContainer ServiceObject StorageObject ServiceBlock StorageVolume ServiceShared File SystemServiceiSCSI TargetServiceNetworkingMetadata AgentNetworkingLinux Bridge AgentLinux NetworkUtilitiesLinux NetworkUtilitiesShared File SystemManagementTelemetryAgentNoSQL DatabaseServiceTelemetryManagement diff --git a/doc/install-guide/source/figures/networklayout.graffle b/doc/install-guide/source/figures/networklayout.graffle index d6db6fb984..3db6b2025b 100644 Binary files a/doc/install-guide/source/figures/networklayout.graffle and b/doc/install-guide/source/figures/networklayout.graffle differ diff --git a/doc/install-guide/source/figures/networklayout.png b/doc/install-guide/source/figures/networklayout.png index 8b1061ce50..21f6c4a4eb 100644 Binary files a/doc/install-guide/source/figures/networklayout.png and b/doc/install-guide/source/figures/networklayout.png differ diff --git a/doc/install-guide/source/figures/networklayout.svg b/doc/install-guide/source/figures/networklayout.svg index 581dca9a49..29315fc8cf 100644 --- a/doc/install-guide/source/figures/networklayout.svg +++ b/doc/install-guide/source/figures/networklayout.svg @@ -1,3 +1,3 @@ - Produced by OmniGraffle 6.5.2 2016-04-21 06:19:43 +0000Canvas 1Layer 1 Controller Node 1 Compute Node 1Network LayoutManagement network10.0.0.0/24Provider network203.0.113.0/24 Block Storage Node 1 Object Storage Node 2 Object Storage Node 1Interface 2(unnumbered)Interface 2(unnumbered)InternetInterface 110.0.0.11/24Interface 110.0.0.31/24Interface 110.0.0.41/24Interface 110.0.0.52/24Interface 110.0.0.51/24NATCore componentOptional component + Produced by OmniGraffle 6.5.2 2016-04-26 15:08:44 +0000Canvas 1Layer 1 Controller Node 1 Compute Node 1Network LayoutManagement network10.0.0.0/24Provider network203.0.113.0/24 Block Storage Node 1 Object Storage Node 2 Object Storage Node 1Interface 2(unnumbered)Interface 2(unnumbered)InternetInterface 110.0.0.11/24Interface 110.0.0.31/24Interface 110.0.0.41/24Interface 110.0.0.52/24Interface 110.0.0.51/24NATCore componentOptional component diff --git a/doc/install-guide/source/overview.rst b/doc/install-guide/source/overview.rst index f5f63ec07c..f9d1768f1c 100644 --- a/doc/install-guide/source/overview.rst +++ b/doc/install-guide/source/overview.rst @@ -163,7 +163,7 @@ Block Storage ------------- The optional Block Storage node contains the disks that the Block -Storage service provisions for instances. +Storage and Shared File System services provision for instances. For simplicity, service traffic between compute nodes and this node uses the management network. Production environments should implement