Change in vdsm[master]: vds_boostrap: rename rhevm to engine

[Roy Golan]

Roy Golan has uploaded a new change for review.

Change subject: vds_boostrap: rename rhevm to engine
......................................................................

vds_boostrap: rename rhevm to engine

Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
---
M vds_bootstrap/vds_bootstrap.py
M vdsm_reg/config.py
M vdsm_reg/deployUtil.py.in
M vdsm_reg/vdsm-reg-setup
M vdsm_reg/vdsm-reg.conf.in
5 files changed, 28 insertions(+), 28 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/11/311/1
--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: vds_boostrap: rename rhevm to engine
......................................................................

Patch Set 1: Verified; Looks good to me, but someone else must approve

I have tested this change, worked like a charm. The interface now is 'engine'.

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Douglas Schilling Landgraf

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: vds_boostrap: rename rhevm to engine
......................................................................

Patch Set 1: I would prefer that you didn't submit this

Douglas, did you verify both ovirt-node registration and installation over rhel?

Please mention the relevant BZ(s) in the commit message (753571 753879 I suppose).

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf

Ayal Baron has posted comments on this change.

Change subject: vds_boostrap: rename rhevm to engine
......................................................................

Patch Set 2: I would prefer that you didn't submit this

"engine" is a lousy non descriptive name for the bridge and it's not clear who is using it.
bridge name should either be vdsm or something like virt

In addition, it is not at all clear to me why ovirt relies on a specific name for the bridge being present.  vdsm should just mark the bridge used to communicate with backend or something.

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan

Saggi Mizrahi has posted comments on this change.

Change subject: vds_boostrap: rename rhevm to engine
......................................................................

Patch Set 3: I would prefer that you didn't submit this

(1 inline comment)

Just change to commit message and I'll +1 you

....................................................
Commit Message
Line 9: http://bugzilla.redhat.com/753879
You should change the comment to
BZ#753879, BZ#753571 - vds_boostrap: rename rhevm to engine

Dan has scripts that paras this stuff

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan 
Gerrit-Reviewer: Saggi Mizrahi

Ayal Baron has posted comments on this change.

Change subject: vds_boostrap: rename rhevm to engine
......................................................................

Patch Set 3: I would prefer that you didn't submit this

"engine" is a non-descriptive name.
Please change to either 'vdsm' which at least lets admin know who created the bridge and would enable her to understand what it's used for or find another name which would be more meaningful.
Outside of the engine host, 'engine' has very little meaning.

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan 
Gerrit-Reviewer: Saggi Mizrahi

Ayal Baron has posted comments on this change.

Change subject: vds_boostrap: rename rhevm to engine
......................................................................

Patch Set 4: I would prefer that you didn't submit this

Please find a different name for the bridge, 'engine' is just not a good name for it.

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan 
Gerrit-Reviewer: Saggi Mizrahi

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: vds_boostrap: rename rhevm to engine
......................................................................

Patch Set 4:

Sorry Ayal, just ignore this patchset. I was trying to create a remote branch. :/

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan 
Gerrit-Reviewer: Saggi Mizrahi

Chris Wright has posted comments on this change.

Change subject: vds_boostrap: rename rhevm to engine
......................................................................

Patch Set 4:

I agree that engine is not a great bridge name.
1) Why does it need a special name at all?
2) Isn't there a plan to remove need to have mgmt/vdsm traffic go over a bridge?

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Chris Wright 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan 
Gerrit-Reviewer: Saggi Mizrahi

Change in vdsm[master]: rename rhevm bridge to brVDSM

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rename rhevm bridge to brVDSM
......................................................................

Patch Set 6: Verified

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Chris Wright 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan 
Gerrit-Reviewer: Saggi Mizrahi

Change in vdsm[master]: rename rhevm bridge to brVDSM

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: rename rhevm bridge to brVDSM
......................................................................

Patch Set 6: I would prefer that you didn't submit this

(6 inline comments)

....................................................
File vdsm_reg/config.py.in
Line 34: config.set('vars', 'vdc_authkeys_path', '/@VDSMBRIDGE@.ssh.key.txt')
huh? this makes no sense. this should probably change to "engine", as this is ovirt-engine's path.

Hmmm. it seems that no one is even using this configurable... Please verify the utter removal is more sensible.

....................................................
File vdsm_reg/deployUtil.py.in
Line 87: REMOTE_SSH_KEY_FILE = "/@vdsmbridge@.ssh.key.txt"
this one IS used, and I would guess that this would have to remain.
we may need another constant for this name - depending on the location in Engine - /brVdsm.ssh.key.txt makes no sense.

Line 347:         logging.debug("Bridge @vdsmbridge@ already exists.")
Here we have a local variable MGT_BRIDGE_NAME, let's use it instead of ac macro games.

Line 559:             if key != '\n' and not key.endswith("== @vdsmbridge@") or key.startswith("#"):
here "rhevm" is not the name of the bridge, but the name of the key owner. We should write the line with "ovirt-engine" in the end, not brVDSM.

Line 1383:     vdsmCert = getRemoteFile(str(IP), str(port), RHEVM_CERT_FILE)
too brutal sed here! this is the engine's cert, not vdsm's.

....................................................
File vdsm_reg/vdsm-reg.conf.in
Line 15: vdc_authkeys_path=/@VDSMBRIDGE@.ssh.key.txt
I believe this should die die die, but please recheck.

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Chris Wright 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan 
Gerrit-Reviewer: Saggi Mizrahi

Change in vdsm[master]: rename rhevm bridge to brVDSM

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rename rhevm bridge to brVDSM
......................................................................

Patch Set 7: Verified

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Chris Wright 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan 
Gerrit-Reviewer: Saggi Mizrahi

Change in vdsm[master]: rename rhevm bridge to brVDSM

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: rename rhevm bridge to brVDSM
......................................................................

Patch Set 7: I would prefer that you didn't submit this

(5 inline comments)

please not that vdsm_cli/vdscli.py.in:49 still has

proposed_addr = netinfo.ifconfig()['rhevm']['addr']

which should be changed, too. It would much nicer if clientIF._getServerIP() is moved to netinfo, and used by vdscli (in a separate patch).

....................................................
File vds_bootstrap/vds_bootstrap.py.in
Line 598:         #add @VDSMBRIDGE@ bridge
all replacements in this file is of logging strings and comments. Do we really need autoconf for that? wouldn't it be more economical to say "management bridge" instead?

....................................................
File vdsm_reg/deployUtil.py.in
Line 87: REMOTE_SSH_KEY_FILE = "/engine.ssh.key.txt"
wouldn't this kill registration to RHEV-3.0 ?

Line 559:             if key != '\n' and not key.endswith("== ovirt-engine") or key.startswith("#"):
this has to be a well-defined constant. and again, this change kills registration to rhev-m-3.0.

Line 779:                 "supported! Please configure " + MGT_BRIDGE_NAME + " bridge manually and re-install.")
now it's easy to break this line!

Line 1421:     parser.add_option("-d", "--download-" + MGT_BRIDGE_NAME + "-cert", action="store_true",
that's "engine" here!

and it must be the same as in the caller script vdsm_reg/vdsm-config

python "$DEPLOY_UTIL" --download-rhevm-cert --server-address="$vdc_managment_server" --server-port="$vdc_managment_port" --fingerprint="$management_server_fingerprint"

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Chris Wright 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan 
Gerrit-Reviewer: Saggi Mizrahi

Change in vdsm[master]: rename rhevm bridge to brVDSM

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: rename rhevm bridge to brVDSM
......................................................................

rename rhevm bridge to brVDSM

Remove rhevm as bridge and use brVDSM
http://bugzilla.redhat.com/753879
http://bugzilla.redhat.com/753571

Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
---
M configure.ac
M vds_bootstrap/vds_bootstrap.py
M vdsm_cli/Makefile.am
M vdsm_cli/vdscli.py.in
M vdsm_reg/Makefile.am
M vdsm_reg/config.py
M vdsm_reg/deployUtil.py.in
R vdsm_reg/vdsm-reg-setup.in
8 files changed, 32 insertions(+), 28 deletions(-)

Approvals:
  Dan Kenigsberg: Verified; Looks good to me, approved

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Chris Wright 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan 
Gerrit-Reviewer: Saggi Mizrahi

Change in vdsm[master]: rename rhevm bridge to brVDSM

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: rename rhevm bridge to brVDSM
......................................................................

Patch Set 11: Verified; Looks good to me, approved

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Chris Wright 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan 
Gerrit-Reviewer: Saggi Mizrahi

Change in vdsm[master]: rename rhevm bridge to brVDSM

Itamar Heim has posted comments on this change.

Change subject: rename rhevm bridge to brVDSM
......................................................................

Patch Set 11: (1 inline comment)

....................................................
Commit Message
Line 7: rename rhevm bridge to brVDSM
are we still calling it brVDSM although it may be bridgeless?

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Chris Wright 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan 
Gerrit-Reviewer: Saggi Mizrahi

Change in vdsm[master]: rename rhevm bridge to brVDSM

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: rename rhevm bridge to brVDSM
......................................................................

Patch Set 11: (2 inline comments)

Reviewing late again.

....................................................
File vdsm_cli/Makefile.am
Line 38: 	    -e "s,[@]VDSMBRIDGE[@],$(vdsmbridge),g" \
Bear in mind that this is an hack. The substitutions must be used *only* for macros containing paths and not for regular constants.

....................................................
File vdsm_reg/Makefile.am
Line 56: 	    -e "s,[@]VDSMBRIDGE[@],$(vdsmbridge),g"
Same hack here.

--
To view, visit http://gerrit.ovirt.org/311
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id1c98658af80ad52a14934a962be4945c91ff48d
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Roy Golan 
Gerrit-Reviewer: Ayal Baron 
Gerrit-Reviewer: Chris Wright 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Douglas Schilling Landgraf 
Gerrit-Reviewer: Roy Golan 
Gerrit-Reviewer: Saggi Mizrahi