From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 26 Feb 2016 15:40:55 +0000 (+0000)
Subject: Merge "Nova RPC unpinning"
X-Git-Tag: opnfv-6.0.0~2160
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=41872c839cb81818dc00f9e93b96c70e9c790c8a;p=apex-tripleo-heat-templates.git

Merge "Nova RPC unpinning"
---

41872c839cb81818dc00f9e93b96c70e9c790c8a
diff --cc puppet/compute.yaml
index 1101261e,b0b9c023..35b57e75
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@@ -550,11 -552,9 +555,12 @@@ resources
          nova_enable_rbd_backend: {get_param: NovaEnableRbdBackend}
          cinder_enable_rbd_backend: {get_param: CinderEnableRbdBackend}
          nova_vnc_proxyclient_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaVncProxyNetwork]}]}
 +        nova_vncproxy_protocol: {get_param: [EndpointMap, NovaVNCProxyPublic, protocol]}
 +        nova_vncproxy_host: {get_param: [EndpointMap, NovaVNCProxyPublic, host]}
 +        nova_vncproxy_port: {get_param: [EndpointMap, NovaVNCProxyPublic, port]}
          nova_ovs_bridge: {get_param: NovaOVSBridge}
          nova_security_group_api: {get_param: NovaSecurityGroupAPI}
+         upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute}
          ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
          ceilometer_password: {get_param: CeilometerPassword}
          ceilometer_compute_agent: {get_param: CeilometerComputeAgent}