Merge pull request #11801 from alphagov/remove-asset-host-for-static

Remove ASSET_HOST for Static

hieradata_aws/class/draft_frontend.yaml

@@ -7,6 +7,5 @@ govuk::apps::government_frontend::vhost: 'draft-government-frontend'
 govuk::apps::service_manual_frontend::vhost: 'draft-service-manual-frontend'
 govuk::apps::smartanswers::vhost: 'draft-smartanswers'
 
-govuk::apps::static::asset_host: "https://draft-origin.%{hiera('app_domain')}"
 govuk::apps::static::draft_environment: true
 govuk::apps::static::vhost: 'draft-static'

hieradata_aws/common.yaml

@@ -764,7 +764,6 @@ govuk::apps::smokey::smokey_signon_password: "%{hiera('smokey_signon_password')}
 govuk::apps::smokey::smokey_bearer_token: "%{hiera('smokey_bearer_token')}"
 govuk::apps::smokey::rate_limit_token: "%{hiera('smokey_rate_limit_token')}"
 
-govuk::apps::static::asset_host: "%{hiera('govuk::deploy::config::website_root')}"
 govuk::apps::static::redis_host: "%{hiera('sidekiq_host')}"
 govuk::apps::static::redis_port: "%{hiera('sidekiq_port')}"
 govuk::apps::static::unicorn_worker_processes: "8"

modules/govuk/manifests/apps/static.pp

@@ -28,10 +28,6 @@
 #   The bearer token to use when communicating with Publishing API.
 #   Default: undef
 #
-# [*asset_host*]
-#   The URL that will be used as a prefix for statics assets.
-#   Default: undef
-#
 # [*ga_universal_id*]
 #   The Google Analytics ID.
 #   Default: undef
@@ -76,7 +72,6 @@
   $draft_environment = false,
   $secret_key_base = undef,
   $publishing_api_bearer_token = undef,
-  $asset_host = undef,
   $ga_universal_id = undef,
   $redis_host = undef,
   $redis_port = undef,
@@ -134,9 +129,6 @@
     "${title}-PUBLISHING_API_BEARER_TOKEN":
       varname => 'PUBLISHING_API_BEARER_TOKEN',
       value   => $publishing_api_bearer_token;
-    "${title}-ASSET_HOST":
-      varname => 'ASSET_HOST',
-      value   => $asset_host;
     "${title}-GOOGLE_TAG_MANAGER_ID":
         varname => 'GOOGLE_TAG_MANAGER_ID',
         value   => $google_tag_manager_id;