Fix SSH disable during amphora image build

This patch fixes the ability to disable SSH inside the amphora during
the image build.

Closes-Bug: #2110186
Change-Id: Iba4aa247a85cc13adf1a53635b4e1adfe35ff585

diskimage-create/diskimage-create.sh

@@ -496,6 +496,9 @@ fi
 # Disable SSHD if requested
 if [ "$AMP_DISABLE_SSHD" -eq 1 ]; then
     AMP_element_sequence="$AMP_element_sequence remove-sshd"
+    export DIB_OCTAVIA_AMP_USE_SSH=${DIB_OCTAVIA_AMP_USE_SSH:-False}
+else
+    export DIB_OCTAVIA_AMP_USE_SSH=${DIB_OCTAVIA_AMP_USE_SSH:-True}
 fi
 
 # Enable FIPS if requested

elements/amphora-agent/package-installs.yaml

@@ -74,6 +74,7 @@ open-vm-tools:
   arch: amd64
 openssh-client:
 openssh-server:
+  when: DIB_OCTAVIA_AMP_USE_SSH = True
 pollinate:
 ppc64-diag:
   arch: ppc64le, ppc64el

releasenotes/notes/Fix-disable-sshd-470ba6a09278df69.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed a bug that caused SSH to not be diabled in amphora images created
+    with the "-n" flag.