소스 검색

Merge pull request #7500 from mtnbikenc/fix-openshift_sdn

Automatic merge from submit-queue.

Fix missing slash in oreg_host

When using oreg_url, this would result:

```
tag:
  from:
    kind: DockerImage
    name: registry.reg-aws.openshift.com:443openshift3/node:v3.9.7
```
OpenShift Merge Robot 7 년 전
부모
커밋
a038f7a973
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      roles/openshift_sdn/defaults/main.yml

+ 1 - 1
roles/openshift_sdn/defaults/main.yml

@@ -2,5 +2,5 @@
 openshift_node_image_dict:
   origin: 'openshift/node'
   openshift-enterprise: 'openshift3/node'
-oreg_host: "{{ oreg_url.split('/')[0] if (oreg_url is defined and '.' in oreg_url.split('/')[0]) else '' }}"
+oreg_host: "{{ oreg_url.split('/')[0] ~ '/' if (oreg_url is defined and '.' in oreg_url.split('/')[0]) else '' }}"
 osn_image: "{{ oreg_host }}{{ openshift_node_image_dict[openshift_deployment_type | default('origin')] }}:{{ openshift_image_tag | default('latest') }}"