summaryrefslogtreecommitdiffstats
path: root/docker/services
diff options
context:
space:
mode:
Diffstat (limited to 'docker/services')
-rw-r--r--docker/services/nova-compute.yaml1
-rw-r--r--docker/services/nova-libvirt.yaml1
-rw-r--r--docker/services/nova-migration-target.yaml36
-rw-r--r--docker/services/sshd.yaml72
4 files changed, 104 insertions, 6 deletions
diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml
index bf7841be..34f56cdf 100644
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@@ -63,7 +63,6 @@ resources:
DefaultPasswords: {get_param: DefaultPasswords}
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
- MigrationSshPort: {get_param: DockerNovaMigrationSshdPort}
outputs:
role_data:
diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml
index d20c093d..c059cfaf 100644
--- a/docker/services/nova-libvirt.yaml
+++ b/docker/services/nova-libvirt.yaml
@@ -105,7 +105,6 @@ resources:
DefaultPasswords: {get_param: DefaultPasswords}
RoleName: {get_param: RoleName}
RoleParameters: {get_param: RoleParameters}
- MigrationSshPort: {get_param: DockerNovaMigrationSshdPort}
outputs:
role_data:
diff --git a/docker/services/nova-migration-target.yaml b/docker/services/nova-migration-target.yaml
index 385343a0..904a042f 100644
--- a/docker/services/nova-migration-target.yaml
+++ b/docker/services/nova-migration-target.yaml
@@ -41,6 +41,29 @@ parameters:
description: Port that dockerized nova migration target sshd service
binds to.
type: number
+ MigrationSshKey:
+ type: json
+ description: >
+ SSH key for migration.
+ Expects a dictionary with keys 'public_key' and 'private_key'.
+ Values should be identical to SSH public/private key files.
+ default:
+ public_key: ''
+ private_key: ''
+ 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:
@@ -74,10 +97,15 @@ outputs:
map_merge:
- get_attr: [SshdBase, role_data, config_settings]
- get_attr: [NovaMigrationTargetBase, role_data, config_settings]
- - tripleo.nova_migration_target.firewall_rules:
- '113 nova_migration_target':
- dport:
- - {get_param: DockerNovaMigrationSshdPort}
+ # 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')}"
+ - {}
step_config: &step_config
list_join:
- "\n"
diff --git a/docker/services/sshd.yaml b/docker/services/sshd.yaml
new file mode 100644
index 00000000..6f57f13d
--- /dev/null
+++ b/docker/services/sshd.yaml
@@ -0,0 +1,72 @@
+heat_template_version: pike
+
+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
+ - ''