diff --git a/guides/common/assembly_configuring-dhcp-integration.adoc b/guides/common/assembly_configuring-dhcp-integration.adoc new file mode 100644 index 00000000000..732d24058e7 --- /dev/null +++ b/guides/common/assembly_configuring-dhcp-integration.adoc @@ -0,0 +1,34 @@ +include::modules/con_configuring-dhcp-integration.adoc[] + +== DHCP service providers in {Project} + +== Internal DHCP service + +=== Enabling the internal DHCP service + +=== Disabling DHCP configuration by {Project} +Use case: Multiple subnets + +== External DHCP service + +=== Integrating Infoblox DHCP + +==== Infoblox limitations + +==== Infoblox prerequisites + +==== Installing the Infoblox CA certificate + +==== Installing the DHCP Infoblox module + +=== Integrating a custom DHCP server + +==== Configuring an external DHCP server + +==== Configuring {SmartProxy} for external DHCP service + +=== Securing the dhcpd API + +== Associating the DHCP service with a subnet + +== Disabling DHCP for unmanaged networks diff --git a/guides/common/assembly_configuring-dns-integration.adoc b/guides/common/assembly_configuring-dns-integration.adoc new file mode 100644 index 00000000000..66960c5d1d6 --- /dev/null +++ b/guides/common/assembly_configuring-dns-integration.adoc @@ -0,0 +1,39 @@ +include::modules/con_configuring-dns-integration.adoc[] + +== DNS service providers in {Project} + +== Internal DNS service + +=== Enabling the internal DNS service + +=== Disabling DNS configuration by {Project} +Use case: Multiple domains + +== External DNS service + +=== Integrating IdM DNS + +==== Configuring dynamic DNS update with GSS-TSIG authentication + +==== Configuring dynamic DNS update with TSIG authentication + +=== Integrating Infoblox DNS + +==== Infoblox limitations + +==== Infoblox prerequisites + +==== Installing the Infoblox CA certificate + +==== Installing the DNS Infoblox module + +=== Integrating a custom DNS server +You can use the dns_nsupdate provider with any DNS server compatible with RFC2136. + +=== Reverting to the internal DNS service + +== Associating the DNS service with a subnet + +== Associating the DNS service with a domain + +== Disabling DNS for unmanaged networks diff --git a/guides/common/assembly_configuring-external-services.adoc b/guides/common/assembly_configuring-external-services.adoc index 55bd05c345a..0d40f84ceb9 100644 --- a/guides/common/assembly_configuring-external-services.adoc +++ b/guides/common/assembly_configuring-external-services.adoc @@ -6,15 +6,9 @@ include::modules/proc_configuring-external-dns.adoc[leveloffset=+1] include::assembly_configuring-external-dhcp.adoc[leveloffset=+1] -ifeval::[ "{context}" == "{project-context}" ] -include::assembly_using-infoblox-as-dhcp-and-dns-providers.adoc[leveloffset=+1] -endif::[] - include::modules/proc_configuring-external-tftp.adoc[leveloffset=+1] include::assembly_configuring-external-idm-dns.adoc[leveloffset=+1] -include::assembly_configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm.adoc[leveloffset=+1] - ifdef::parent-context[:context: {parent-context}] ifndef::parent-context[:!context:] diff --git a/guides/common/assembly_configuring-tftp-integration.adoc b/guides/common/assembly_configuring-tftp-integration.adoc new file mode 100644 index 00000000000..35ebc00cda5 --- /dev/null +++ b/guides/common/assembly_configuring-tftp-integration.adoc @@ -0,0 +1,20 @@ +include::modules/con_configuring-tftp-integration.adoc[] + +== TFTP service providers in {Project} + +== Internal TFTP service + +=== Enabling the internal TFTP service + +=== Disabling TFTP configuration by {Project} +Not sure if there's a use case for this. + +== External TFTP service + +=== Configuring an external TFTP server + +=== Configuring {SmartProxy} for external TFTP service + +== Associating the TFTP service with a subnet + +== Disabling TFTP for unmanaged networks diff --git a/guides/common/assembly_performing-additional-configuration-on-smart-proxy-server.adoc b/guides/common/assembly_performing-additional-configuration-on-smart-proxy-server.adoc index 4092a7339aa..a32895dcade 100644 --- a/guides/common/assembly_performing-additional-configuration-on-smart-proxy-server.adoc +++ b/guides/common/assembly_performing-additional-configuration-on-smart-proxy-server.adoc @@ -23,6 +23,3 @@ endif::[] // Enabling Power Management on Hosts include::modules/proc_enabling-power-management-on-hosts.adoc[leveloffset=+1] - -// Configuring DNS, DHCP, and TFTP on {SmartProxyServer} -include::modules/proc_configuring-dns-dhcp-and-tftp.adoc[leveloffset=+1] diff --git a/guides/common/attributes-base.adoc b/guides/common/attributes-base.adoc index 1232ef4571a..075d1cef93d 100644 --- a/guides/common/attributes-base.adoc +++ b/guides/common/attributes-base.adoc @@ -2,6 +2,7 @@ :BaseFilenameURL: index-{build}.html :AdministeringDocURL: {BaseURL}Administering_Project/{BaseFilenameURL}# :APIDocURL: {BaseURL}Project_API/{BaseFilenameURL}# +:ConfiguringDNSDHCPTFTPDocURL: {BaseURL}Configuring_DNS_DHCP_TFTP/{BaseFilenameURL}# :ConfiguringLoadBalancerDocURL: {BaseURL}Configuring_Load_Balancer/{BaseFilenameURL}# :ConfiguringUserAuthenticationDocURL: {BaseURL}Configuring_User_Authentication/{BaseFilenameURL}# :ContentManagementDocURL: {BaseURL}Managing_Content/{BaseFilenameURL}# diff --git a/guides/common/attributes-satellite.adoc b/guides/common/attributes-satellite.adoc index eaa6998ab63..9bfac43b688 100644 --- a/guides/common/attributes-satellite.adoc +++ b/guides/common/attributes-satellite.adoc @@ -14,6 +14,7 @@ // - downstream_filename_to_link.json in downstream :AdministeringDocURL: {BaseURL}administering_red_hat_satellite/index# :APIDocURL: {BaseURL}using_the_satellite_rest_api/index# +:ConfiguringDNSDHCPTFTPDocURL: {BaseURL}configuring_dns_dhcp_and_tftp_integration/index# :ConfiguringLoadBalancerDocURL: {BaseURL}configuring_capsules_with_a_load_balancer/index# :ConfiguringUserAuthenticationDocURL: {BaseURL}configuring_authentication_for_red_hat_satellite_users/index# :ContentManagementDocURL: {BaseURL}managing_content/index# diff --git a/guides/common/attributes-titles.adoc b/guides/common/attributes-titles.adoc index d04a0360ec1..6bdae2e5ee4 100644 --- a/guides/common/attributes-titles.adoc +++ b/guides/common/attributes-titles.adoc @@ -4,6 +4,7 @@ :AdministeringAnsibleDocTitle: Managing {Project} with Ansible :APIDocTitle: Using the {Project} REST API :AppCentricDeploymentDocTitle: Deploying hosts by using application centric approach +:ConfiguringDNSDHCPTFTPDocTitle: Configuring DNS, DHCP, and TFTP integration :ConfiguringLoadBalancerDocTitle: Configuring {SmartProxies} with a load balancer :ConfiguringUserAuthenticationDocTitle: Configuring authentication for {ProjectName} users :ContentManagementDocTitle: Managing content diff --git a/guides/common/modules/con_configuring-dhcp-integration.adoc b/guides/common/modules/con_configuring-dhcp-integration.adoc new file mode 100644 index 00000000000..d890705ba82 --- /dev/null +++ b/guides/common/modules/con_configuring-dhcp-integration.adoc @@ -0,0 +1,2 @@ +[id="configuring-dhcp-integration"] += Configuring DHCP integration diff --git a/guides/common/modules/con_configuring-dns-dhcp-and-tftp.adoc b/guides/common/modules/con_configuring-dns-dhcp-and-tftp.adoc index 241259a9e07..0d35e59a00b 100644 --- a/guides/common/modules/con_configuring-dns-dhcp-and-tftp.adoc +++ b/guides/common/modules/con_configuring-dns-dhcp-and-tftp.adoc @@ -1,4 +1,4 @@ -[id="configuring-dns-dhcp-and-tftp_{context}"] +[id="configuring-dns-dhcp-and-tftp"] = Configuring DNS, DHCP, and TFTP You can manage DNS, DHCP, and TFTP centrally within the {Project} environment, or you can manage them independently after disabling their maintenance on {Project}. diff --git a/guides/common/modules/con_configuring-dns-integration.adoc b/guides/common/modules/con_configuring-dns-integration.adoc new file mode 100644 index 00000000000..62245604d1c --- /dev/null +++ b/guides/common/modules/con_configuring-dns-integration.adoc @@ -0,0 +1,2 @@ +[id="configuring-dns-integration"] += Configuring DNS integration diff --git a/guides/common/modules/con_configuring-project-with-external-dhcp.adoc b/guides/common/modules/con_configuring-project-with-external-dhcp.adoc index d51012be13f..c0770fce3d7 100644 --- a/guides/common/modules/con_configuring-project-with-external-dhcp.adoc +++ b/guides/common/modules/con_configuring-project-with-external-dhcp.adoc @@ -1,4 +1,4 @@ -[id="configuring-external-dhcp_{context}"] +[id="configuring-external-dhcp"] = Configuring {ProductName} with external DHCP To configure {ProductName} with external DHCP, you must complete the following procedures: diff --git a/guides/common/modules/con_configuring-tftp-integration.adoc b/guides/common/modules/con_configuring-tftp-integration.adoc new file mode 100644 index 00000000000..d4dbf36ad89 --- /dev/null +++ b/guides/common/modules/con_configuring-tftp-integration.adoc @@ -0,0 +1,2 @@ +[id="configuring-tftp-integration"] += Configuring TFTP integration diff --git a/guides/common/modules/con_managing-dhcp-by-using-smartproxy.adoc b/guides/common/modules/con_managing-dhcp-by-using-smartproxy.adoc index 965a5944922..c83654e2826 100644 --- a/guides/common/modules/con_managing-dhcp-by-using-smartproxy.adoc +++ b/guides/common/modules/con_managing-dhcp-by-using-smartproxy.adoc @@ -7,11 +7,11 @@ You can use the DHCP module of {SmartProxy} to query for available IP addresses, Note that your {SmartProxy} cannot manage subnet declarations. .Available DHCP providers -* `dhcp_infoblox` {endash} For more information, see xref:Using_Infoblox_as_DHCP_and_DNS_Providers_{smart-proxy-context}[]. +* `dhcp_infoblox` {endash} For more information, see xref:Using_Infoblox_as_DHCP_and_DNS_Providers[]. * `dhcp_isc` {endash} ISC DHCP server over OMAPI. -For more information, see xref:configuring-dns-dhcp-and-tftp-on-productname_{smart-proxy-context}[]. +For more information, see xref:configuring-dns-dhcp-and-tftp[]. * `dhcp_remote_isc` {endash} ISC DHCP server over OMAPI with leases mounted through networking. -For more information, see xref:configuring-external-dhcp_{smart-proxy-context}[]. +For more information, see xref:configuring-external-dhcp[]. ifndef::satellite[] * `dhcp_libvirt` {endash} dnsmasq DHCP via libvirt API endif::[] diff --git a/guides/common/modules/con_managing-dns-by-using-smartproxy.adoc b/guides/common/modules/con_managing-dns-by-using-smartproxy.adoc index dbf5d3035c0..822d176dbb3 100644 --- a/guides/common/modules/con_managing-dns-by-using-smartproxy.adoc +++ b/guides/common/modules/con_managing-dns-by-using-smartproxy.adoc @@ -12,7 +12,7 @@ Other providers provide more direct integration, such as `dns_infoblox` for http ifdef::orcharhino[] * `dns_dnscmd` {endash} Static DNS records in Microsoft Active Directory. endif::[] -* `dhcp_infoblox` {endash} For more information, see xref:Using_Infoblox_as_DHCP_and_DNS_Providers_{smart-proxy-context}[]. +* `dhcp_infoblox` {endash} For more information, see xref:Using_Infoblox_as_DHCP_and_DNS_Providers[]. ifndef::satellite[] * `dns_libvirt` {endash} Dnsmasq DNS via libvirt API. For more information, see xref:configuring_dns_libvirt_{context}[]. diff --git a/guides/common/modules/con_using-infoblox-as-dhcp-and-dns-providers.adoc b/guides/common/modules/con_using-infoblox-as-dhcp-and-dns-providers.adoc index 3f8cc7c239f..86ebb08ea50 100644 --- a/guides/common/modules/con_using-infoblox-as-dhcp-and-dns-providers.adoc +++ b/guides/common/modules/con_using-infoblox-as-dhcp-and-dns-providers.adoc @@ -1,4 +1,4 @@ -[id="Using_Infoblox_as_DHCP_and_DNS_Providers_{context}"] +[id="Using_Infoblox_as_DHCP_and_DNS_Providers"] = Using Infoblox as DHCP and DNS providers You can use {ProductName} to connect to your Infoblox application to create and manage DHCP and DNS records, and to reserve IP addresses. diff --git a/guides/doc-Configuring_DNS_DHCP_TFTP/Makefile b/guides/doc-Configuring_DNS_DHCP_TFTP/Makefile new file mode 100644 index 00000000000..dd1e5be8557 --- /dev/null +++ b/guides/doc-Configuring_DNS_DHCP_TFTP/Makefile @@ -0,0 +1 @@ +include ../common/Makefile diff --git a/guides/doc-Configuring_DNS_DHCP_TFTP/common b/guides/doc-Configuring_DNS_DHCP_TFTP/common new file mode 120000 index 00000000000..60d3b0a6a8f --- /dev/null +++ b/guides/doc-Configuring_DNS_DHCP_TFTP/common @@ -0,0 +1 @@ +../common \ No newline at end of file diff --git a/guides/doc-Configuring_DNS_DHCP_TFTP/docinfo.html b/guides/doc-Configuring_DNS_DHCP_TFTP/docinfo.html new file mode 120000 index 00000000000..e037c37244a --- /dev/null +++ b/guides/doc-Configuring_DNS_DHCP_TFTP/docinfo.html @@ -0,0 +1 @@ +../common/docinfo.html \ No newline at end of file diff --git a/guides/doc-Configuring_DNS_DHCP_TFTP/docinfo.xml b/guides/doc-Configuring_DNS_DHCP_TFTP/docinfo.xml new file mode 100644 index 00000000000..acc8366284e --- /dev/null +++ b/guides/doc-Configuring_DNS_DHCP_TFTP/docinfo.xml @@ -0,0 +1,19 @@ +{ConfiguringDNSDHCPTFTPDocTitle} +Red Hat Satellite +{ProjectVersion} +Configure DNS, DHCP, and TFTP services or disable them + + + + TODO + + + + + + Red Hat Satellite + Documentation Team + satellite-doc-list@redhat.com + + + diff --git a/guides/doc-Configuring_DNS_DHCP_TFTP/images/common b/guides/doc-Configuring_DNS_DHCP_TFTP/images/common new file mode 120000 index 00000000000..53d0c7f575d --- /dev/null +++ b/guides/doc-Configuring_DNS_DHCP_TFTP/images/common @@ -0,0 +1 @@ +../common/images \ No newline at end of file diff --git a/guides/doc-Configuring_DNS_DHCP_TFTP/master.adoc b/guides/doc-Configuring_DNS_DHCP_TFTP/master.adoc new file mode 100644 index 00000000000..3efd7eb74c7 --- /dev/null +++ b/guides/doc-Configuring_DNS_DHCP_TFTP/master.adoc @@ -0,0 +1,41 @@ +include::common/attributes.adoc[] +include::common/header.adoc[] +:context: admin-network +:admin-network: + += {ConfiguringDNSDHCPTFTPDocTitle} + +// This guide is not ready for stable releases +ifdef::HideDocumentOnStable[] +include::common/modules/snip_guide-not-ready.adoc[] +endif::[] +ifndef::HideDocumentOnStable[] + +ifdef::satellite[] +include::common/modules/proc_providing-feedback-on-red-hat-documentation.adoc[leveloffset=+1] +endif::[] + += New structure + +include::common/assembly_configuring-dns-integration.adoc[leveloffset=+1] + +include::common/assembly_configuring-dhcp-integration.adoc[leveloffset=+1] + +include::common/assembly_configuring-tftp-integration.adoc[leveloffset=+1] + += Old structure + +Content heap. + +:ProductName: {SmartProxy} +include::common/assembly_configuring-dns-dhcp-and-tftp.adoc[leveloffset=+1] + +include::common/assembly_configuring-external-services.adoc[leveloffset=+1] + +include::common/assembly_managing-dhcp-on-smart-proxies.adoc[leveloffset=+1] + +include::common/assembly_managing-dns-on-smart-proxies.adoc[leveloffset=+1] + +include::common/assembly_using-infoblox-as-dhcp-and-dns-providers.adoc[leveloffset=+1] + +endif::[] diff --git a/guides/doc-Installing_Proxy/master.adoc b/guides/doc-Installing_Proxy/master.adoc index d6207a5e686..4db6ff816ea 100644 --- a/guides/doc-Installing_Proxy/master.adoc +++ b/guides/doc-Installing_Proxy/master.adoc @@ -26,15 +26,6 @@ include::common/assembly_installing-capsule-server.adoc[leveloffset=+1] include::common/assembly_performing-additional-configuration-on-smart-proxy-server.adoc[leveloffset=+1] -// Configuring {SmartProxyServer} with External Services -include::common/assembly_configuring-external-services.adoc[leveloffset=+1] - -include::common/assembly_managing-dhcp-on-smart-proxies.adoc[leveloffset=+1] - -include::common/assembly_managing-dns-on-smart-proxies.adoc[leveloffset=+1] - -include::common/assembly_using-infoblox-as-dhcp-and-dns-providers.adoc[leveloffset=+1] - :numbered!: // {SmartProxyServer} Scalability Considerations diff --git a/guides/doc-Installing_Server/master.adoc b/guides/doc-Installing_Server/master.adoc index f4658a3b763..54f2166a0d5 100644 --- a/guides/doc-Installing_Server/master.adoc +++ b/guides/doc-Installing_Server/master.adoc @@ -45,10 +45,10 @@ include::common/assembly_configuring-satellite-with-an-http-proxy.adoc[leveloffs include::common/modules/proc_enabling-power-management-on-hosts.adoc[leveloffset=+2] -include::common/assembly_configuring-dns-dhcp-and-tftp.adoc[leveloffset=+2] - include::common/modules/proc_configuring-satellite-for-outgoing-emails.adoc[leveloffset=+2] +include::common/assembly_configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm.adoc[leveloffset=+2] + ifdef::katello,orcharhino,satellite[] include::common/assembly_configuring-an-alternate-cname.adoc[leveloffset=+2] @@ -59,8 +59,6 @@ include::common/modules/proc_resetting-custom-ssl-certificate-to-default-self-si include::common/assembly_using-external-databases.adoc[leveloffset=+2] endif::[] -include::common/assembly_configuring-external-services.adoc[leveloffset=+1] - :numbered!: ifdef::katello[] diff --git a/guides/doc-Installing_Server_Disconnected/master.adoc b/guides/doc-Installing_Server_Disconnected/master.adoc index 905598a1c5a..c59703985a3 100644 --- a/guides/doc-Installing_Server_Disconnected/master.adoc +++ b/guides/doc-Installing_Server_Disconnected/master.adoc @@ -30,19 +30,16 @@ include::common/modules/proc_configuring-pull-based-transport-for-remote-executi include::common/modules/proc_enabling-power-management-on-hosts.adoc[leveloffset=+2] -include::common/assembly_configuring-dns-dhcp-and-tftp.adoc[leveloffset=+2] - include::common/modules/proc_configuring-satellite-for-outgoing-emails.adoc[leveloffset=+2] +include::common/assembly_configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm.adoc[leveloffset=+2] + ifdef::katello,orcharhino,satellite[] include::common/assembly_configuring-satellite-custom-server-certificate.adoc[leveloffset=+2] include::common/assembly_using-external-databases.adoc[leveloffset=+2] endif::[] - -include::common/assembly_configuring-external-services.adoc[leveloffset=+1] - :numbered!: [appendix]