diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-10 16:12:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-10 16:12:52 +0000 |
| commit | 87c632ce6e7231793c11eaccf2f5ecf0e15ec310 (patch) | |
| tree | 2912c9ff756ce10b9c295b039cdb9b8e82504e6b /manifests/profile/base/nova.pp | |
| parent | 50e483f77e9d8a322a5afd5a20504b78bd48397c (diff) | |
| parent | 7af9ff39e96acd306bdddcf8f6e48a20fe7ee3f0 (diff) | |
Merge "Move nova cells db sync into nova-api profile"
Diffstat (limited to 'manifests/profile/base/nova.pp')
| -rw-r--r-- | manifests/profile/base/nova.pp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index ab9700f..63adbef 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -50,6 +50,10 @@ # Username for messaging nova queue # Defaults to hiera('nova::rabbit_userid', 'guest') # +# [*messaging_use_ssl*] +# Flag indicating ssl usage. +# Defaults to hiera('nova::rabbit_use_ssl', '0') +# # [*nova_compute_enabled*] # (Optional) Whether or not nova-compute is enabled. # Defaults to false @@ -67,6 +71,7 @@ class tripleo::profile::base::nova ( $messaging_password = hiera('nova::rabbit_password'), $messaging_port = hiera('nova::rabbit_port', '5672'), $messaging_username = hiera('nova::rabbit_userid', 'guest'), + $messaging_use_ssl = hiera('nova::rabbit_use_ssl', '0'), $nova_compute_enabled = false, $step = hiera('step'), ) { @@ -83,6 +88,7 @@ class tripleo::profile::base::nova ( } if hiera('step') >= 4 or (hiera('step') >= 3 and $sync_db) { + $messaging_use_ssl_real = sprintf('%s', bool2num(str2bool($messaging_use_ssl))) # TODO(ccamacho): remove sprintf once we properly type the port, needs # to be a string for the os_transport_url function. class { '::nova' : @@ -92,6 +98,7 @@ class tripleo::profile::base::nova ( 'port' => sprintf('%s', $messaging_port), 'username' => $messaging_username, 'password' => $messaging_password, + 'ssl' => $messaging_use_ssl_real, }), } include ::nova::config |