flatten sahara service configuration

This change combines the previous puppet and docker files into a single
file that performs the docker service installation and configuration.

With this patch the baremetal version of sahara services has been removed.

Change-Id: I5a555155c881e0e92acc3ebba7b844abdd686e6e
Related-Blueprint: services-yaml-flattening

ci/environments/scenario003-multinode-containers.yaml

@@ -1,8 +1,8 @@
 resource_registry:
   OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
   OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
-  OS::TripleO::Services::SaharaApi: ../../docker/services/sahara-api.yaml
+  OS::TripleO::Services::SaharaApi: ../../deployment/sahara/sahara-api-container-puppet.yaml
-  OS::TripleO::Services::SaharaEngine: ../../docker/services/sahara-engine.yaml
+  OS::TripleO::Services::SaharaEngine: ../../deployment/sahara/sahara-engine-container-puppet.yaml
   OS::TripleO::Services::MistralApi: ../../docker/services/mistral-api.yaml
   OS::TripleO::Services::MistralEngine: ../../docker/services/mistral-engine.yaml
   OS::TripleO::Services::MistralExecutor: ../../docker/services/mistral-executor.yaml

ci/environments/scenario003-standalone.yaml

@@ -6,8 +6,8 @@ resource_registry:
   OS::TripleO::Services::SwiftProxy: OS::Heat::None
   OS::TripleO::Services::SwiftStorage: OS::Heat::None
   OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
-  OS::TripleO::Services::SaharaApi: ../../docker/services/sahara-api.yaml
+  OS::TripleO::Services::SaharaApi: ../../deployment/sahara/sahara-api-container-puppet.yaml
-  OS::TripleO::Services::SaharaEngine: ../../docker/services/sahara-engine.yaml
+  OS::TripleO::Services::SaharaEngine: ../../deployment/sahara/sahara-engine-container-puppet.yaml
   OS::TripleO::Services::MistralApi: ../../docker/services/mistral-api.yaml
   OS::TripleO::Services::MistralEngine: ../../docker/services/mistral-engine.yaml
   OS::TripleO::Services::MistralExecutor: ../../docker/services/mistral-executor.yaml

deployment/sahara/sahara-api-container-puppet.yaml

@@ -45,40 +45,96 @@ parameters:
     default: false
     description: Remove package if the service is being disabled during upgrade
     type: boolean
+  SaharaPassword:
+    description: The password for the sahara service account, used by sahara-api.
+    type: string
+    hidden: true
+  SaharaWorkers:
+    default: 0
+    description: The number of workers for the sahara-api.
+    type: number
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
+  MonitoringSubscriptionSaharaApi:
+    default: 'overcloud-sahara-api'
+    type: string
+  SaharaApiPolicies:
+    description: |
+      A hash of policies to configure for Sahara API.
+      e.g. { sahara-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
+    default: {}
+    type: json
 
 resources:
 
   ContainersCommon:
-    type: ./containers-common.yaml
+    type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
     type: ../../puppet/services/database/mysql-client.yaml
 
-  SaharaApiPuppetBase:
+  SaharaPuppetBase:
-    type: ../../puppet/services/sahara-api.yaml
+    type: ./sahara-base.yaml
     properties:
-      EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
 
 outputs:
   role_data:
     description: Role data for the Sahara API role.
     value:
-      service_name: {get_attr: [SaharaApiPuppetBase, role_data, service_name]}
+      service_name: sahara_api
+      monitoring_subscription: {get_param: MonitoringSubscriptionSaharaApi}
       config_settings:
         map_merge:
-          - get_attr: [SaharaApiPuppetBase, role_data, config_settings]
           - sahara::sync_db: false
+          - get_attr: [SaharaPuppetBase, role_data, config_settings]
+          - sahara::port: {get_param: [EndpointMap, SaharaInternal, port]}
+            sahara::policy::policies: {get_param: SaharaApiPolicies}
+            sahara::service::api::api_workers: {get_param: SaharaWorkers}
+            # NOTE: bind IP is found in hiera replacing the network name with the local node IP
+            # for the given network; replacement examples (eg. for internal_api):
+            # internal_api -> IP
+            # internal_api_uri -> [IP]
+            # internal_api_subnet - > IP/CIDR
+            sahara::host:
+              str_replace:
+                template:
+                  "%{hiera('$NETWORK')}"
+                params:
+                  $NETWORK: {get_param: [ServiceNetMap, SaharaApiNetwork]}
+            tripleo::sahara_api::firewall_rules:
+              '132 sahara':
+                dport:
+                  - 8386
+                  - 13386
       service_config_settings:
-        map_merge:
+        fluentd:
-          - get_attr: [SaharaApiPuppetBase, role_data, service_config_settings]
+          tripleo_fluentd_groups_sahara_api:
-          - fluentd:
+            - sahara
-              tripleo_fluentd_groups_sahara_api:
+          tripleo_fluentd_sources_sahara_api:
-                - sahara
+            - {get_param: SaharaApiLoggingSource}
-              tripleo_fluentd_sources_sahara_api:
+        keystone:
-                - {get_param: SaharaApiLoggingSource}
+          sahara::keystone::auth::tenant: 'service'
+          sahara::keystone::auth::public_url: {get_param: [EndpointMap, SaharaPublic, uri]}
+          sahara::keystone::auth::internal_url: {get_param: [EndpointMap, SaharaInternal, uri]}
+          sahara::keystone::auth::admin_url: {get_param: [EndpointMap, SaharaAdmin, uri]}
+          sahara::keystone::auth::password: {get_param: SaharaPassword }
+          sahara::keystone::auth::region: {get_param: KeystoneRegion}
+        mysql:
+          sahara::db::mysql::password: {get_param: SaharaPassword}
+          sahara::db::mysql::user: sahara
+          sahara::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          sahara::db::mysql::dbname: sahara
+          sahara::db::mysql::allowed_hosts:
+            - '%'
+            - "%{hiera('mysql_bind_host')}"
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: sahara
@@ -86,7 +142,7 @@ outputs:
         step_config:
           list_join:
             - "\n"
-            - - {get_attr: [SaharaApiPuppetBase, role_data, step_config]}
+            - - include ::tripleo::profile::base::sahara::api
               - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerSaharaConfigImage}
       kolla_config:

deployment/sahara/sahara-engine-container-puppet.yaml

@@ -1,7 +1,7 @@
 heat_template_version: rocky
 
 description: >
-  OpenStack Sahara service configured with Puppet
+  OpenStack Sahara service
 
 parameters:
   DockerSaharaEngineImage:
@@ -45,40 +45,44 @@ parameters:
     default: false
     description: Remove package if the service is being disabled during upgrade
     type: boolean
+  MonitoringSubscriptionSaharaEngine:
+    default: 'overcloud-sahara-engine'
+    type: string
 
 resources:
 
   ContainersCommon:
-    type: ./containers-common.yaml
+      type: ../../docker/services/containers-common.yaml
 
   MySQLClient:
     type: ../../puppet/services/database/mysql-client.yaml
 
-  SaharaEnginePuppetBase:
+  SaharaBase:
-    type: ../../puppet/services/sahara-engine.yaml
+    type: ./sahara-base.yaml
     properties:
-      EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
 
 outputs:
   role_data:
     description: Role data for the Sahara Engine role.
     value:
-      service_name: {get_attr: [SaharaEnginePuppetBase, role_data, service_name]}
+      service_name: sahara_engine
+      monitoring_subscription: {get_param: MonitoringSubscriptionSaharaEngine}
       config_settings:
         map_merge:
-          - get_attr: [SaharaEnginePuppetBase, role_data, config_settings]
+          - get_attr: [SaharaBase, role_data, config_settings]
           - sahara::sync_db: false
       service_config_settings:
-        map_merge:
+        fluentd:
-          - get_attr: [SaharaEnginePuppetBase, role_data, service_config_settings]
+          tripleo_fluentd_groups_sahara_engine:
-          - fluentd:
+            - sahara
-              tripleo_fluentd_groups_sahara_engine:
+          tripleo_fluentd_sources_sahara_engine:
-                - sahara
+            - {get_param: SaharaEngineLoggingSource}
-              tripleo_fluentd_sources_sahara_engine:
-                - {get_param: SaharaEngineLoggingSource}
       # BEGIN DOCKER SETTINGS #
       puppet_config:
         config_volume: sahara
@@ -86,7 +90,7 @@ outputs:
         step_config:
           list_join:
             - "\n"
-            - - {get_attr: [SaharaEnginePuppetBase, role_data, step_config]}
+            - - include ::tripleo::profile::base::sahara::engine
               - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: DockerSaharaConfigImage}
       kolla_config:
@@ -119,7 +123,7 @@ outputs:
                     - yaql:
                         expression: str($.data.port)
                         data:
-                          port: {get_attr: [SaharaEnginePuppetBase, role_data, config_settings, 'sahara::rabbit_port']}
+                          port: {get_attr: [SaharaBase, role_data, config_settings, 'sahara::rabbit_port']}
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}

environments/services-baremetal/sahara.yaml

@@ -1,3 +0,0 @@
-resource_registry:
-  OS::TripleO::Services::SaharaApi: ../../puppet/services/sahara-api.yaml
-  OS::TripleO::Services::SaharaEngine: ../../puppet/services/sahara-engine.yaml

environments/services/sahara.yaml

@@ -1,3 +1,3 @@
 resource_registry:
-  OS::TripleO::Services::SaharaApi: ../../docker/services/sahara-api.yaml
+  OS::TripleO::Services::SaharaApi: ../../deployment/sahara/sahara-api-container-puppet.yaml
-  OS::TripleO::Services::SaharaEngine: ../../docker/services/sahara-engine.yaml
+  OS::TripleO::Services::SaharaEngine: ../../deployment/sahara/sahara-engine-container-puppet.yaml

puppet/services/sahara-api.yaml

@@ -1,126 +0,0 @@
-heat_template_version: rocky
-
-description: >
-  OpenStack Sahara API service configured with Puppet
-
-parameters:
-  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.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  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
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  SaharaPassword:
-    description: The password for the sahara service account, used by sahara-api.
-    type: string
-    hidden: true
-  SaharaWorkers:
-    default: 0
-    description: The number of workers for the sahara-api.
-    type: number
-  KeystoneRegion:
-    type: string
-    default: 'regionOne'
-    description: Keystone region for endpoint
-  MonitoringSubscriptionSaharaApi:
-    default: 'overcloud-sahara-api'
-    type: string
-  SaharaApiLoggingSource:
-    type: json
-    default:
-      tag: openstack.sahara.api
-      path: /var/log/sahara/sahara-api.log
-  SaharaApiPolicies:
-    description: |
-      A hash of policies to configure for Sahara API.
-      e.g. { sahara-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
-    default: {}
-    type: json
-
-resources:
-  SaharaBase:
-    type: ./sahara-base.yaml
-    properties:
-      ServiceData: {get_param: ServiceData}
-      ServiceNetMap: {get_param: ServiceNetMap}
-      DefaultPasswords: {get_param: DefaultPasswords}
-      EndpointMap: {get_param: EndpointMap}
-      RoleName: {get_param: RoleName}
-      RoleParameters: {get_param: RoleParameters}
-
-outputs:
-  role_data:
-    description: Role data for the Sahara API role.
-    value:
-      service_name: sahara_api
-      monitoring_subscription: {get_param: MonitoringSubscriptionSaharaApi}
-      config_settings:
-        map_merge:
-          - get_attr: [SaharaBase, role_data, config_settings]
-          - sahara::port: {get_param: [EndpointMap, SaharaInternal, port]}
-            sahara::policy::policies: {get_param: SaharaApiPolicies}
-            sahara::service::api::api_workers: {get_param: SaharaWorkers}
-            # NOTE: bind IP is found in hiera replacing the network name with the local node IP
-            # for the given network; replacement examples (eg. for internal_api):
-            # internal_api -> IP
-            # internal_api_uri -> [IP]
-            # internal_api_subnet - > IP/CIDR
-            sahara::host:
-              str_replace:
-                template:
-                  "%{hiera('$NETWORK')}"
-                params:
-                  $NETWORK: {get_param: [ServiceNetMap, SaharaApiNetwork]}
-            tripleo::sahara_api::firewall_rules:
-              '132 sahara':
-                dport:
-                  - 8386
-                  - 13386
-      service_config_settings:
-        fluentd:
-          tripleo_fluentd_groups_sahara_api:
-            - sahara
-          tripleo_fluentd_sources_sahara_api:
-            - {get_param: SaharaApiLoggingSource}
-      step_config: |
-        include ::tripleo::profile::base::sahara::api
-      service_config_settings:
-        keystone:
-          sahara::keystone::auth::tenant: 'service'
-          sahara::keystone::auth::public_url: {get_param: [EndpointMap, SaharaPublic, uri]}
-          sahara::keystone::auth::internal_url: {get_param: [EndpointMap, SaharaInternal, uri]}
-          sahara::keystone::auth::admin_url: {get_param: [EndpointMap, SaharaAdmin, uri]}
-          sahara::keystone::auth::password: {get_param: SaharaPassword }
-          sahara::keystone::auth::region: {get_param: KeystoneRegion}
-        mysql:
-          sahara::db::mysql::password: {get_param: SaharaPassword}
-          sahara::db::mysql::user: sahara
-          sahara::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
-          sahara::db::mysql::dbname: sahara
-          sahara::db::mysql::allowed_hosts:
-            - '%'
-            - "%{hiera('mysql_bind_host')}"
-      upgrade_tasks:
-        - name: Stop sahara_api service
-          when: step|int == 1
-          service: name=openstack-sahara-api state=stopped

puppet/services/sahara-engine.yaml

@@ -1,73 +0,0 @@
-heat_template_version: rocky
-
-description: >
-  OpenStack Sahara Engine service configured with Puppet
-
-parameters:
-  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.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  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
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  MonitoringSubscriptionSaharaEngine:
-    default: 'overcloud-sahara-engine'
-    type: string
-  SaharaEngineLoggingSource:
-    type: json
-    default:
-      tag: openstack.sahara.engine
-      path: /var/log/sahara/sahara-engine.log
-
-resources:
-  SaharaBase:
-    type: ./sahara-base.yaml
-    properties:
-      ServiceData: {get_param: ServiceData}
-      ServiceNetMap: {get_param: ServiceNetMap}
-      DefaultPasswords: {get_param: DefaultPasswords}
-      EndpointMap: {get_param: EndpointMap}
-      RoleName: {get_param: RoleName}
-      RoleParameters: {get_param: RoleParameters}
-
-outputs:
-  role_data:
-    description: Role data for the Sahara Engine role.
-    value:
-      service_name: sahara_engine
-      monitoring_subscription: {get_param: MonitoringSubscriptionSaharaEngine}
-      config_settings:
-        map_merge:
-          - get_attr: [SaharaBase, role_data, config_settings]
-      service_config_settings:
-        fluentd:
-          tripleo_fluentd_groups_sahara_engine:
-            - sahara
-          tripleo_fluentd_sources_sahara_engine:
-            - {get_param: SaharaEngineLoggingSource}
-      step_config: |
-        include ::tripleo::profile::base::sahara::engine
-      upgrade_tasks:
-        - name: Stop sahara_engine service
-          when: step|int == 1
-          service: name=openstack-sahara-engine state=stopped

releasenotes/notes/drop-baremetal-sahara-f2922322511047de.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+      Installing sahara services on baremetal is no longer supported.