From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 3 May 2017 10:43:45 +0000 (+0000)
Subject: Merge "Move containers common volumes from yaql to list_concat"
X-Git-Tag: opnfv-6.0.0~704
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9697f70dcbbb30882bf8cb90f9dd0bcfc35f087f;p=apex-tripleo-heat-templates.git

Merge "Move containers common volumes from yaql to list_concat"
---

9697f70dcbbb30882bf8cb90f9dd0bcfc35f087f
diff --cc docker/services/panko-api.yaml
index cd0ee3c6,aa59d6f3..cf0e1718
--- a/docker/services/panko-api.yaml
+++ b/docker/services/panko-api.yaml
@@@ -1,9 -1,7 +1,9 @@@
- heat_template_version: ocata
+ heat_template_version: pike
  
  description: >
 -  OpenStack Panko service configured with docker
 +  OpenStack Panko service configured with docker.
 +  Note, this service is deprecated in Pike release and
 +  will be disabled in future releases.
  
  parameters:
    DockerNamespace: