diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2017-08-18 18:01:02 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2017-08-18 18:01:02 +0200 |
| commit | 184f284190242018c393f57ab3f2c1d44cc9b5a0 (patch) | |
| tree | 775f05fcaa2e1f7405d0cea4a708495de99b29bf /docker | |
| parent | 9adfd2fc2ae228a36367441fcfdf2c6fb0334d7d (diff) | |
More fixes for the Ceph docker images url parsing
Existing code was still failing the following scenario:
http://192.168.24.1:8787/ceph/rhceph-2-rhel7:latest
Now this has been tested with the following variations:
http://192.168.24.1:8787/ceph/rhceph-2-rhel7:latest
http://192.168.24.1:8787/rhceph-2-rhel7:latest
192.168.24.1:8787/ceph/rhceph-2-rhel7:latest
192.168.24.1:8787/rhceph-2-rhel7:latest
192.168.24.1/ceph/daemon:latest
And then the same list without the custom registry host.
Change-Id: Ifc871de8c2678f6a6fc5d234bfb62e8273c1b0b7
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/ceph-ansible/ceph-base.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index e65c503b..d0bc2669 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -120,14 +120,14 @@ resources: if: - custom_registry_host - yaql: - expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*)/').split($location)[1] + expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*?)/(.*)').split($location)[1] data: {get_param: DockerCephDaemonImage} - docker.io image: if: - custom_registry_host - yaql: - expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*)/').split($location)[2] + expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*?)/(.*)').split($location)[2] data: {get_param: DockerCephDaemonImage} - yaql: expression: $.data.rightSplit(':', 1)[0] |