diff options
| author |   Dan Prince <dprince@redhat.com> | 2015-05-28 10:35:56 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-05-28 15:32:16 -0400 |
| commit | 78c5ba2c01f08208adc8e859fb717b1161debb8a (patch) | |
| tree | 25b269ffddb9fcc8bb1d4c39e5e7263e61540ae4 /puppet/compute-puppet.yaml | |
| parent | a2e6eb9f06c03f1150bfe9cfbb978cca60b75c5c (diff) | |
Use heat inputs for network port settings
This patch updates the controller and compute roles
so that we use get_input in the software configuration
instead of calling get_attr/get_param there.
Change-Id: I1dc11987b4ea3c37775b14fbdddb75588499e9bb
Diffstat (limited to 'puppet/compute-puppet.yaml')
| -rw-r--r-- | puppet/compute-puppet.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml index 28a4e045..d2cca8fb 100644 --- a/puppet/compute-puppet.yaml +++ b/puppet/compute-puppet.yaml @@ -365,7 +365,7 @@ resources: neutron::rabbit_port: {get_input: rabbit_client_port} neutron_flat_networks: {get_input: neutron_flat_networks} neutron_host: {get_input: neutron_host} - neutron::agents::ml2::ovs::local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronLocalIp]}]} + neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip} neutron_tenant_network_type: {get_input: neutron_tenant_network_type} neutron_tunnel_types: {get_input: neutron_tunnel_types} @@ -421,7 +421,7 @@ resources: - {get_param: GlancePort} neutron_flat_networks: {get_param: NeutronFlatNetworks} neutron_host: {get_param: NeutronHost} - neutron_local_ip: {get_attr: [NovaCompute, networks, ctlplane, 0]} + neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronLocalIp]}]} neutron_tenant_network_type: {get_param: NeutronNetworkType} neutron_tunnel_types: {get_param: NeutronTunnelTypes} neutron_network_vlan_ranges: {get_param: NeutronNetworkVLANRanges} |