diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-10-06 18:48:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-06 18:48:40 +0000 |
| commit | a498848f5977ed6d1226f2f6b426bc5355c01f68 (patch) | |
| tree | 4b4cccb69fe17ace1f9966bd5a7b134616c652b0 /build/puppet-neutron/manifests/agents | |
| parent | 95a344a46144d88cdac35bc02a463b6e3d7eab8c (diff) | |
| parent | 412b07f4f621dfc4881fbd2105ab82d7dd7a98be (diff) | |
Merge "VPP version update"
Diffstat (limited to 'build/puppet-neutron/manifests/agents')
| -rw-r--r-- | build/puppet-neutron/manifests/agents/ml2/networking-vpp.pp | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/build/puppet-neutron/manifests/agents/ml2/networking-vpp.pp b/build/puppet-neutron/manifests/agents/ml2/networking-vpp.pp index c25c2817..6184e006 100644 --- a/build/puppet-neutron/manifests/agents/ml2/networking-vpp.pp +++ b/build/puppet-neutron/manifests/agents/ml2/networking-vpp.pp @@ -21,20 +21,34 @@ # tuples mapping physical network names to agent's node-specific physical # network interfaces. Defaults to empty list. # -# [*flat_network_if*] -# VPP interface used for flat network -# Defaults to ''. +# [*etcd_host*] +# etcd server host name/ip +# Defaults to 127.0.0.1. +# +# [*etcd_port*] +# etcd server listening port. +# Defaults to 4001. # class neutron::agents::ml2::networking-vpp ( $package_ensure = 'present', $enabled = true, $manage_service = true, $physnets = '', - $flat_network_if = '', + $etcd_host = '127.0.0.1', + $etcd_port = 4001, ) { include ::neutron::params + Neutron_agent_vpp<||> ~> Service['networking-vpp-agent'] + + neutron_agent_vpp { + 'ml2_vpp/physnets': value => $physnets; + 'ml2_vpp/etcd_host': value => $etcd_host; + 'ml2_vpp/etcd_port': value => $etcd_port; + 'DEFAULT/host': value => $::fqdn; + } + if $manage_service { if $enabled { $service_ensure = 'running' @@ -43,14 +57,9 @@ class neutron::agents::ml2::networking-vpp ( } } - neutron_plugin_ml2 { - 'ml2_vpp/physnets': value => $physnets; - 'ml2_vpp/flat_network_if': value => $flat_network_if; - }-> service { 'networking-vpp-agent': - ensure => $service_ensure, - name => 'networking-vpp-agent', - enable => $enabled, - tag => 'neutron-service', + ensure => $service_ensure, + name => 'networking-vpp-agent', + enable => $enabled, } }
\ No newline at end of file |