Add CA cert option to OVA deploy (#820)

vmware · Sep 14, 2017 · 15e8cde · 15e8cde
1 parent b37a80f
commit 15e8cde
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/installer/packer/scripts/admiral/configure_admiral.sh b/installer/packer/scripts/admiral/configure_admiral.sh
@@ -97,10 +97,12 @@ function genCert {
 function secure {
   ssl_cert=$(ovfenv -k management_portal.ssl_cert)
   ssl_cert_key=$(ovfenv -k management_portal.ssl_cert_key)
-  if [ -n "$ssl_cert" ] && [ -n "$ssl_cert_key" ]; then
-    echo "ssl_cert and ssl_cert_key are both set, using customized certificate"
+  ca_cert_input=$(ovfenv -k management_portal.ca_cert)
+  if [ -n "$ssl_cert" ] && [ -n "$ssl_cert_key" ] && [ -n "$ca_cert_input" ]; then
+    echo "ssl_cert, ssl_cert_key, and ca_cert are set, using customized certificate"
     formatCert "$ssl_cert" $cert
     formatCert "$ssl_cert_key" $key
+    formatCert "$ca_cert_input" $ca_cert
     echo "customized" > $flag
     echo "creating java keystore with provided cert for xenon"
     if [ -f "$jks" ]; then

diff --git a/installer/packer/vic-unified.ovf b/installer/packer/vic-unified.ovf
@@ -256,6 +256,10 @@ EVALUATION LICENSE. If You are licensing the Software for evaluation purposes, Y
         <Label>4.3. SSL Cert Key</Label>
         <Description>Paste in the content of certificate key file in PKCS#8 format. Leave blank for a generated key.</Description>
       </Property>
+      <Property ovf:key="ca_cert" ovf:qualifiers="MinLen(0),MaxLen(65535)" ovf:type="string" ovf:userConfigurable="true" ovf:value="">
+        <Label>4.4. CA Cert</Label>
+        <Description>Paste in the content of the CA certificate that signed the SSL Cert. Leave blank for a generated self-signed certificate.</Description>
+      </Property>
     </ProductSection>
     <ProductSection ovf:class="fileserver" ovf:required="false">
       <Info>Fileserver Properties</Info>