Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changing custom-properties to ini_setting #125

Closed
wants to merge 1 commit into from

Conversation

nikolas-hermanns
Copy link

There is no need to have the template of the whole custom.properties. It is enough to change only the lines wanted.

@nikolas-hermanns
Copy link
Author

@dfarrell07 here is the pull request

# Use a template to populate the content
content => template('opendaylight/custom.properties.erb'),
}
if $opendaylight::enable_l3 == 'yes' or $opendaylight::enable_l3 == true {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This actually doesnt do anything anymore with new netvirt. We can remove the enable_l3 parameter. We should actually cut a stable/boron branch, and you can remove this on master.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also consider using str2bool() for cheking values that can be yes or true

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah ok so odl will always be the l3 router now?

value => 'yes',
path => $custom_properties
}
ini_setting {'ovsdb.l3.arp.responder.disable':
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iirc this also does nothing anymore. Need to double check with Sam Hague.

Copy link
Collaborator

@trozet trozet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the idea behind the change. Do you think we could implement a library to do configuration settings similar to puppet-openstacklib?

@nikolas-hermanns
Copy link
Author

I think that is a good idea. do we have a list of possible configuration for odl so that we can catch most of the things?

Some things are configured in xml files. I have not yet found out how to configure xml files with puppet.

@dfarrell07
Copy link
Owner

I have not yet found out how to configure xml files with puppet.

Maybe the xmlfile Puppet module to abstract Augeas.

@nikolas-hermanns
Copy link
Author

What do you think about that?

@trozet
Copy link
Collaborator

trozet commented Jan 18, 2017

@nikolas-hermanns this is just failing now because there are leftover spec tests failing. Can you also remove the spec tests?

@dfarrell07
Copy link
Owner

@nikolas-hermanns this is just failing now because there are leftover spec tests failing. Can you also remove the spec tests?

+1. I wish there was a good way to amend someone else's patch with GitHub like you can with Gerrit, I'd remove them for you.

@dfarrell07
Copy link
Owner

I fixed the Beaker tests in #126, so we can use them to verify this change.

@dfarrell07
Copy link
Owner

This actually doesnt do anything anymore with new netvirt. We can remove the enable_l3 parameter. - @trozet

ah ok so odl will always be the l3 router now? - @nikolas-hermanns

So L3 is enabled by default in the new NetVirt? If so, we need to fix the docs.

Latest stable/boron (pre-SR3) etc/custom.properties:

# ovsdb can be configured with ml2 to perform l3 forwarding. The config below enables that functionality, which is
# disabled by default.
# ovsdb.l3.fwd.enabled=yes

Latest master (pre-Carbon) etc/custom.properties:

# ovsdb can be configured with ml2 to perform l3 forwarding. The config below enables that functionality, which is
# disabled by default.
# ovsdb.l3.fwd.enabled=yes

Do we still want this knob at all? Does new NetVirt respect it? Can you disable L3 with it, and is that useful enough to justify keeping the param?

@dfarrell07
Copy link
Owner

I have a finished version of this patch in #129. Beaker and rspec tests are passing.

@shague
Copy link

shague commented Jan 20, 2017

new netvirt doesn't look at any of the params in the custom.properties. There is no way to disable l3 in the new netvirt. I thought Tim wanted to keep the params around though so that both netvirt versions would be used?

@dfarrell07
Copy link
Owner

new netvirt doesn't look at any of the params in the custom.properties. There is no way to disable l3 in the new netvirt.

Awesome, very good to know, thanks @shague.

thought Tim wanted to keep the params around though so that both netvirt versions would be used?

Tim cut a stable/boron branch that will still have this param. I'm guessing he doesn't want it for Carbon, based on above. @trozet?

@trozet
Copy link
Collaborator

trozet commented Jan 20, 2017

@dfarrell07 Correct. This patch should only go into master.

@dfarrell07
Copy link
Owner

@trozet Okay, cool. So I'll go ahead and merge #129 and abandon this.

Thanks all 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants