X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcompute.yaml;h=1790aa0d84c9a487204bca6ebf4965c154b62b51;hb=a02cee9e3ba1311c5782365914ca0758ff413dec;hp=c6dc94d614a1596724b8db0a960ceab744a59117;hpb=388a6f28fa51d3f0931e87ef99809eb43e02c772;p=apex-tripleo-heat-templates.git

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index c6dc94d6..1790aa0d 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
@@ -264,7 +258,6 @@ resources:
             - service_names
             - service_configs
             - compute
-            - ceph_cluster # provided by CephClusterConfig
             - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
             - neutron_bigswitch_data # Optionally provided by ComputeExtraConfigPre
@@ -272,6 +265,7 @@ resources:
             - nova_nuage_data  # Optionally provided by ComputeExtraConfigPre
             - midonet_data # Optionally provided by AllNodesExtraConfig
             - neutron_opencontrail_data  # Optionally provided by ComputeExtraConfigPre
+            - cisco_aci_data # Optionally provided by ComputeExtraConfigPre
           merge_behavior: deeper
           datafiles:
             service_names:
@@ -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