From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 15 Aug 2017 16:12:19 +0000 (+0000)
Subject: Merge "Fix parsing of DockerCephDaemonImage parameter"
X-Git-Tag: opnfv-6.0.0~257
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f27a6dc81629f6a5295758b86fa80e603fdcb7c7;p=apex-tripleo-heat-templates.git

Merge "Fix parsing of DockerCephDaemonImage parameter"
---

f27a6dc81629f6a5295758b86fa80e603fdcb7c7
diff --cc docker/services/ceph-ansible/ceph-base.yaml
index 85fe0608,e6ff392a..2545c82a
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@@ -125,24 -152,11 +152,12 @@@ outputs
          ceph_common_ansible_vars:
            fsid: { get_param: CephClusterFSID }
            docker: true
-           ceph_docker_registry:
-             if:
-             - custom_registry_host
-             - yaql:
-                 expression: regex('(?:https?://)?(.*)/').split($.data)[1]
-                 data: {str_split: [':', {get_param: DockerCephDaemonImage}, 0]}
-             - docker.io
-           ceph_docker_image:
-             if:
-             - custom_registry_host
-             - yaql:
-                 expression: regex('(?:https?://)?(.*)/').split($.data)[2]
-                 data: {str_split: [':', {get_param: DockerCephDaemonImage}, 0]}
-             - {str_split: [':', {get_param: DockerCephDaemonImage}, 0]}
-           ceph_docker_image_tag: {str_split: [':', {get_param: DockerCephDaemonImage}, 1]}
+           ceph_docker_registry: {get_attr: [DockerImageUrlParts, value, host]}
+           ceph_docker_image: {get_attr: [DockerImageUrlParts, value, image]}
+           ceph_docker_image_tag: {get_attr: [DockerImageUrlParts, value, image_tag]}
            containerized_deployment: true
            public_network: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephMonNetwork]}]}
 +          monitor_address_block: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephMonNetwork]}]}
            cluster_network: {get_param: [ServiceData, net_cidr_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
            user_config: true
            ceph_stable: true