diff options
author | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-09-08 11:21:16 +0300 |
---|---|---|
committer | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2016-09-10 12:43:59 +0300 |
commit | b1c32247a2d724294e1d9a5e4df6c48c525ed300 (patch) | |
tree | de592f46ccd9a75990c6396e0a787b483b6f908e /puppet/services/nova-vncproxy.yaml | |
parent | 6fabca4dafb3fe7f32fb449e406e8616a292ec5e (diff) |
Make Nova VNC Proxy service name match service net map
If these names don't match then we cannot set the service's nodes,
VIP and network.
Change-Id: I8f1c0eaf62eee2704a5f2556a553032106db606b
Closes-Bug: #1621368
Diffstat (limited to 'puppet/services/nova-vncproxy.yaml')
-rw-r--r-- | puppet/services/nova-vncproxy.yaml | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/puppet/services/nova-vncproxy.yaml b/puppet/services/nova-vncproxy.yaml deleted file mode 100644 index ce15fccc..00000000 --- a/puppet/services/nova-vncproxy.yaml +++ /dev/null @@ -1,60 +0,0 @@ -heat_template_version: 2016-04-08 - -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 - via parameter_defaults in the resource registry. - type: json - MonitoringSubscriptionNovaVNCProxy: - default: 'overcloud-nova-vncproxy' - type: string - -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 - monitoring_subscription: {get_param: MonitoringSubscriptionNovaVNCProxy} - 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]} - # NOTE: bind IP is found in Heat replacing the network name with the local node IP - # for the given network; replacement examples (eg. for internal_api): - # internal_api -> IP - # internal_api_uri -> [IP] - # internal_api_subnet - > IP/CIDR - nova::vncproxy::host: {get_param: [ServiceNetMap, NovaApiNetwork]} - step_config: | - include tripleo::profile::base::nova::vncproxy |