Merge "Customize "supported_pci_vendor_devs" for SR-IOV"

[apex-tripleo-heat-templates.git] / puppet / services / nova-vncproxy.yaml

diff --git a/puppet/services/nova-vncproxy.yaml b/puppet/services/nova-vncproxy.yaml
index d8e04cc..0a1785d 100644 (file)
--- a/puppet/services/nova-vncproxy.yaml
+++ b/puppet/services/nova-vncproxy.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Nova Vncproxy service configured with Puppet
 
 parameters:
+  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
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -14,14 +23,28 @@ resources:
   NovaBase:
     type: ./nova-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Nova Vncproxy service.
     value:
-      service_name: nova-vncproxy
+      service_name: nova_vncproxy
       config_settings:
-        get_attr: [NovaBase, role_data, config_settings]
+        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