From 2760f53274ab0c842f584af5b9041456337ea06f Mon Sep 17 00:00:00 2001
From: Oliver Walsh <owalsh@redhat.com>
Date: Thu, 17 Aug 2017 22:47:21 +0100
Subject: Restore and split nova metadata docker service out of nova-api.

I2c39a2957fd95dd261b5b8c4df5e66e00a68d2f7 changed nova api to http from
eventlet, however we need to continue running the eventlet service as
it is required for the nova metadata api.

However this should be tied to the OS::TripleO::Services::NovaMetadata
service, so duplicate the required config in nova-metadata.yaml.

Change-Id: I398575d565d5527bcaa1c8b33b9de2e1e0f2f6fd
Depends-On: Id3407e151566d16c6ae1e1ea8c1b021dac22e727
Closes-bug: #1711425
---
 docker/services/nova-metadata.yaml | 66 +++++++++++++++++++++++++++++++++++---
 1 file changed, 61 insertions(+), 5 deletions(-)

(limited to 'docker/services')

diff --git a/docker/services/nova-metadata.yaml b/docker/services/nova-metadata.yaml
index 0a8a74cd..53ae7910 100644
--- a/docker/services/nova-metadata.yaml
+++ b/docker/services/nova-metadata.yaml
@@ -4,6 +4,12 @@ description: >
   OpenStack containerized Nova Metadata service
 
 parameters:
+  DockerNovaMetadataImage:
+    description: image
+    type: string
+  DockerNovaConfigImage:
+    description: The container image to use for the nova config_volume
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -33,6 +39,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NovaMetadataBase:
     type: ../../puppet/services/nova-metadata.yaml
     properties:
@@ -56,9 +65,56 @@ outputs:
       service_config_settings: {get_attr: [NovaMetadataBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
-        config_volume: ''
-        puppet_tags: ''
+        config_volume: nova
+        puppet_tags: nova_config
         step_config: *step_config
-        config_image: ''
-      kolla_config: {}
-      docker_config: {}
+        config_image: {get_param: DockerNovaConfigImage}
+      kolla_config:
+        /var/lib/kolla/config_files/nova_metadata.json:
+          command: /usr/bin/nova-api-metadata
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
+          permissions:
+            - path: /var/log/nova
+              owner: nova:nova
+              recurse: true
+      docker_config:
+        step_2:
+          nova_init_logs:
+            image: &nova_metadata_image {get_param: DockerNovaMetadataImage}
+            privileged: false
+            user: root
+            volumes:
+              - /var/log/containers/nova:/var/log/nova
+            command: ['/bin/bash', '-c', 'chown -R nova:nova /var/log/nova']
+        step_4:
+          nova_metadata:
+            start_order: 2
+            image: *nova_metadata_image
+            net: host
+            user: nova
+            privileged: true
+            restart: always
+            volumes:
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/nova_metadata.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
+                  - /var/log/containers/nova:/var/log/nova
+            environment:
+              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      metadata_settings:
+        get_attr: [NovaMetadataBase, role_data, metadata_settings]
+      host_prep_tasks:
+        - name: create persistent logs directory
+          file:
+            path: /var/log/containers/nova
+            state: directory
+      upgrade_tasks:
+        - name: Stop and disable nova_api service
+          tags: step2
+          service: name=openstack-nova-api state=stopped enabled=no
-- 
cgit 1.2.3-korg