Merge "Docker service for Cinder Volume"

[apex-tripleo-heat-templates.git] / docker / services / etcd.yaml

diff --git a/docker/services/etcd.yaml b/docker/services/etcd.yaml
index 0a7daef..818bddd 100644 (file)
--- a/docker/services/etcd.yaml
+++ b/docker/services/etcd.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack containerized etcd services
@@ -26,6 +26,14 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   EtcdInitialClusterToken:
     description: Initial cluster token for the etcd cluster during bootstrap.
     type: string
@@ -92,7 +100,7 @@ outputs:
           step_config: 'include ::tripleo::profile::base::etcd'
           config_image: *etcd_image
           volumes:
-            - /var/lib/config-data/etcd/etc/:/etc
+            - /var/lib/config-data/etcd/etc/etcd/:/etc/etcd:ro
             - /var/lib/etcd:/var/lib/etcd:ro
       host_prep_tasks:
         - name: create /var/lib/etcd