add docker-mirror-server to the mix

.gitlab/ci_scripts/create_vps.sh

@@ -18,6 +18,7 @@ python3 -m openappstack $HOSTNAME create \
   --subdomain $SUBDOMAIN \
   --disk-image-id '-7473' \
   --truncate-subdomain \
+  --docker-mirror-server="${CI_DEPENDENCY_PROXY_SERVER}" \
   --docker-mirror-endpoint="${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}" \
   --docker-mirror-username="${CI_DEPENDENCY_PROXY_USER}" \
   --docker-mirror-password="${CI_DEPENDENCY_PROXY_PASSWORD}"

ansible/roles/pre-configure/templates/registries.yaml

@@ -3,7 +3,7 @@ mirrors:
   docker.io:
     endpoint:
       # Hardcoded, should be fixed before merging
-      - "open.greenhost.net/openappstack/dependency_proxy/containers"
+      - "{{ docker_mirror.server }}"
 configs:
   # TODO: Hardcoded because GitLab does not give us the right path
   "open.greenhost.net":

openappstack/__main__.py

@@ -78,9 +78,12 @@ def main():  # pylint: disable=too-many-statements,too-many-branches,too-many-lo
         help='hostname of the machine. If not provided for a new machine, the '
              'cluster name is used.')
 
+    create_parser.add_argument(
+        '--docker-mirror-server',
+        help=("Server name for a docker mirror"))
     create_parser.add_argument(
         '--docker-mirror-endpoint',
-        help=("Endpoint for a docker mirror"))
+        help=("Full endpoint for a docker mirror"))
     create_parser.add_argument(
         '--docker-mirror-username',
         help=("Username for `docker login` to docker mirror"))
@@ -354,6 +357,8 @@ def create(clus, args):  # pylint: disable=too-many-branches
     elif args.droplet_hostname:
         clus.set_info_by_hostname(args.droplet_hostname)
 
+    if args.docker_mirror_server:
+        clus.docker_mirror_server = args.docker_mirror_server
     if args.docker_mirror_endpoint:
         clus.docker_mirror_endpoint = args.docker_mirror_endpoint
     if args.docker_mirror_username:

openappstack/cluster.py

@@ -64,6 +64,7 @@ class Cluster:
             self.load_data()
         # Can be used to use a custom disk image.
         self.disk_image_id = DEFAULT_IMAGE
+        self.docker_mirror_server = None
         self.docker_mirror_endpoint = None
         self.docker_mirror_username = None
         self.docker_mirror_password = None
@@ -175,12 +176,14 @@ class Cluster:
         settings['flux']['local_flux'] = self.local_flux
         settings['cluster_dir'] = self.cluster_dir
         if self.docker_mirror_endpoint \
+                and self.docker_mirror_server \
                 and self.docker_mirror_username \
                 and self.docker_mirror_password:
             settings['docker_mirror']['enabled'] = True
             settings['docker_mirror']['endpoint'] = self.docker_mirror_endpoint
             settings['docker_mirror']['username'] = self.docker_mirror_username
             settings['docker_mirror']['password'] = self.docker_mirror_password
+            settings['docker_mirror']['server'] = self.docker_mirror_server
 
         # Configure apps to handle invalid certs i.e. from
         # Letsencrypt staging API