X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fironic-api.yaml;h=183ed5ce749c2d8647627977ca05f1a228707192;hb=b87d4e1a1245dc1be512e0c7c38e052fff0c5b8b;hp=97ba9706a6b5020d043d5aa634a2731b10beb369;hpb=c03f5cc4d5984f08b8485c62a353ad81a7f74ac7;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index 97ba9706..183ed5ce 100644
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack containerized Ironic API service
@@ -13,7 +13,7 @@ parameters:
     default: 'centos-binary-ironic-api:latest'
     type: string
   DockerIronicConfigImage:
-    description: image
+    description: The container image to use for the ironic config_volume
     default: 'centos-binary-ironic-pxe:latest'
     type: string
   EndpointMap:
@@ -30,15 +30,28 @@ 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
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   IronicApiBase:
     type: ../../puppet/services/ironic-api.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
 
 outputs:
   role_data:
@@ -48,14 +61,11 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [IronicApiBase, role_data, config_settings]
+          - apache::default_vhost: false
       step_config: &step_config
         get_attr: [IronicApiBase, role_data, step_config]
       service_config_settings: {get_attr: [IronicApiBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
-      docker_image: &ironic_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerIronicApiImage} ]
       puppet_config:
         config_volume: ironic
         puppet_tags: ironic_config
@@ -65,38 +75,66 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/ironic_api.json:
-           command: /usr/bin/ironic-api
-           config_files:
-           - dest: /etc/ironic/ironic.conf
-             owner: ironic
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/ironic/ironic.conf
+        /var/lib/kolla/config_files/ironic_api.json:
+          command: /usr/sbin/httpd -DFOREGROUND
+          permissions:
+            - path: /var/log/ironic
+              owner: ironic:ironic
+              recurse: true
       docker_config:
+        # db sync runs before permissions set by kolla_config
+        step_2:
+          ironic_init_logs:
+            image: &ironic_api_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerIronicApiImage} ]
+            privileged: false
+            user: root
+            volumes:
+              - /var/log/containers/ironic:/var/log/ironic
+            command: ['/bin/bash', '-c', 'chown -R ironic:ironic /var/log/ironic']
         step_3:
           ironic_db_sync:
-            image: *ironic_image
+            start_order: 1
+            image: *ironic_api_image
             net: host
             privileged: false
             detach: false
+            user: root
             volumes:
-              - /var/lib/config-data/ironic/etc/:/etc/:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-            environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-            command: ['ironic-dbsync', '--config-file', '/etc/ironic/ironic.conf']
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/config-data/ironic/etc/ironic:/etc/ironic:ro
+                  - /var/log/containers/ironic:/var/log/ironic
+            command: "/usr/bin/bootstrap_host_exec ironic_api su ironic -s /bin/bash -c 'ironic-dbsync --config-file /etc/ironic/ironic.conf'"
         step_4:
           ironic_api:
             start_order: 10
-            image: *ironic_image
+            image: *ironic_api_image
             net: host
-            privileged: false
+            user: root
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/ironic/:/var/lib/kolla/config_files/src:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/ironic/etc/ironic:/etc/ironic:ro
+                  - /var/lib/config-data/ironic/etc/httpd/conf/:/etc/httpd/conf/:ro
+                  - /var/lib/config-data/ironic/etc/httpd/conf.d/:/etc/httpd/conf.d/:ro
+                  - /var/lib/config-data/ironic/etc/httpd/conf.modules.d/:/etc/httpd/conf.modules.d/:ro
+                  - /var/lib/config-data/ironic/var/www/:/var/www/:ro
+                  - /var/log/containers/ironic:/var/log/ironic
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create persistent logs directory
+          file:
+            path: /var/log/containers/ironic
+            state: directory
+      upgrade_tasks:
+        - name: Stop and disable ironic_api service
+          tags: step2
+          service: name=openstack-ironic-api state=stopped enabled=no