From 7360a7efab18c8138724f23278c6b5908e9bbe7a Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Wed, 15 Mar 2017 14:17:49 +0100
Subject: [PATCH] Containerize etcd service

Depends-On: I3ad463217ed3f2d6374627248236b274cfed72fb
Depends-On: If4b01934a9a5cb6ca2ff6c1831e4fe073f1b04ea
Closes-bug: #1668938

Change-Id: I6cb902d712849bf11f331ed776cd0ed6e200dcd9
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
---
 docker/services/etcd.yaml              | 105 +++++++++++++++++++++++++++++++++
 environments/services-docker/etcd.yaml |   2 +
 2 files changed, 107 insertions(+)
 create mode 100644 docker/services/etcd.yaml
 create mode 100644 environments/services-docker/etcd.yaml

diff --git a/docker/services/etcd.yaml b/docker/services/etcd.yaml
new file mode 100644
index 00000000..278ea1cc
--- /dev/null
+++ b/docker/services/etcd.yaml
@@ -0,0 +1,105 @@
+heat_template_version: ocata
+
+description: >
+  OpenStack containerized etcd services
+
+parameters:
+  DockerNamespace:
+    description: namespace
+    default: 'tripleoupstream'
+    type: string
+  DockerEtcdImage:
+    description: image
+    default: 'centos-binary-etcd:latest'
+    type: string
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  EtcdInitialClusterToken:
+    description: Initial cluster token for the etcd cluster during bootstrap.
+    type: string
+    hidden: true
+
+resources:
+
+  EtcdPuppetBase:
+    type: ../../puppet/services/etcd.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      EtcdInitialClusterToken: {get_param: EtcdInitialClusterToken}
+
+outputs:
+  role_data:
+    description: Role data for the etcd role.
+    value:
+      service_name: {get_attr: [EtcdPuppetBase, role_data, service_name]}
+      step_config: &step_config
+        list_join:
+          - "\n"
+          - - "['Etcd_key'].each |String $val| { noop_resource($val) }"
+            - get_attr: [EtcdPuppetBase, role_data, step_config]
+      config_settings:
+        map_merge:
+          - {get_attr: [EtcdPuppetBase, role_data, config_settings]}
+          - etcd::manage_service: false
+      # BEGIN DOCKER SETTINGS
+      puppet_config:
+        config_volume: etcd
+        step_config: *step_config
+        config_image: &etcd_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerEtcdImage} ]
+      kolla_config:
+        /var/lib/kolla/config_files/etcd.json:
+          command: /usr/bin/etcd --config-file /etc/etcd/etcd.yml
+          permissions:
+            - path: /var/lib/etcd
+              owner: etcd:etcd
+              recurse: true
+      docker_config:
+        step_2:
+          etcd:
+            image: *etcd_image
+            net: host
+            privileged: false
+            restart: always
+            volumes:
+              - /var/lib/etcd:/var/lib/etcd
+              - /etc/localtime:/etc/localtime:ro
+              - /var/lib/kolla/config_files/etcd.json:/var/lib/kolla/config_files/config.json:ro
+              - /var/lib/config-data/etcd/etc/etcd/etcd.yml:/etc/etcd/etcd.yml:ro
+            environment:
+              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      docker_puppet_tasks:
+        # Etcd keys initialization occurs only on single node
+        step_2:
+          config_volume: 'etcd_init_tasks'
+          puppet_tags: 'etcd_key'
+          step_config: 'include ::tripleo::profile::base::etcd'
+          config_image: *etcd_image
+          volumes:
+            - /var/lib/config-data/etcd/etc/:/etc/:ro
+            - /var/lib/etcd:/var/lib/etcd:ro
+      host_prep_tasks:
+        - name: create /var/lib/etcd
+          file:
+            path: /var/lib/etcd
+            state: directory
+      upgrade_tasks:
+        - name: Stop and disable etcd service
+          tags: step2
+          service: name=etcd state=stopped enabled=no
diff --git a/environments/services-docker/etcd.yaml b/environments/services-docker/etcd.yaml
new file mode 100644
index 00000000..c4201cf4
--- /dev/null
+++ b/environments/services-docker/etcd.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+  OS::TripleO::Services::Etcd: ../../docker/services/etcd.yaml
-- 
2.16.6