GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Preview-Experimental Support EL10 as Management Server and KVM host (… · shapeblue/cloudstack@6b4adbb

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

agent/bindir
- cloud-setup-agent.in
- libvirtqemuhook.in
client/bindir
- cloud-setup-management.in
python/lib/cloudutils
- syscfg.py
- utilities.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎agent/bindir/cloud-setup-agent.in‎`

Copy file name to clipboardExpand all lines: agent/bindir/cloud-setup-agent.in

+13Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,19 @@ import os`
`20`	`20`	`import logging`
`21`	`21`	`import sys`
`22`	`22`	`import socket`
	`23`	`+`
	`24`	`+# ---- This snippet of code adds the sources path and the waf configured PYTHONDIR to the Python path ----`
	`25`	`+# ---- We do this so cloud_utils can be looked up in the following order:`
	`26`	`+# ---- 1) Sources directory`
	`27`	`+# ---- 2) waf configured PYTHONDIR`
	`28`	`+# ---- 3) System Python path`
	`29`	`+for pythonpath in (`
	`30`	`+ "@PYTHONDIR@",`
	`31`	`+ os.path.join(os.path.dirname(__file__),os.path.pardir,os.path.pardir,"python","lib"),`
	`32`	`+ ):`
	`33`	`+ if os.path.isdir(pythonpath): sys.path.insert(0,pythonpath)`
	`34`	`+# ---- End snippet of code ----`
	`35`	`+`
`23`	`36`	`from cloudutils.cloudException import CloudRuntimeException, CloudInternalException`
`24`	`37`	`from cloudutils.utilities import initLoging, bash`
`25`	`38`	`from cloudutils.configFileOps import configFileOps`

Collapse file

`‎agent/bindir/libvirtqemuhook.in‎`

Copy file name to clipboardExpand all lines: agent/bindir/libvirtqemuhook.in

+13Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,19 @@ import sys`
`20`	`20`	`import os`
`21`	`21`	`import subprocess`
`22`	`22`	`from threading import Timer`
	`23`	`+`
	`24`	`+# ---- This snippet of code adds the sources path and the waf configured PYTHONDIR to the Python path ----`
	`25`	`+# ---- We do this so cloud_utils can be looked up in the following order:`
	`26`	`+# ---- 1) Sources directory`
	`27`	`+# ---- 2) waf configured PYTHONDIR`
	`28`	`+# ---- 3) System Python path`
	`29`	`+for pythonpath in (`
	`30`	`+ "@PYTHONDIR@",`
	`31`	`+ os.path.join(os.path.dirname(__file__),os.path.pardir,os.path.pardir,"python","lib"),`
	`32`	`+ ):`
	`33`	`+ if os.path.isdir(pythonpath): sys.path.insert(0,pythonpath)`
	`34`	`+# ---- End snippet of code ----`
	`35`	`+`
`23`	`36`	`from xml.dom.minidom import parse`
`24`	`37`	`from cloudutils.configFileOps import configFileOps`
`25`	`38`	`from cloudutils.networkConfig import networkConfig`

Collapse file

`‎client/bindir/cloud-setup-management.in‎`

Copy file name to clipboardExpand all lines: client/bindir/cloud-setup-management.in

+14Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,27 @@`
`16`	`16`	`# specific language governing permissions and limitations`
`17`	`17`	`# under the License.`
`18`	`18`
	`19`	`+import os`
`19`	`20`	`import sys`
	`21`	`+# ---- This snippet of code adds the sources path and the waf configured PYTHONDIR to the Python path ----`
	`22`	`+# ---- We do this so cloud_utils can be looked up in the following order:`
	`23`	`+# ---- 1) Sources directory`
	`24`	`+# ---- 2) waf configured PYTHONDIR`
	`25`	`+# ---- 3) System Python path`
	`26`	`+for pythonpath in (`
	`27`	`+ "@PYTHONDIR@",`
	`28`	`+ os.path.join(os.path.dirname(__file__),os.path.pardir,os.path.pardir,"python","lib"),`
	`29`	`+ ):`
	`30`	`+ if os.path.isdir(pythonpath): sys.path.insert(0,pythonpath)`
	`31`	`+# ---- End snippet of code ----`
	`32`	`+`
`20`	`33`	`from cloudutils.syscfg import sysConfigFactory`
`21`	`34`	`from cloudutils.utilities import initLoging, UnknownSystemException`
`22`	`35`	`from cloudutils.cloudException import CloudRuntimeException, CloudInternalException`
`23`	`36`	`from cloudutils.globalEnv import globalEnv`
`24`	`37`	`from cloudutils.serviceConfigServer import cloudManagementConfig`
`25`	`38`	`from optparse import OptionParser`
	`39`	`+`
`26`	`40`	`if __name__ == '__main__':`
`27`	`41`	`initLoging("@MSLOGDIR@/setupManagement.log")`
`28`	`42`	`glbEnv = globalEnv()`

Collapse file

`‎python/lib/cloudutils/syscfg.py‎`

Copy file name to clipboardExpand all lines: python/lib/cloudutils/syscfg.py

+4-3Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,11 @@ def getAgent(glbEnv):`
`39`	`39`	`return sysConfigAgentUbuntu(glbEnv)`
`40`	`40`	`elif distribution == "CentOS" or distribution == "RHEL5":`
`41`	`41`	`return sysConfigEL5(glbEnv)`
`42`		`- elif distribution == "Fedora" or distribution == "RHEL6":`
	`42`	`+ elif distribution == "RHEL6":`
`43`	`43`	`return sysConfigEL6(glbEnv)`
`44`	`44`	`elif distribution == "RHEL7":`
`45`	`45`	`return sysConfigEL7(glbEnv)`
`46`		`- elif distribution in ["RHEL8", "RHEL9"]:`
	`46`	`+ elif distribution in ["Fedora", "RHEL8", "RHEL9", "RHEL10"]:`
`47`	`47`	`return sysConfigEL(glbEnv)`
`48`	`48`	`elif distribution == "SUSE":`
`49`	`49`	`return sysConfigSUSE(glbEnv)`
`@@ -183,9 +183,10 @@ def __init__(self, glbEnv):`
`183`	`183`	`networkConfigRedhat(self),`
`184`	`184`	`libvirtConfigRedhat(self),`
`185`	`185`	`firewallConfigAgent(self),`
	`186`	`+ nfsConfig(self),`
`186`	`187`	`cloudAgentConfig(self)]`
`187`	`188`
`188`		`-#it covers RHEL6/Fedora13/Fedora14`
	`189`	`+#it covers RHEL6`
`189`	`190`	`class sysConfigEL6(sysConfigAgentRedhatBase):`
`190`	`191`	`def __init__(self, glbEnv):`
`191`	`192`	`super(sysConfigEL6, self).__init__(glbEnv)`

Collapse file

`‎python/lib/cloudutils/utilities.py‎`

Copy file name to clipboardExpand all lines: python/lib/cloudutils/utilities.py

+4Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,10 @@ def __init__(self):`
`124`	`124`	`version.find("Red Hat Enterprise Linux release 9") != -1 or version.find("Linux release 9.") != -1 or`
`125`	`125`	`version.find("Linux release 9") != -1):`
`126`	`126`	`self.distro = "RHEL9"`
	`127`	`+ elif (version.find("Red Hat Enterprise Linux Server release 10") != -1 or version.find("Scientific Linux release 10") != -1 or`
	`128`	`+ version.find("Red Hat Enterprise Linux release 10") != -1 or version.find("Linux release 10.") != -1 or`
	`129`	`+ version.find("Linux release 10") != -1):`
	`130`	`+ self.distro = "RHEL10"`
`127`	`131`	`elif version.find("CentOS") != -1:`
`128`	`132`	`self.distro = "CentOS"`
`129`	`133`	`else:`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.