Merge "flatten sshd service configuration"

docker/services/nova-migration-target.yaml

@@ -71,7 +71,7 @@ resources:
     type: ./containers-common.yaml
 
   SshdBase:
-    type: ../../puppet/services/sshd.yaml
+    type: ../../deployment/sshd/sshd-baremetal-puppet.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceNetMap: {get_param: ServiceNetMap}

docker/services/sshd.yaml

@@ -1,72 +0,0 @@
-heat_template_version: rocky
-
-description: >
-  Configure sshd_config
-
-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
-  MigrationSshPort:
-    default: 2022
-    description: Target port for migration over ssh
-    type: number
-
-conditions:
-
-  # During Ocata->Pike upgrade initially configure the ssh service on port 22
-  # to proxy migration commands to the containerized sshd on port 2022.
-  # When the upgrade converges we can switch migrations over to port 2022.
-  enable_migration_proxy:
-    equals:
-      - {get_param: MigrationSshPort}
-      - 22
-
-resources:
-   SshdBase:
-    type: ../../puppet/services/sshd.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:
-    description: Role data for the ssh
-    value:
-      service_name: sshd
-      config_settings: {get_attr: [SshdBase, role_data, config_settings]}
-      step_config:
-        list_join:
-          - "\n"
-          - - get_attr: [SshdBase, role_data, step_config]
-            - if:
-              - enable_migration_proxy
-              - |
-                include tripleo::profile::base::nova::migration::proxy
-              - ''

environments/baremetal-services.yaml

@@ -51,7 +51,7 @@ resource_registry:
   OS::TripleO::Services::Qdr: OS::Heat::None
   OS::TripleO::Services::RabbitMQ: ../puppet/services/rabbitmq.yaml
   OS::TripleO::Services::Redis: ../puppet/services/database/redis.yaml
-  OS::TripleO::Services::Sshd: ../puppet/services/sshd.yaml
+  OS::TripleO::Services::Sshd: ../deployment/sshd/sshd-baremetal-puppet.yaml
   OS::TripleO::Services::SwiftDispersion: ../puppet/services/swift-dispersion.yaml
   OS::TripleO::Services::SwiftProxy: ../puppet/services/swift-proxy.yaml
   OS::TripleO::Services::SwiftRingBuilder: ../puppet/services/swift-ringbuilder.yaml

overcloud-resource-registry-puppet.j2.yaml

@@ -189,7 +189,7 @@ resource_registry:
   OS::TripleO::Services::Tuned: deployment/tuned/tuned-baremetal-puppet.yaml
   OS::TripleO::Services::Securetty: OS::Heat::None
   OS::TripleO::Services::SELinux: OS::Heat::None
-  OS::TripleO::Services::Sshd: docker/services/sshd.yaml
+  OS::TripleO::Services::Sshd: deployment/sshd/sshd-baremetal-puppet.yaml
   OS::TripleO::Services::Redis: docker/services/database/redis.yaml
   OS::TripleO::Services::NovaApi: docker/services/nova-api.yaml
   OS::TripleO::Services::NovaCompute: docker/services/nova-compute.yaml

tools/yaml-validate.py

@@ -228,8 +228,6 @@ PREFERRED_CAMEL_CASE = {
 # If a filename is not found in the overrides then the top level directory is
 # used to determine which validation method to use.
 VALIDATE_PUPPET_OVERRIDE = {
-  # docker/service/sshd.yaml is a variation of the puppet sshd service
-  './docker/services/sshd.yaml': True,
   # docker/services/messaging/*.yaml provide oslo_messaging services
   './docker/services/messaging/notify-rabbitmq-shared.yaml': False,
   './docker/services/messaging/notify-rabbitmq.yaml': False,
@@ -248,8 +246,6 @@ VALIDATE_PUPPET_OVERRIDE = {
 
 }
 VALIDATE_DOCKER_OVERRIDE = {
-  # docker/service/sshd.yaml is a variation of the puppet sshd service
-  './docker/services/sshd.yaml': False,
   # docker/services/messaging/notify-rabbitmq-shared.yaml does not
   # deploy container
   './docker/services/messaging/notify-rabbitmq-shared.yaml': False,