undersys/proxmaster
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

simplify grid by removing the region

Browse source
This commit is contained in:
deflax 2018-04-02 15:30:42 +03:00
parent 05ce0fc4bc
commit 73f1856c56
2 changed files with 4 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
config.ini.dist
View file

@ -20,21 +20,12 @@ novnc_url = https://panel.example.com/novnc/vnc_lite.html
ssl_cert = /etc/letsencrypt/live/api.example.com/fullchain.pem ssl_cert = /etc/letsencrypt/live/api.example.com/fullchain.pem
ssl_key = /etc/letsencrypt/live/api.example.com/privkey.pem ssl_key = /etc/letsencrypt/live/api.example.com/privkey.pem
[Region]
regionid = 0
fullname = Region#1
ipv4_min = 87.120.110.40
ipv4_max = 87.120.110.240
[fighter] [fighter]
type = proxmox type = proxmox
ipv4 = 2.3.4.5 ipv4 = 2.3.4.5
password = dslfsdfds password = dslfsdfds
regionid = Region
[warrior] [warrior]
type = proxmox type = proxmox
ipv4 = 1.2.3.4 ipv4 = 1.2.3.4
password = sadlaksda password = sadlaksda
regionid = Region

25
plugin.py
View file

@ -20,30 +20,13 @@ def auth(slave_name):
adminuser = ioconfig.parser.get('general', 'adminuser') adminuser = ioconfig.parser.get('general', 'adminuser')
slaveip = ioconfig.parser.get(str(slave_name), 'ipv4') slaveip = ioconfig.parser.get(str(slave_name), 'ipv4')
slavepass = ioconfig.parser.get(str(slave_name), 'password') slavepass = ioconfig.parser.get(str(slave_name), 'password')
slavetype = ioconfig.parser.get(str(slave_name), 'type') proxobject = ProxmoxAPI(slaveip, user=adminuser, password=slavepass, verify_ssl=False)
return proxobject
if slavetype == 'proxmox':
proxobject = ProxmoxAPI(slaveip, user=adminuser, password=slavepass, verify_ssl=False)
return proxobject
def create(json): def create(json):
""" create an unit. returns JSON with data """ """ create an unit. returns JSON with data """
try: region_name = json['region'] #just for the record. slaves are equal in the grid, as long as they are quieried
region_name = json['region'] slave_name = json['slave']
region_id = ioconfig.parser.get(region_name, 'regionid')
region_fullname = ioconfig.parser.get(region_name, 'fullname')
except:
ioconfig.logger.error('grid> region not found')
return None
try:
slave_name = json['slave']
except Exception as e:
ioconfig.logger.warning('grid> slave not predefined. I will query for a capable one.')
#slave_name = str(grid.query_happiness(region_id, weight))
#slave_name = 'warrior'
slave_name = 'lexx'
ioconfig.logger.info('{}> slave selected'.format(slave_name))
proxobject = auth(slave_name) proxobject = auth(slave_name)
real_slave_name = proxobject.cluster.status.get()[0]['name'] real_slave_name = proxobject.cluster.status.get()[0]['name']