From f855033f450cea7f79f5906570c8010fe49c4c5c Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 22 Apr 2019 11:39:42 -0700 Subject: [PATCH] Don't use underscore in buildset_registry_alias Docker won't recognize this as a hostname in that case. Change-Id: Ibbaef5d5ca145f956e3d546e9f3774ddff1fface --- roles/build-docker-image/tasks/push.yaml | 6 +++--- roles/use-buildset-registry/tasks/main.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/build-docker-image/tasks/push.yaml b/roles/build-docker-image/tasks/push.yaml index e37d9ea80..0b8191934 100644 --- a/roles/build-docker-image/tasks/push.yaml +++ b/roles/build-docker-image/tasks/push.yaml @@ -5,13 +5,13 @@ lineinfile: path: /etc/hosts state: present - regex: "^{{ buildset_registry.host }}\tzuul-jobs.buildset_registry$" - line: "{{ buildset_registry.host }}\tzuul-jobs.buildset_registry" + regex: "^{{ buildset_registry.host }}\tzuul-jobs.buildset-registry$" + line: "{{ buildset_registry.host }}\tzuul-jobs.buildset-registry" insertafter: EOF when: buildset_registry.host | ipaddr - name: Set buildset_registry alias variable when using ip set_fact: - buildset_registry_alias: zuul-jobs.buildset_registry + buildset_registry_alias: zuul-jobs.buildset-registry when: buildset_registry.host | ipaddr - name: Set buildset_registry alias variable when using name set_fact: diff --git a/roles/use-buildset-registry/tasks/main.yaml b/roles/use-buildset-registry/tasks/main.yaml index 97c5bb9ce..16c445058 100644 --- a/roles/use-buildset-registry/tasks/main.yaml +++ b/roles/use-buildset-registry/tasks/main.yaml @@ -5,13 +5,13 @@ lineinfile: path: /etc/hosts state: present - regex: "^{{ buildset_registry.host }}\tzuul-jobs.buildset_registry$" - line: "{{ buildset_registry.host }}\tzuul-jobs.buildset_registry" + regex: "^{{ buildset_registry.host }}\tzuul-jobs.buildset-registry$" + line: "{{ buildset_registry.host }}\tzuul-jobs.buildset-registry" insertafter: EOF when: buildset_registry.host | ipaddr - name: Set buildset_registry alias variable when using ip set_fact: - buildset_registry_alias: zuul-jobs.buildset_registry + buildset_registry_alias: zuul-jobs.buildset-registry when: buildset_registry.host | ipaddr - name: Set buildset_registry alias variable when using name set_fact: