Merge "Add docker mistral services"

3 files changed, 293 insertions, 0 deletions

diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml
new file mode 100644
index 00000000..e535a817
--- /dev/null
+++ b/docker/services/mistral-api.yaml
@@ -0,0 +1,115 @@
+heat_template_version: ocata
+
+description: >
+  OpenStack containerized Mistral API service
+
+parameters:
+  DockerNamespace:
+    description: namespace
+    default: 'tripleoupstream'
+    type: string
+  DockerMistralApiImage:
+    description: image
+    default: 'centos-binary-mistral-api:latest'
+    type: string
+  DockerMistralConfigImage:
+    description: image
+    default: 'centos-binary-mistral-api: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
+
+resources:
+
+  MistralApiBase:
+    type: ../../puppet/services/mistral-api.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+
+outputs:
+  role_data:
+    description: Role data for the Mistral API role.
+    value:
+      service_name: {get_attr: [MistralApiBase, role_data, service_name]}
+      config_settings:
+        map_merge:
+          - get_attr: [MistralApiBase, role_data, config_settings]
+      step_config: {get_attr: [MistralApiBase, role_data, step_config]}
+      service_config_settings: {get_attr: [MistralApiBase, role_data, service_config_settings]}
+      # BEGIN DOCKER SETTINGS
+      docker_image: &mistral_image
+        list_join:
+          - '/'
+          - [ {get_param: DockerNamespace}, {get_param: DockerMistralApiImage} ]
+      puppet_tags: mistral_config
+      config_volume: mistral
+      config_image:
+        list_join:
+          - '/'
+          - [ {get_param: DockerNamespace}, {get_param: DockerMistralConfigImage} ]
+      kolla_config:
+         /var/lib/kolla/config_files/mistral_api.json:
+           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/api.log --server=api
+           config_files:
+           - dest: /etc/mistral/mistral.conf
+             owner: mistral
+             perm: '0640'
+             source: /var/lib/kolla/config_files/src/etc/mistral/mistral.conf
+      docker_config:
+        step_3:
+          mistral_db_sync:
+            start_order: 1
+            image: *mistral_image
+            net: host
+            privileged: false
+            detach: false
+            volumes:
+              - /var/lib/config-data/mistral/etc/:/etc/:ro
+              - /etc/hosts:/etc/hosts:ro
+              - /etc/localtime:/etc/localtime:ro
+            environment:
+              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+            command: ['mistral-db-manage', '--config-file', '/etc/mistral/mistral.conf', 'upgrade', 'head']
+          mistral_db_populate:
+            start_order: 2
+            image: *mistral_image
+            net: host
+            privileged: false
+            detach: false
+            volumes:
+              - /var/lib/config-data/mistral/etc/:/etc/:ro
+              - /etc/hosts:/etc/hosts:ro
+              - /etc/localtime:/etc/localtime:ro
+            environment:
+              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+            # NOTE: dprince this requires that we install openstack-tripleo-common into
+            # the Mistral API image so that we get tripleo* actions
+            command: ['mistral-db-manage', '--config-file', '/etc/mistral/mistral.conf', 'populate']
+        step_4:
+          mistral_api:
+            start_order: 15
+            image: *mistral_image
+            net: host
+            privileged: false
+            restart: always
+            volumes:
+              - /var/lib/kolla/config_files/mistral_api.json:/var/lib/kolla/config_files/config.json:ro
+              - /var/lib/config-data/mistral/:/var/lib/kolla/config_files/src:ro
+              - /etc/hosts:/etc/hosts:ro
+              - /etc/localtime:/etc/localtime:ro
+            environment:
+              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml
new file mode 100644
index 00000000..be4c8af7
--- /dev/null
+++ b/docker/services/mistral-engine.yaml
@@ -0,0 +1,87 @@
+heat_template_version: ocata
+
+description: >
+  OpenStack containerized Mistral Engine service
+
+parameters:
+  DockerNamespace:
+    description: namespace
+    default: 'tripleoupstream'
+    type: string
+  DockerMistralEngineImage:
+    description: image
+    default: 'centos-binary-mistral-engine:latest'
+    type: string
+  DockerMistralConfigImage:
+    description: image
+    default: 'centos-binary-mistral-api: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
+
+
+resources:
+
+  MistralBase:
+    type: ../../puppet/services/mistral-engine.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+
+outputs:
+  role_data:
+    description: Role data for the Mistral Engine role.
+    value:
+      service_name: {get_attr: [MistralBase, role_data, service_name]}
+      config_settings:
+        map_merge:
+          - get_attr: [MistralBase, role_data, config_settings]
+      step_config: {get_attr: [MistralBase, role_data, step_config]}
+      service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
+      # BEGIN DOCKER SETTINGS
+      docker_image: &mistral_engine_image
+        list_join:
+          - '/'
+          - [ {get_param: DockerNamespace}, {get_param: DockerMistralEngineImage} ]
+      puppet_tags: mistral_config
+      config_volume: mistral
+      config_image:
+        list_join:
+          - '/'
+          - [ {get_param: DockerNamespace}, {get_param: DockerMistralConfigImage} ]
+      kolla_config:
+         /var/lib/kolla/config_files/mistral_engine.json:
+           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/engine.log --server=engine
+           config_files:
+           - dest: /etc/mistral/mistral.conf
+             owner: mistral
+             perm: '0640'
+             source: /var/lib/kolla/config_files/src/etc/mistral/mistral.conf
+      docker_config:
+        step_4:
+          mistral_engine:
+            image: *mistral_engine_image
+            net: host
+            privileged: false
+            restart: always
+            volumes:
+              - /run:/run
+              - /var/lib/kolla/config_files/mistral_engine.json:/var/lib/kolla/config_files/config.json:ro
+              - /var/lib/config-data/mistral/:/var/lib/kolla/config_files/src:ro
+              - /etc/hosts:/etc/hosts:ro
+              - /etc/localtime:/etc/localtime:ro
+            environment:
+              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
new file mode 100644
index 00000000..33608a42
--- /dev/null
+++ b/docker/services/mistral-executor.yaml
@@ -0,0 +1,91 @@
+heat_template_version: ocata
+
+description: >
+  OpenStack containerized Mistral Executor service
+
+parameters:
+  DockerNamespace:
+    description: namespace
+    default: 'tripleoupstream'
+    type: string
+  DockerMistralExecutorImage:
+    description: image
+    default: 'centos-binary-mistral-executor:latest'
+    type: string
+  DockerMistralConfigImage:
+    description: image
+    default: 'centos-binary-mistral-api: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
+
+
+resources:
+
+  MistralBase:
+    type: ../../puppet/services/mistral-executor.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+
+outputs:
+  role_data:
+    description: Role data for the Mistral Executor role.
+    value:
+      service_name: {get_attr: [MistralBase, role_data, service_name]}
+      config_settings:
+        map_merge:
+          - get_attr: [MistralBase, role_data, config_settings]
+      step_config: {get_attr: [MistralBase, role_data, step_config]}
+      service_config_settings: {get_attr: [MistralBase, role_data, service_config_settings]}
+      # BEGIN DOCKER SETTINGS
+      docker_image: &mistral_executor_image
+        list_join:
+          - '/'
+          - [ {get_param: DockerNamespace}, {get_param: DockerMistralExecutorImage} ]
+      puppet_tags: mistral_config
+      config_volume: mistral
+      config_image:
+        list_join:
+          - '/'
+          - [ {get_param: DockerNamespace}, {get_param: DockerMistralConfigImage} ]
+      kolla_config:
+         /var/lib/kolla/config_files/mistral_executor.json:
+           command: /usr/bin/mistral-server --config-file=/etc/mistral/mistral.conf --log-file=/var/log/mistral/executor.log --server=executor
+           config_files:
+           - dest: /etc/mistral/mistral.conf
+             owner: mistral
+             perm: '0640'
+             source: /var/lib/kolla/config_files/src/etc/mistral/mistral.conf
+      docker_config:
+        step_4:
+          mistral_executor:
+            image: *mistral_executor_image
+            net: host
+            privileged: false
+            restart: always
+            volumes:
+              - /run:/run
+              - /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
+              - /var/lib/config-data/mistral/:/var/lib/kolla/config_files/src:ro
+              - /etc/hosts:/etc/hosts:ro
+              - /etc/localtime:/etc/localtime:ro
+              # FIXME: this is required in order for Nova cells
+              # initialization workflows on the Undercloud. Need to
+              # exclude this on the overcloud for security reasons.
+              - /var/lib/config-data/nova/etc/nova:/etc/nova:ro
+            environment:
+              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS