Set https_server_enabled to true in cf-deployment

cf-deployment.yml

@@ -1054,6 +1054,10 @@ instance_groups:
       bpm:
         enabled: true
       enable_consul_service_registration: false
+      https_server_enabled: true
+      tls:
+        cert: "((file_server_cert.certificate))"
+        key: "((file_server_cert.private_key))"
       loggregator: *diego_loggregator_client_properties
   - name: routing-api
     release: routing
@@ -2425,6 +2429,16 @@ variables:
     - cc-uploader.service.cf.internal
     extended_key_usage:
     - server_auth
+- name: file_server_cert
+  type: certificate
+  update_mode: converge
+  options:
+    ca: service_cf_internal_ca
+    common_name: file-server.service.cf.internal
+    alternative_names:
+    - file-server.service.cf.internal
+    extended_key_usage:
+    - server_auth
 - name: diego_locket_server
   type: certificate
   options:

ci/pipelines/cf-deployment.yml

@@ -599,7 +599,6 @@ jobs:
         operations/experimental/enable-tls-cloud-controller-postgres.yml
         operations/change-postgres-max-connections.yml
         operations/use-internal-lookup-for-route-services.yml
-        operations/enable-tls-on-file-server.yml
         operations/test/speed-up-dynamic-asgs.yml
         operations/use-cflinuxfs4-compat.yml
         operations/smoke-tests-timeout-scale.yml

operations/README.md

@@ -52,7 +52,6 @@ This is the README for Ops-files. To learn more about `cf-deployment`, go to the
 | [`enable-privileged-container-support.yml`](enable-privileged-container-support.yml) | Enables Diego privileged container support. | | **NO** |
 | [`enable-service-discovery.yml`](enable-service-discovery.yml) | Enables application service discovery | | **YES** |
 | [`enable-smb-volume-service.yml`](enable-smb-volume-service.yml) | Enables volume support and deploys an SMB broker and volume driver | As of cf-deployment v2, you must use the `smbbrokerpush` errand to cf push the smb broker after `bosh deploy` completes. | **NO** |
-| [`enable-tls-on-file-server.yml`](enable-tls-on-file-server.yml) | Enables TLS on file-server for assets | Enables downloading lifecycle assets over HTTPS | **NO** |
 | [`enable-v2-api.yml`](enable-v2-api.yml) | Enable Cloud Controller API v2 endpoints | | **NO** |
 | [`override-app-domains.yml`](override-app-domains.yml) | Switches from using the system domain as a shared app domain; allows the configuration of one or more shared app domains instead. | Adds [new variables](example-vars-files/vars-override-app-domains.yml).<br/> **CAUTION:** Seeding domains with a router group name (including TCP domains) may cause problems deploying. Please use the `cf` CLI to add shared domains with router group names. | **NO** |
 | [`rename-network-and-deployment.yml`](rename-network-and-deployment.yml) | Allows a deployer to rename the network and deployment by passing a variables `network_name` and `deployment_name` | **CAUTION:** If you are using this ops file along  with another ops file that increases the number of instance groups (e.g. `perm-services.yml`), this ops file will not rename the network for those instance groups. | **YES** |

units/tests/standard_test/operations.yml

@@ -31,7 +31,6 @@ enable-nfs-volume-service.yml: {}
 enable-privileged-container-support.yml: {}
 enable-service-discovery.yml: {}
 enable-smb-volume-service.yml: {}
-enable-tls-on-file-server.yml: {}
 enable-v2-api.yml: {}
 openstack.yml: {}
 override-app-domains.yml: