Merge "Add Ephemeral Heat service"

deployment/heat/heat-ephemeral-container-ansible.yaml

@@ -0,0 +1,74 @@
+heat_template_version: wallaby
+
+description: >
+  Openstack Heat Ephemeral service, provides nothing but container images
+
+parameters:
+  ContainerHeatAllImage:
+    description: The container image to use for heat-all
+    type: string
+  ContainerHeatEngineImage:
+    description: image
+    type: string
+  ContainerHeatConfigImage:
+    description: The container image to use for the heat config_volume
+    type: string
+  ContainerHeatApiImage:
+    description: image
+    type: string
+  ContainerHeatApiConfigImage:
+    description: The container image to use for the heat_api config_volume
+    type: string
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry. Use
+                 parameter_merge_strategies to merge it with the defaults.
+    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
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+outputs:
+  role_data:
+    description: Role data for the Heat Ephemeral
+    value:
+      service_name: heat_ephemeral
+      upgrade_tasks: []
+      deploy_steps_tasks:
+        - name: Tag Ephemeral Heat Containers for Overcloud Deploy
+          when:
+            - step|int == 5
+          block:
+            - name: Tag Heat All image
+              import_role:
+                name: tripleo_container_tag
+              vars:
+                container_image: {get_param: ContainerHeatAllImage}
+                container_image_latest: "localhost/tripleo/openstack-heat-all:ephemeral"
+            - name: Tag Heat Engine image
+              import_role:
+                name: tripleo_container_tag
+              vars:
+                container_image: {get_param: ContainerHeatEngineImage}
+                container_image_latest: "localhost/tripleo/openstack-heat-engine:ephemeral"
+            - name: Tag Heat Api image
+              import_role:
+                name: tripleo_container_tag
+              vars:
+                container_image: {get_param: ContainerHeatApiImage}
+                container_image_latest: "localhost/tripleo/openstack-heat-api:ephemeral"

environments/undercloud.yaml

@@ -16,6 +16,8 @@ resource_registry:
 
   OS::TripleO::Services::OpenStackClients: ../deployment/clients/openstack-clients-baremetal-ansible.yaml
 
+  OS::TripleO::Services::HeatEphemeral: ../deployment/heat/heat-ephemeral-container-ansible.yaml
+
   # services we disable by default on the undercloud
   OS::TripleO::Services::AodhApi: OS::Heat::None
   OS::TripleO::Services::AodhEvaluator: OS::Heat::None

overcloud-resource-registry-puppet.j2.yaml

@@ -132,6 +132,7 @@ resource_registry:
   OS::TripleO::Services::HeatApiCfn: deployment/heat/heat-api-cfn-container-puppet.yaml
   OS::TripleO::Services::HeatApiCloudwatch: deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
   OS::TripleO::Services::HeatEngine: deployment/heat/heat-engine-container-puppet.yaml
+  OS::TripleO::Services::HeatEphemeral: OS::Heat::None
   OS::TripleO::Services::Kernel: deployment/kernel/kernel-baremetal-ansible.yaml
   OS::TripleO::Services::MySQL: deployment/database/mysql-pacemaker-puppet.yaml
   OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None

roles/Undercloud.yaml

@@ -47,6 +47,7 @@
     - OS::TripleO::Services::HeatApi
     - OS::TripleO::Services::HeatApiCfn
     - OS::TripleO::Services::HeatEngine
+    - OS::TripleO::Services::HeatEphemeral
     - OS::TripleO::Services::UndercloudTLS
     - OS::TripleO::Services::UndercloudRemoveNovajoin
     - OS::TripleO::Services::IronicApi

roles_data_undercloud.yaml

@@ -50,6 +50,7 @@
     - OS::TripleO::Services::HeatApi
     - OS::TripleO::Services::HeatApiCfn
     - OS::TripleO::Services::HeatEngine
+    - OS::TripleO::Services::HeatEphemeral
     - OS::TripleO::Services::UndercloudTLS
     - OS::TripleO::Services::UndercloudRemoveNovajoin
     - OS::TripleO::Services::IronicApi