FIXUP: Add more images for upstream

guides/common/modules/con_content-flow-in-project.adoc

@@ -25,8 +25,15 @@ For example, you can establish a content source for each geographical location o
 By assigning a host system to a {SmartProxyServer} or directly to your {ProjectServer}, you ensure the host receives the content they provide.
 Hosts can be physical or virtual.
 
-// TODO: Create image for upstream
+ifdef::foreman-el,foreman-deb,katello[]
+image::common/system-architecture.svg[Content flow in {ProjectName}]
+endif::[]
+ifdef::orcharhino[]
+TODO: Add image
+endif::[]
+ifdef::satellite[]
 image::common/system-architecture-satellite.png[Content flow in {ProjectName}]
+endif::[]
 
 .Additional resources
 * See xref:Major-{Project}-Components_{context}[] for details.

guides/common/modules/con_lifecycle-environments-and-environment-paths.adoc

@@ -8,6 +8,13 @@ You can promote content along the environment path to the next lifecycle environ
 When you promote a content view from one environment to the next environment in the application lifecycle, {Project} updates the repository and publishes the packages.
 For example, if development ends on a particular version of an application, you can promote this version to the testing environment and start development on the next version.
 
-// TODO: Create image for upstream
 .An environment path containing four environments
+ifdef::foreman-el,foreman-deb,katello[]
+image::common/lifecycle.svg[An environment path containing four environments]
+endif::[]
+ifdef::orcharhino[]
+TODO: Add image
+endif::[]
+ifdef::satellite[]
 image::common/lifecycle-satellite.png[An environment path containing four environments]
+endif::[]

guides/common/modules/con_multiple-locations.adoc

@@ -6,5 +6,12 @@ This practice can save bandwidth since hosts obtain content from a local {SmartP
 Synchronization of content from remote repositories is done only by the {SmartProxy}, not by each host in a location.
 In addition, this layout makes the provisioning infrastructure more reliable and easier to configure.
 
-// TODO: Create image for upstream
-image::common/system-architecture-satellite.png[Content Flow in {ProjectName}]
+ifdef::foreman-el,foreman-deb,katello[]
+image::common/system-architecture.svg[Content flow in {ProjectName}]
+endif::[]
+ifdef::orcharhino[]
+TODO: Add image
+endif::[]
+ifdef::satellite[]
+image::common/system-architecture-satellite.png[Content flow in {ProjectName}]
+endif::[]

guides/common/modules/con_smartproxy-networking.adoc

@@ -8,21 +8,23 @@ Many of the services that {SmartProxyServer} manages use dedicated network ports
 However, {SmartProxyServer} ensures that all communications from the host to {ProjectServer} use a single source IP address, which simplifies firewall administration.
 
 .{Project} topology with hosts connecting to a {SmartProxy}
-
 In this topology, {SmartProxy} provides a single endpoint for all host network communications so that in remote network segments, only firewall ports to the {SmartProxy} itself must be open.
 
-// TODO: Create image for upstream
+// TODO: Replace graphic with simpler graphic and reference to "Port and firewall requirements"
+ifdef::satellite[]
 .How {Project} components interact when hosts connect to a {SmartProxy}
 image::common/topology-isolated-satellite.png[{ProjectName} topology with a host]
+endif::[]
 
 .{Project} topology with hosts connecting directly to {ProjectServer}
-
 In this topology, hosts connect to {ProjectServer} rather than a {SmartProxy}.
 This applies also to {SmartProxies} themselves because the {SmartProxyServer} is a host of {ProjectServer}.
 
-// TODO: Create image for upstream
+// TODO: Replace graphic with simpler graphic and reference to "Port and firewall requirements"
+ifdef::satellite[]
 .How {Project} components interact when hosts connect directly to {ProjectServer}
 image::common/topology-direct-satellite.png[{ProjectName} topology with a direct host]
+endif::[]
 
 .Additional resources
 You can find complete instructions for configuring the host-based firewall to open the required ports in the following documents: