diff options
| author | Christopher Baines <mail@cbaines.net> | 2018-07-03 11:43:13 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2018-07-03 11:44:52 +0100 |
| commit | 6b466d156932f0f16f2f8ae13a789f51ecece58b (patch) | |
| tree | 08b89677fdd1be575c771ed043e1bb6c07cdd175 | |
| parent | 920e39eee797117cb0242bdb6f56d151ef2287fb (diff) | |
| download | govuk-mini-environment-admin-release_7.tar govuk-mini-environment-admin-release_7.tar.gz | |
Use Plek for finding the GOV.UK Mini Environment Adminrelease_7
Rather than hardcoding localhost.
| -rw-r--r-- | .envrc | 2 | ||||
| -rw-r--r-- | app/models/backends/terraform_aws/mini_environment_methods.rb | 2 | ||||
| -rw-r--r-- | app/models/backends/terraform_libvirt/mini_environment_methods.rb | 2 | ||||
| -rw-r--r-- | lib/terraform_working_directory.rb | 2 |
4 files changed, 5 insertions, 3 deletions
@@ -2,4 +2,6 @@ if [ -f .local.envrc ]; then source_env .local.envrc fi +export PLEK_SERVICE_MINI_ENVIRONMENT_ADMIN_URI="http://localhost:3000" + use guix --keep-failed --fallback -l guix.scm diff --git a/app/models/backends/terraform_aws/mini_environment_methods.rb b/app/models/backends/terraform_aws/mini_environment_methods.rb index 350df2a..bdb0ab4 100644 --- a/app/models/backends/terraform_aws/mini_environment_methods.rb +++ b/app/models/backends/terraform_aws/mini_environment_methods.rb @@ -104,7 +104,7 @@ module Backends::TerraformAws::MiniEnvironmentMethods slug: mini_environment.name.parameterize, start_command: mini_environment.backend_data['build_output'], backend_remote_state_address: ( - 'http://localhost:3000' + + Plek.new.external_url_for('mini-environment-admin') + Rails .application .routes diff --git a/app/models/backends/terraform_libvirt/mini_environment_methods.rb b/app/models/backends/terraform_libvirt/mini_environment_methods.rb index 64781df..4bf6adb 100644 --- a/app/models/backends/terraform_libvirt/mini_environment_methods.rb +++ b/app/models/backends/terraform_libvirt/mini_environment_methods.rb @@ -105,7 +105,7 @@ module Backends::TerraformLibvirt::MiniEnvironmentMethods host_name: "#{slug}.#{domain}", vm_image_and_system: mini_environment.backend_data['build_output'], backend_remote_state_address: ( - 'http://localhost:3000' + + Plek.new.external_url_for('mini-environment-admin') + Rails .application .routes diff --git a/lib/terraform_working_directory.rb b/lib/terraform_working_directory.rb index d8bbae3..6c2e25f 100644 --- a/lib/terraform_working_directory.rb +++ b/lib/terraform_working_directory.rb @@ -63,7 +63,7 @@ class TerraformWorkingDirectory def terraform_backend_address ( - 'http://localhost:3000' + + Plek.new.external_url_for('mini-environment-admin') + Rails .application .routes |