zuul/zuul-jobs
Code Issues Proposed changes

Don't use underscore in buildset_registry_alias

Browse Source 
Docker won't recognize this as a hostname in that case.

Change-Id: Ibbaef5d5ca145f956e3d546e9f3774ddff1fface
This commit is contained in:
James E. Blair 2019-04-22 11:39:42 -07:00
parent 23826e05a6
commit f855033f45
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/build-docker-image/tasks/push.yaml
View File

@ -5,13 +5,13 @@
lineinfile: lineinfile:
path: /etc/hosts path: /etc/hosts
state: present state: present
regex: "^{{ buildset_registry.host }}\tzuul-jobs.buildset_registry$" regex: "^{{ buildset_registry.host }}\tzuul-jobs.buildset-registry$"
line: "{{ buildset_registry.host }}\tzuul-jobs.buildset_registry" line: "{{ buildset_registry.host }}\tzuul-jobs.buildset-registry"
insertafter: EOF insertafter: EOF
when: buildset_registry.host | ipaddr when: buildset_registry.host | ipaddr
- name: Set buildset_registry alias variable when using ip - name: Set buildset_registry alias variable when using ip
set_fact: set_fact:
buildset_registry_alias: zuul-jobs.buildset_registry buildset_registry_alias: zuul-jobs.buildset-registry
when: buildset_registry.host | ipaddr when: buildset_registry.host | ipaddr
- name: Set buildset_registry alias variable when using name - name: Set buildset_registry alias variable when using name
set_fact: set_fact:

6
roles/use-buildset-registry/tasks/main.yaml
View File

@ -5,13 +5,13 @@
lineinfile: lineinfile:
path: /etc/hosts path: /etc/hosts
state: present state: present
regex: "^{{ buildset_registry.host }}\tzuul-jobs.buildset_registry$" regex: "^{{ buildset_registry.host }}\tzuul-jobs.buildset-registry$"
line: "{{ buildset_registry.host }}\tzuul-jobs.buildset_registry" line: "{{ buildset_registry.host }}\tzuul-jobs.buildset-registry"
insertafter: EOF insertafter: EOF
when: buildset_registry.host | ipaddr when: buildset_registry.host | ipaddr
- name: Set buildset_registry alias variable when using ip - name: Set buildset_registry alias variable when using ip
set_fact: set_fact:
buildset_registry_alias: zuul-jobs.buildset_registry buildset_registry_alias: zuul-jobs.buildset-registry
when: buildset_registry.host | ipaddr when: buildset_registry.host | ipaddr
- name: Set buildset_registry alias variable when using name - name: Set buildset_registry alias variable when using name
set_fact: set_fact: