Merge "Nova RPC unpinning"

diff --cc puppet/compute.yaml
index 1101261,b0b9c02..35b57e7
--- 1/puppet/compute.yaml
--- 2/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}

diff --cc puppet/controller.yaml
Simple merge