diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-10-10 01:12:03 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-10-10 01:12:03 +0000 |
commit | a7ac57e4b9d5a6a82e6826342d9afea88670c710 (patch) | |
tree | e23dc9f3e165867ddaeabb1f51dc007dc075f3e8 /puppet | |
parent | bd2c98f10b48bbe40f0622f9164c608894d19808 (diff) | |
parent | 167e3d497c7cbdb687da0063060c4b0aac420558 (diff) |
Merge "Fix cold/live migration network config" into stable/pike
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/services/nova-base.yaml | 3 | ||||
-rw-r--r-- | puppet/services/nova-migration-target.yaml | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index 08302ee9..55392086 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -159,7 +159,8 @@ outputs: service_name: nova_base config_settings: map_merge: - - nova::rabbit_password: {get_param: RabbitPassword} + - nova::my_ip: {get_param: [ServiceNetMap, NovaApiNetwork]} + nova::rabbit_password: {get_param: RabbitPassword} nova::rabbit_userid: {get_param: RabbitUserName} nova::rabbit_use_ssl: {get_param: RabbitClientUseSSL} nova::rabbit_port: {get_param: RabbitClientPort} diff --git a/puppet/services/nova-migration-target.yaml b/puppet/services/nova-migration-target.yaml index 0c2b419e..e121d37a 100644 --- a/puppet/services/nova-migration-target.yaml +++ b/puppet/services/nova-migration-target.yaml @@ -55,8 +55,14 @@ outputs: tripleo::profile::base::nova::migration::target::ssh_localaddrs: - "%{hiera('cold_migration_ssh_inbound_addr')}" - "%{hiera('live_migration_ssh_inbound_addr')}" - live_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaLibvirtNetwork]} - cold_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaColdMigrationNetwork]} + live_migration_ssh_inbound_addr: + get_param: + - ServiceNetMap + - str_replace: + template: "ROLENAMEHostnameResolveNetwork" + params: + ROLENAME: {get_param: RoleName} + cold_migration_ssh_inbound_addr: {get_param: [ServiceNetMap, NovaApiNetwork]} tripleo::profile::base::sshd::port: - 22 - {get_param: MigrationSshPort} |