diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-08-10 17:35:30 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-08-15 13:07:58 -0400 |
| commit | 4e05d138c67bcbb2b991b6b2a49bea3603d2ce1c (patch) | |
| tree | ec90ec4e6b41fc80691fdd7de03cc18bac911461 /puppet/services/nova-vncproxy.yaml | |
| parent | 9a1590fc0622a6b565c06f98558dfff91d83fb9c (diff) | |
Move Nova settings out of puppet/compute.yaml
This finishes moving most of the config settings out of
compute.yaml for Nova and into the proper nova-* services.
Only the bind port/VIP related Nova settings remain now and those
will be dealt with in a follow up patch.
Change-Id: I1c40e7d54c11dfff2aaa6438c7701e98da17ebe6
Related-Bug: #1604412
Diffstat (limited to 'puppet/services/nova-vncproxy.yaml')
| -rw-r--r-- | puppet/services/nova-vncproxy.yaml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/services/nova-vncproxy.yaml b/puppet/services/nova-vncproxy.yaml index 0b9cef38..a1517011 100644 --- a/puppet/services/nova-vncproxy.yaml +++ b/puppet/services/nova-vncproxy.yaml @@ -25,5 +25,15 @@ outputs: map_merge: - get_attr: [NovaBase, role_data, config_settings] - nova::vncproxy::enabled: true + nova::vncproxy::common::vncproxy_protocol: {get_param: [EndpointMap, NovaVNCProxyPublic, protocol]} + # Remove brackets that may come if the IP address is IPv6. + # For DNS names and IPv4, this will just get NovaVNCProxyPublic + nova::vncproxy::common::vncproxy_host: + str_replace: + template: {get_param: [EndpointMap, NovaVNCProxyPublic, host]} + params: + '[': '' + ']': '' + nova::vncproxy::common::vncproxy_port: {get_param: [EndpointMap, NovaVNCProxyPublic, port]} step_config: | include tripleo::profile::base::nova::vncproxy |