From 504daf744bc8852c1cc86dfa5f4033f086ee21ee Mon Sep 17 00:00:00 2001 From: Jack Lloyd-Walters Date: Fri, 18 Aug 2023 13:25:02 +0100 Subject: [PATCH] tweaks based on feedback --- README.md | 4 ++-- group_vars/maas_region_controller/10-maas_region_controller | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5a75993..43e115e 100644 --- a/README.md +++ b/README.md @@ -140,8 +140,8 @@ There are additional optional variables that can be passed to the playbooks: - **admin_email**: The email address of the admin user\ Default: `admin@email.com` - - **admin_id**: The launchpad id of the admin user\ - Default: `''` + - **admin_id**: the Launchpad or GitHub id of the admin user to import ssh keys. + (Optional) - **maas_proxy_postgres_proxy_enabled**: Use postgres proxy uri\ Default: `false` diff --git a/group_vars/maas_region_controller/10-maas_region_controller b/group_vars/maas_region_controller/10-maas_region_controller index 0f50f65..6abdbf3 100644 --- a/group_vars/maas_region_controller/10-maas_region_controller +++ b/group_vars/maas_region_controller/10-maas_region_controller @@ -7,7 +7,6 @@ maas_https_port: 5443 # The https port MAAS uses to communicate on admin_username: "admin" admin_password: "admin" admin_email: "admin@email.com" -admin_id: "" maas_proxy_port: "{{ 5240 if 'maas_region_controller' not in group_names else 5050 }}" maas_proxy_postgres_port: "{{ 5432 if 'maas_postgres' not in group_names else 5051 }}"