diff --git a/README.markdown b/README.markdown index 9facbb5..651bb47 100644 --- a/README.markdown +++ b/README.markdown @@ -332,7 +332,7 @@ Valid options: `transparent`, `learn`, `stateless` ##### `vpp_routing_node` Specifies the routing node for VPP deployment. A non-empty string will create config file -org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg with routing-node set. +org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg with routing-node set. Default: `''` diff --git a/manifests/config.pp b/manifests/config.pp index 921965d..0f1fb5c 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -95,14 +95,14 @@ #configure VPP routing node if ! empty($::opendaylight::vpp_routing_node) { - file { 'org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg': + file { 'org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg': ensure => file, - path => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg', + path => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg', owner => 'odl', group => 'odl', } file_line { 'routing-node': - path => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg', + path => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg', line => "routing-node=${::opendaylight::vpp_routing_node}", match => '^routing-node=.*$', } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cd3b618..e6bf094 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -338,23 +338,23 @@ def vpp_routing_node_tests(options = {}) routing_node = options.fetch(:routing_node, '') if routing_node.empty? - it { should_not contain_file('org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg') } + it { should_not contain_file('org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg') } it { should_not contain_file_line('routing-node') } else # Confirm properties of Karaf config file # NB: These hashes don't work with Ruby 1.8.7, but we # don't support 1.8.7 so that's okay. See issue #36. it { - should contain_file('org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg').with( + should contain_file('org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg').with( 'ensure' => 'file', - 'path' => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg', + 'path' => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg', 'owner' => 'odl', 'group' => 'odl', ) } it { should contain_file_line('routing-node').with( - 'path' => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.cfg', + 'path' => '/opt/opendaylight/etc/org.opendaylight.groupbasedpolicy.neutron.vpp.mapper.startup.cfg', 'line' => "routing-node=#{routing_node}", 'match' => '^routing-node=.*$', )