From b31d80f74c0b34ddfe5365900738819ba94305ee Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Wed, 24 Aug 2016 11:03:09 -0400
Subject: Move network bind IPs out of compute.yaml

This patch moves the local bind host hiera data out
of compute.yaml and into composable services.

Change-Id: Iae4ca707c429cc8f5ec4d1d514ae7da0bf557dfd
---
 puppet/compute.yaml | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'puppet/compute.yaml')

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index c6dc94d6..dbf2f610 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -42,9 +42,6 @@ parameters:
   NodeIndex:
     type: number
     default: 0
-  NovaApiHost:
-    type: string
-    default: ''  # Has to be here because of the ignored empty value bug
   NovaComputeExtraConfig:
     default: {}
     description: |
@@ -54,9 +51,6 @@ parameters:
   NovaComputeIPs:
     default: {}
     type: json
-  NovaPublicIP:
-    type: string
-    default: ''  # Has to be here because of the ignored empty value bug
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -288,11 +282,6 @@ resources:
               mapped_data: {get_param: ExtraConfig}
             compute:
               mapped_data:
-                nova_api_host: {get_input: nova_api_host}
-                nova::compute::vncproxy_host: {get_input: nova_public_ip}
-                nova::compute::vncserver_proxyclient_address: {get_input: nova_vnc_proxyclient_address}
-                neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
-
                 tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
 
   NovaComputeDeployment:
@@ -303,10 +292,6 @@ resources:
       config: {get_resource: NovaComputeConfig}
       server: {get_resource: NovaCompute}
       input_values:
-        nova_public_ip: {get_param: NovaPublicIP}
-        nova_api_host: {get_param: NovaApiHost}
-        nova_vnc_proxyclient_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaVncProxyNetwork]}]}
-        neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
 
   # Resource for site-specific injection of root certificate
-- 
cgit 1.2.3-korg