diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-08-24 11:03:09 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-08-24 12:41:05 -0400 |
| commit | b31d80f74c0b34ddfe5365900738819ba94305ee (patch) | |
| tree | fd7ca6328c424b0144ca1aa80a7533efd11bb240 /puppet/services | |
| parent | 95949a297574ee7e823fbeb4d8e7420432dcabe1 (diff) | |
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
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/neutron-ovs-agent.yaml | 7 | ||||
| -rw-r--r-- | puppet/services/nova-compute.yaml | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml index 7520f6f6..2b653612 100644 --- a/puppet/services/neutron-ovs-agent.yaml +++ b/puppet/services/neutron-ovs-agent.yaml @@ -83,5 +83,12 @@ outputs: template: AGENT_EXTENSIONS params: AGENT_EXTENSIONS: {get_param: NeutronAgentExtensions} + # NOTE: bind IP is found in Heat replacing the network name with the + # local node IP for the given network; replacement examples + # (eg. for internal_api): + # internal_api -> IP + # internal_api_uri -> [IP] + # internal_api_subnet - > IP/CIDR + neutron::agents::ml2::ovs::local_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]} step_config: | include ::tripleo::profile::base::neutron::ovs diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml index 1a473a4e..dc962297 100644 --- a/puppet/services/nova-compute.yaml +++ b/puppet/services/nova-compute.yaml @@ -88,7 +88,14 @@ outputs: # example openvswitch. nova::compute::reserved_host_memory: 2048 nova::compute::neutron::libvirt_vif_driver: {get_param: NovaComputeLibvirtVifDriver} - + # NOTE: bind IP is found in Heat replacing the network name with the + # local node IP for the given network; replacement examples + # (eg. for internal_api): + # internal_api -> IP + # internal_api_uri -> [IP] + # internal_api_subnet - > IP/CIDR + nova::compute::vncserver_proxyclient_address: {get_param: [ServiceNetMap, NovaVncProxyNetwork]} + nova::compute::vncproxy_host: {get_param: [EndpointMap, NovaPublic, host]} step_config: | # TODO(emilien): figure how to deal with libvirt profile. # We'll probably treat it like we do with Neutron plugins. |