configurable metal registry url and metal registry auth (#509)

Author: AnnaSchreiner

README.md

@@ -46,10 +46,11 @@ setup_yaml:
 
 ## Variables
 
-There are global defaults for all roles of this project defined [here](defaults/main.yaml).
-
-| Name                         | Mandatory | Description                               |
-| ---------------------------- | --------- | ----------------------------------------- |
-| metal_registry_auth_enabled  |           | Enables deployment of image pull secrets  |
-| metal_registry_auth_user     |           | The default auth user for the registry    |
-| metal_registry_auth_password |           | The password for the user of the registry |
+There are [global defaults](./common/roles/defaults/defaults/main.yaml) for all roles of this project defined.
+
+| Name                         | Mandatory | Description                                    |
+| ---------------------------- | --------- | ---------------------------------------------- |
+| metal_registry_auth_enabled  |           | Enables deployment of image pull secrets       |
+| metal_registry_auth_user     |           | The default auth user for the registry         |
+| metal_registry_auth_password |           | The password for the user of the registry      |
+| metal_registry_url           |           | The Container-registry url, default is docker. |

common/roles/defaults/README.md

@@ -6,10 +6,11 @@ It also contains the mapping of our [release vector](https://github.com/metal-st
 
 ## Variables
 
-There are global defaults for all roles of this project defined [here](defaults/main.yaml).
+There are [global defaults](./defaults/main.yaml) for all roles of this project defined.
 
-| Name                         | Mandatory | Description                               |
-| ---------------------------- | --------- | ----------------------------------------- |
-| metal_registry_auth_enabled  |           | Enables deployment of image pull secrets  |
-| metal_registry_auth_user     |           | The default auth user for the registry    |
-| metal_registry_auth_password |           | The password for the user of the registry |
+| Name                         | Mandatory | Description                                    |
+| ---------------------------- | --------- | ---------------------------------------------- |
+| metal_registry_auth_enabled  |           | Enables deployment of image pull secrets       |
+| metal_registry_auth_user     |           | The default auth user for the registry         |
+| metal_registry_auth_password |           | The password for the user of the registry      |
+| metal_registry_url           |           | The Container-registry url, default is docker. |

common/roles/defaults/defaults/main.yaml

@@ -2,6 +2,7 @@
 metal_registry_auth_enabled: no
 metal_registry_auth_user: ""
 metal_registry_auth_password: ""
+metal_registry_url: "https://index.docker.io/v1/"
 
 metal_stack_release:
   mapping:

control-plane/README.md

@@ -16,7 +16,7 @@ Contains roles for deploying the metal-control-plane.
 
 ## Variables
 
-The `defaults` folder contains defaults that are used by multiple roles in the control-plane directory. You can look up all [the default values](roles/defaults/defaults/main.yamlrol-plane-defaults/main.yaml).
+The `defaults` folder contains defaults that are used by multiple roles in the control-plane directory. You can look up all [the default values](roles/defaults/defaults/main.yaml).
 
 | Name                                  | Mandatory | Description                                                                                         |
 | ------------------------------------- | --------- | --------------------------------------------------------------------------------------------------- |

control-plane/roles/auditing-timescaledb/defaults/main.yaml

@@ -39,7 +39,7 @@ auditing_timescaledb_resources:
 auditing_timescaledb_registry_auth_enabled: "{{ metal_registry_auth_enabled }}"
 auditing_timescaledb_registry_auth:
   auths:
-    https://index.docker.io/v1/:
+    "{{ metal_registry_url }}":
       username: "{{ metal_registry_auth_user }}"
       password: "{{ metal_registry_auth_password }}"
       auth: "{{ (metal_registry_auth_user + ':' + metal_registry_auth_password) | b64encode }}"

control-plane/roles/ipam-db/defaults/main.yaml

@@ -43,7 +43,7 @@ ipam_db_resources:
 ipam_db_registry_auth_enabled: "{{ metal_registry_auth_enabled }}"
 ipam_db_registry_auth:
   auths:
-    https://index.docker.io/v1/:
+    "{{ metal_registry_url }}":
       username: "{{ metal_registry_auth_user }}"
       password: "{{ metal_registry_auth_password }}"
       auth: "{{ (metal_registry_auth_user + ':' + metal_registry_auth_password) | b64encode }}"

control-plane/roles/masterdata-db/defaults/main.yaml

@@ -43,7 +43,7 @@ masterdata_db_resources:
 masterdata_db_registry_auth_enabled: "{{ metal_registry_auth_enabled }}"
 masterdata_db_registry_auth:
   auths:
-    https://index.docker.io/v1/:
+    "{{ metal_registry_url }}":
       username: "{{ metal_registry_auth_user }}"
       password: "{{ metal_registry_auth_password }}"
       auth: "{{ (metal_registry_auth_user + ':' + metal_registry_auth_password) | b64encode }}"

control-plane/roles/metal-db/defaults/main.yaml

@@ -43,7 +43,7 @@ metal_db_resources:
 metal_db_registry_auth_enabled: "{{ metal_registry_auth_enabled }}"
 metal_db_registry_auth:
   auths:
-    https://index.docker.io/v1/:
+    "{{ metal_registry_url }}":
       username: "{{ metal_registry_auth_user }}"
       password: "{{ metal_registry_auth_password }}"
       auth: "{{ (metal_registry_auth_user + ':' + metal_registry_auth_password) | b64encode }}"

control-plane/roles/metal/templates/metal-values.j2

@@ -264,3 +264,11 @@ auditing:
     password: "{{ metal_auditing_timescaledb_password }}"
     retention: "{{ metal_auditing_timescaledb_retention }}"
 {% endif %}
+
+metal_registry_auth_enabled: "{{ metal_registry_auth_enabled }}"
+metal_registry_auth:
+  auths:
+    "{{ metal_registry }}":
+      username: "{{ metal_registry_auth_user }}"
+      password: "{{ metal_registry_auth_password }}"
+      auth: "{{ (metal_registry_auth_user + ':' + metal_registry_auth_password) | b64encode }}"

control-plane/roles/nsq/defaults/main.yaml

@@ -32,7 +32,7 @@ nsq_certs_ca_cert:
 nsq_registry_auth_enabled: "{{ metal_registry_auth_enabled }}"
 nsq_registry_auth:
   auths:
-    https://index.docker.io/v1/:
+   "{{ metal_registry_url }}":
       username: "{{ metal_registry_auth_user }}"
       password: "{{ metal_registry_auth_password }}"
       auth: "{{ (metal_registry_auth_user + ':' + metal_registry_auth_password) | b64encode }}"