diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-23 23:24:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-23 23:24:58 +0000 |
| commit | ae0bb6279482c6edf175e7a8f2dbda0342154de2 (patch) | |
| tree | 196cdd46a09d501bf1cbc846520bfa060de2bb75 | |
| parent | cbe2f61fd8d11d85b229d9a07e2cd1c1bda131e0 (diff) | |
| parent | 184f284190242018c393f57ab3f2c1d44cc9b5a0 (diff) | |
Merge "More fixes for the Ceph docker images url parsing"
| -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 f09e98ce..d78ff7fd 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -138,14 +138,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] |