diff --git a/guides/common/images/provisioning-image-cloudinit.png b/guides/common/images/provisioning-image-cloudinit.png index ce756b9c441..1b31b49cce5 100644 Binary files a/guides/common/images/provisioning-image-cloudinit.png and b/guides/common/images/provisioning-image-cloudinit.png differ diff --git a/guides/common/images/provisioning-image-finish.png b/guides/common/images/provisioning-image-finish.png index b75040b604e..25fec3d51f5 100644 Binary files a/guides/common/images/provisioning-image-finish.png and b/guides/common/images/provisioning-image-finish.png differ diff --git a/guides/common/images/provisioning-installer-bootdisk-fullhost.png b/guides/common/images/provisioning-installer-bootdisk-fullhost.png index 1867741a48e..ed2b6a52aa2 100644 Binary files a/guides/common/images/provisioning-installer-bootdisk-fullhost.png and b/guides/common/images/provisioning-installer-bootdisk-fullhost.png differ diff --git a/guides/common/images/provisioning-installer-pxeboot.png b/guides/common/images/provisioning-installer-pxeboot.png index ab900baddad..9e53ea0b6ff 100644 Binary files a/guides/common/images/provisioning-installer-pxeboot.png and b/guides/common/images/provisioning-installer-pxeboot.png differ diff --git a/guides/image-sources/first-local-boot-init-config.iuml b/guides/image-sources/first-local-boot-init-config.iuml new file mode 100644 index 00000000000..a30d1e60c6b --- /dev/null +++ b/guides/image-sources/first-local-boot-init-config.iuml @@ -0,0 +1,23 @@ +== First local boot == + +Host -> DHCP : requests the reserved IP and PXE details +Host -> TFTP : bootloader is downloaded +Host -> TFTP : bootloader gets MAC-based config +Foreman -> Host : tells bootloader to boot from HDD +group Initial host configuration + group #ffcc32 Ansible [when enabled and Ansible roles assigned?] + Host -> Proxy : sends initial facts + Proxy -> Foreman : forwards initial facts + note over Host : performs initial configuration + Host -> Proxy : sends initial report + Proxy -> Foreman : forwards initial report + end + group #ffcc32 Puppet [when enabled] + Host -> Puppet : sends initial facts + Puppet -> Foreman : forwards initial facts + note over Host : performs initial configuration + Host -> Puppet : sends initial report + Puppet -> Foreman : forwards initial report + end +end +note over Host : in operation diff --git a/guides/image-sources/provisioning-image-cloudinit.plantuml b/guides/image-sources/provisioning-image-cloudinit.plantuml index 1ee307b91d1..4e1cfba7aa2 100644 --- a/guides/image-sources/provisioning-image-cloudinit.plantuml +++ b/guides/image-sources/provisioning-image-cloudinit.plantuml @@ -5,12 +5,12 @@ title Image-based provisioning with cloud-init configuration actor User -participant "Provisioned Instance" as Host +participant "Provisioned\nInstance" as Host participant "Foreman" as Foreman -participant "Foreman Proxy" as Proxy -participant "Infrastructure Cloud" as Cloud +participant "Foreman\nProxy" as Proxy +participant "Infrastructure\nCloud" as Cloud participant DNS -participant "Puppet server" as Puppet +participant "Puppet\nserver" as Puppet autonumber @@ -28,10 +28,10 @@ note over Host : boots up == Cloud-init script == -Host -> Puppet : signs puppet client certificate (puppet agent) +Host -> Puppet : signs Puppet client certificate (Puppet agent) Host -> Foreman : turns off build mode -== First puppet run == +== First Puppet run == Host -> Puppet : sends initial facts Puppet -> Foreman : forwards initial facts diff --git a/guides/image-sources/provisioning-image-finish.plantuml b/guides/image-sources/provisioning-image-finish.plantuml index 0a731b33048..9510527599a 100644 --- a/guides/image-sources/provisioning-image-finish.plantuml +++ b/guides/image-sources/provisioning-image-finish.plantuml @@ -5,17 +5,17 @@ title Image-based provisioning with Finish script configuration actor User -participant "Provisioned Instance" as Host +participant "Provisioned\nInstance" as Host participant "Foreman" as Foreman -participant "Foreman Proxy" as Proxy -participant "Infrastructure Cloud" as Cloud +participant "Foreman\nProxy" as Proxy +participant "Infrastructure\nCloud" as Cloud participant DNS -participant "Puppet server" as Puppet +participant "Puppet\nserver" as Puppet autonumber note over Foreman : has an Image with credentials defined in Compute Resource -User -> Foreman : clicks on Create Host +User -> Foreman : clicks on **Create Host** User -> Foreman : selects cloud resource, the image and submits Foreman -> Cloud : creates new instance Cloud -> Foreman : reports IP address @@ -28,10 +28,10 @@ Foreman -> Host : executes Finish script via SSH == Finish script == -Host -> Puppet : signs puppet client certificate (puppet agent) +Host -> Puppet : signs Puppet client certificate (Puppet agent) note over Host : build mode is disabled -== First puppet run == +== First Puppet run == Host -> Puppet : sends initial facts Puppet -> Foreman : forwards initial facts diff --git a/guides/image-sources/provisioning-installer-bootdisk-fullhost.plantuml b/guides/image-sources/provisioning-installer-bootdisk-fullhost.plantuml index 70ba8151881..1d9ffa6a12c 100644 --- a/guides/image-sources/provisioning-installer-bootdisk-fullhost.plantuml +++ b/guides/image-sources/provisioning-installer-bootdisk-fullhost.plantuml @@ -26,66 +26,42 @@ Foreman -> Proxy : requests free IP address Proxy -> DHCP : reads DHCP cofiguration note over Foreman : pings IP address User -> Foreman : submits the **Create host** form -group Template [Kickstart default *PXE*, Preseed default *PXE* etc.] - Foreman -> Proxy : creates TFTP configuration +group Templates [All Kickstart default*, Preseed default* etc.] + Foreman -> Proxy : renders TFTP configuration files end -Proxy -> TFTP : deploys TFTP configuration file -Foreman -> Proxy : OS installer boot files download command -Proxy -> Pulp : downloads kernel and initial RAM disk +Proxy -> TFTP : deploys TFTP configuration files +Foreman -> Proxy : commands to download OS installer boot files +Proxy -> Pulp : downloads OS installer kernel and initial RAM disk Foreman -> Proxy : creates DHCP reservation Proxy -> DHCP : forwards DHCP reservation Foreman -> Proxy : creates DNS records Proxy -> DNS : forwards DNS records note over Foreman : host is created\n(build mode enabled) +User -> Host : downloads the bootdisk from the host +note over User : writes the bootdisk to a USB drive == Boot into OS installer == +User -> Host : configures the machine to boot from the USB drive User -> Host : powers on the machine -Host -> DHCP : requests the reserved IP and PXE details -Host -> TFTP : downloads bootloader -note over Host : bootloader loads -Host -> TFTP : gets MAC-based config for bootloader -Host -> TFTP : downloads OS installer kernel and init RAM disk +note over Host : boots from the USB drive note over Host : OS installer loads -Host -> Foreman : requests Kickstart content -group Template [Kickstart default, Preseed default etc.] - Foreman -> Host : provides Kickstart content - note over Host : OS is installed - opt Remote Execution - Host -> Host : authorize SSH key\nof Foreman Proxy - end - opt Puppet - Host -> Puppet : signs Puppet client certificate (puppet agent) - end - Host -> Foreman : calls home\n(disables build mode) +Host -> Foreman : requests OS content +Foreman -> Host : provides OS content +note over Host : OS is installed +opt Remote Execution [when enabled] + Host -> Host : authorizes SSH key\nof Foreman Proxy end +opt Puppet [when enabled] + Host -> Puppet : signs Puppet client certificate (Puppet agent) +end +Host -> Foreman : calls home\n(disables build mode) group #ffcc32 NOT HAPPENING [MAC-based config remains in TFTP dir\nSo which config file is removed?] Foreman -> Proxy : sends TFTP removal request Proxy -> TFTP : removes TFTP configuration file end note over Host : reboots -== First local boot == - -Host -> DHCP : requests the reserved IP and PXE details -Host -> TFTP : bootloader is downloaded -Host -> TFTP : bootloader gets MAC-based config -Foreman -> Host : tells bootloader to boot from HDD -group Ansible??? [when enabled and Ansible roles assigned] - Host -> Proxy : sends initial facts - Proxy -> Foreman : forwards initial facts - note over Host : performs initial configuration - Host -> Proxy : sends initial report - Proxy -> Foreman : forwards initial report -end -group Puppet [when enabled] - Host -> Puppet : sends initial facts - Puppet -> Foreman : forwards initial facts - note over Host : performs initial configuration - Host -> Puppet : sends initial report - Puppet -> Foreman : forwards initial report -end - -note over Host : in operation +!include first-local-boot-init-config.iuml @enduml diff --git a/guides/image-sources/provisioning-installer-pxeboot.plantuml b/guides/image-sources/provisioning-installer-pxeboot.plantuml index 28e68ed408d..ca595f3e823 100644 --- a/guides/image-sources/provisioning-installer-pxeboot.plantuml +++ b/guides/image-sources/provisioning-installer-pxeboot.plantuml @@ -25,12 +25,12 @@ Foreman -> Proxy : requests free IP address Proxy -> DHCP : reads DHCP cofiguration note over Foreman : pings IP address User -> Foreman : submits the **Create host** form -group Template [Kickstart default *PXE*, Preseed default *PXE* etc.] - Foreman -> Proxy : creates TFTP configuration +group Templates [All Kickstart default*, Preseed default* etc.] + Foreman -> Proxy : renders TFTP configuration files end -Proxy -> TFTP : deploys TFTP configuration file -Foreman -> Proxy : OS installer boot files download command -Proxy -> Pulp : downloads kernel and initial RAM disk +Proxy -> TFTP : deploys TFTP configuration files +Foreman -> Proxy : commands to download OS installer boot files +Proxy -> Pulp : downloads OS installer kernel and initial RAM disk Foreman -> Proxy : creates DHCP reservation Proxy -> DHCP : forwards DHCP reservation Foreman -> Proxy : creates DNS records @@ -46,45 +46,22 @@ note over Host : bootloader loads Host -> TFTP : gets MAC-based config for bootloader Host -> TFTP : downloads OS installer kernel and init RAM disk note over Host : OS installer loads -Host -> Foreman : requests Kickstart content -group Template [Kickstart default, Preseed default etc.] - Foreman -> Host : provides Kickstart content - note over Host : OS is installed - opt Remote Execution - Host -> Host : authorize SSH key\nof Foreman Proxy - end - opt Puppet - Host -> Puppet : signs Puppet client certificate (puppet agent) - end - Host -> Foreman : calls home\n(disables build mode) +Host -> Foreman : requests OS content +Foreman -> Host : provides OS content +note over Host : OS is installed +opt Remote Execution + Host -> Host : authorizes SSH key\nof Foreman Proxy end +opt Puppet + Host -> Puppet : signs Puppet client certificate (Puppet agent) +end +Host -> Foreman : calls home\n(disables build mode) group #ffcc32 NOT HAPPENING [MAC-based config remains in TFTP dir\nSo which config file is removed?] Foreman -> Proxy : sends TFTP removal request Proxy -> TFTP : removes TFTP configuration file end note over Host : reboots -== First local boot == - -Host -> DHCP : requests the reserved IP and PXE details -Host -> TFTP : bootloader is downloaded -Host -> TFTP : bootloader gets MAC-based config -Foreman -> Host : tells bootloader to boot from HDD -group Ansible??? [when enabled and Ansible roles assigned] - Host -> Proxy : sends initial facts - Proxy -> Foreman : forwards initial facts - note over Host : performs initial configuration - Host -> Proxy : sends initial report - Proxy -> Foreman : forwards initial report -end -group Puppet [when enabled] - Host -> Puppet : sends initial facts - Puppet -> Foreman : forwards initial facts - note over Host : performs initial configuration - Host -> Puppet : sends initial report - Puppet -> Foreman : forwards initial report -end - -note over Host : in operation +!include first-local-boot-init-config.iuml @enduml