Merge "Drop step_config from containerized Nova services"

deployment/nova/nova-consoleauth-container-puppet.yaml

@@ -121,8 +121,6 @@ outputs:
             - path: /var/log/nova
               owner: nova:nova
               recurse: true
-      step_config: |
-        include tripleo::profile::base::nova::consoleauth
       docker_config:
         step_4:
           nova_consoleauth:

deployment/nova/nova-metadata-container-puppet.yaml

@@ -194,8 +194,6 @@ outputs:
               nova::db::mysql_api::allowed_hosts:
                 - '%'
                 - "%{hiera('mysql_bind_host')}"
-      step_config: |
-        include tripleo::profile::base::nova::metadata
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: nova_metadata

deployment/nova/nova-migration-target-container-puppet.yaml

@@ -55,16 +55,6 @@ parameters:
     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:
 
   ContainersCommon:
@@ -116,18 +106,6 @@ outputs:
               '113 nova_migration_target':
                 dport:
                   - {get_param: MigrationSshPort}
-      step_config: |
-        include tripleo::profile::base::nova::migration::target
-
-          # NB this prevents the baremetal ssh from listening on port 2022
-          # It doesn't affect the sshd port in the container as we override it below on the sshd cli
-          - tripleo::profile::base::sshd::port: 22
-          - if:
-            - enable_migration_proxy
-            - tripleo::profile::base::nova::migration::proxy::ssh_private_key: {get_param: [ MigrationSshKey, private_key ]}
-              tripleo::profile::base::nova::migration::proxy::target_port: {get_param: DockerNovaMigrationSshdPort}
-              tripleo::profile::base::nova::migration::proxy::target_host: "%{hiera('live_migration_ssh_inbound_addr')}"
-            - {}
       puppet_config:
         config_volume: nova_libvirt
         step_config:

deployment/nova/novajoin-container-puppet.yaml

@@ -116,8 +116,6 @@ outputs:
           '119 novajoin':
             dport:
               - 9090
-      step_config: &step_config |
-        include ::tripleo::profile::base::novajoin
       service_config_settings:
         keystone:
           nova::metadata::novajoin::auth::tenant: 'service'
@@ -158,7 +156,7 @@ outputs:
       puppet_config:
         config_volume: novajoin
         puppet_tags: novajoin_config
-        step_config: *step_config
+        step_config: include ::tripleo::profile::base::novajoin
         config_image: {get_param: DockerNovajoinConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/novajoin_server.json: