Add rudimentary windows support for bcfg2 #391
Conversation
|
|
||
| def FindExtra(self): | ||
| """Locate extra Windows services.""" | ||
| return [] |
There was a problem hiding this comment.
Shouldn't it possible to get the list of services, that are scheduled to start automatically? Maybe something like this would work:
Get-WMIObject win32_service -Filter "StartMode = 'auto'" | Format-Table Name -HideTableHeaders
There was a problem hiding this comment.
Just found the python wmi module. Maybe we just want to rely on this, instead "parsing" the output of powershell scripts.
There was a problem hiding this comment.
I have thought about this too, but decided against it because the WMI module is not included in the standard version of python for windows and, at least in my environment, it is extremely difficult to deploy extra pip packages onto windows servers (especially when I consider updating these packages).
src/lib/Bcfg2/Client/__init__.py
Outdated
| os.unlink(Bcfg2.Options.setup.lockfile) | ||
| else: | ||
| lockfile = open(file, 'w') | ||
| fcntl.lockf(lockfile.fileno(), fcntl.LOCK_UN) |
There was a problem hiding this comment.
I think, this does not work (quote from flock(2) man page):
If a process uses open(2) (or similar) to obtain more than one file descriptor for the same file, these file descriptors are treated independently by flock(). An attempt to lock the file using one of these file descriptors may be denied by a lock that the calling process has already placed via another file descriptor.
I do not know if python will cache the fd from above, but I would not rely on this.
There was a problem hiding this comment.
I have implemented an completely new locking mechanism which should solve the problem on windows and on Linux. See class Flock in Utils.py
|
Oh wow, thanks. The errors reported by travis-ci, seems only style issues. That should be fixable. Would you mind to fix the obvious stuff (like line too long)? I don't like the |
src/lib/Bcfg2/Client/__init__.py
Outdated
| @@ -201,7 +201,8 @@ def run_probe(self, probe): | |||
| try: | |||
| fileending = '' | |||
| if os.name == 'nt': | |||
| (interpreter, fileending) = probe.attrib.get('interpreter').split('*') | |||
| (interpreter, fileending) = | |||
There was a problem hiding this comment.
There is a \ missing at the end of the line.
|
@AlexanderS |
|
Wow, that looks great. @solj What do you think? |
|
|
||
| def RunAction(self, entry): | ||
| """This method handles command execution and status return.""" | ||
| shell = True |
There was a problem hiding this comment.
Should this default to False? It seems to me like this block of code will always result in shell = True
| ans = safe_input(prompt) | ||
| if ans not in ['y', 'Y']: | ||
| return False | ||
| if False: |
|
You are right i have fixed the issues |
|
Any chance to get this included? I would love to see this upstream. |
|
@chschenk It looks like the exception clauses you're using in Utils.py don't work with < python 2.6. Can you modify those so they don't use the "except Exception as" clause? |
This pull request adds rudimentary windows support to bcfg2. The most changes are in the probe and the locking sections:
-Probes
The shebangline of the probes have to be in the format "#!C:\Path\to\interpreter.exe*.fileending" because windows refuses to run files without an fileending. An example shebangline would be "#!C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe*.ps1"
-Locking
Unfortunately windows has no fcntl so that locking under windows is done by writing the pid into the lockfile
-Tools
For managing windows i have written three Tools: WinAction, WinFS, WinService
-WinAction handles the default Action entrys. Example entry
<Action name='test' command="echo test > C:\test.txt" timing="post" when="always" status="check"/>-WinFS handles Path entrys. Example entrys
<Path name='/%ProgramFiles%/test/test.txt'/>or<Path name='/C:/test.txt'/>. Currently the options owner, group and mode are ignored completly.-WinService handles service entrys and starts, stops or restarts the services via powershell. Example Entry:
<Service name='icinga2' type='windows' status="on" />