Add support for specific IP

parent 1811622b
...@@ -35,18 +35,25 @@ class Recipe(GenericBaseRecipe): ...@@ -35,18 +35,25 @@ class Recipe(GenericBaseRecipe):
poc_location = self.buildout['pocdirectory']['poc'] poc_location = self.buildout['pocdirectory']['poc']
# Generate os-config.xml # Generate os-config.xml
os_config_parameters = dict( os_configuration_parameter_dict = dict(
userid=self.options['userid'], userid=self.options['userid'],
password=self.options['password'], password=self.options['password'],
domain=self.options['domain'], domain=self.options['domain'],
) )
os_config_file = self.createFile(self.options['os-config'], os_config_file = self.createFile(self.options['os-config'],
self.substituteTemplate(self.getTemplateFilename('os_config.xml.in'), self.substituteTemplate(self.getTemplateFilename('os_config.xml.in'),
os_config_parameters)) os_configuration_parameter_dict))
path_list.append(os_config_file) path_list.append(os_config_file)
# Put modified accords configuration file # Put modified accords configuration file
#XXX-TODO accords_configuration_parameter_dict = dict(
listen_ip = self.options['listen-ip']
)
accords_configuration_file_location = self.createFile(
self.options['accords-configuration-file'],
self.substituteTemplate(self.getTemplateFilename('accords.ini.in'),
accords_configuration_parameter_dict))
path_list.append(accords_configuration_file_location)
# Initiate configuration # Initiate configuration
Popen('./accords-config', Popen('./accords-config',
...@@ -62,6 +69,7 @@ class Recipe(GenericBaseRecipe): ...@@ -62,6 +69,7 @@ class Recipe(GenericBaseRecipe):
# Generate wrapper # Generate wrapper
wrapper_config_dict = dict( wrapper_config_dict = dict(
dash_location=self.options['dash-location'],
poc_location=poc_location, poc_location=poc_location,
manifest_name=self.options['manifest-name'], manifest_name=self.options['manifest-name'],
# XXX this is workaround # XXX this is workaround
......
# REST host (default: 127.0.0.1)
resthost=%(listen_ip)s
# REST port (default: 8086)
#restport=8086
# Target (default: ./accords.xml)
#target=accords.xml
# Acitvate TLS (default: 0)
#tls=0
# Activate monitoring (default: 1)
#monitor=1
# Trace (default: 1)
#trace=1
# Threads (default:1)
#threads=1
# Be verbose (default: 1)
#verbose=0
# Debug (default: 1)
#debug=1
# Domain (default: occi)
#domain=occi
# Operator (default: accords)
#operator=accords
# Password (default: co-system)
#password=co-system
\ No newline at end of file
<accords>
<publisher>
<rest host='%(local_ip)s' port='8086'/>
<security admin='admin' pass='admin' authorise='0' monitor='1'
tls=''/>
<memory file='publications.xml' autosave='1'/>
<domain name='occi'/>
</publisher>
<coss
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8087'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8087'/>
<security
user='service-coss'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</coss>
<comons
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8088'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8088'/>
<security
user='service-comons'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</comons>
<coes
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8089'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8089'/>
<security
user='service-coes'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</coes>
<conets
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8090'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8090'/>
<security
user='service-conets'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</conets>
<coobas
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8091'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8091'/>
<security
user='service-coobas'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</coobas>
<parser
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8092'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8092'/>
<security
user='service-parser'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</parser>
<broker
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8093'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8093'/>
<security
user='service-broker'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</broker>
<procci
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8094'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8094'/>
<security
user='service-procci'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</procci>
<osprocci
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8095'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8095'/>
<security
user='service-osprocci'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</osprocci>
<onprocci
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8096'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8096'/>
<security
user='service-onprocci'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</onprocci>
<azprocci
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8097'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8097'/>
<security
user='service-azprocci'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</azprocci>
<fileserver
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8098'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8098'/>
<security
user='service-fileserver'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</fileserver>
<ezvm
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8099'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8099'/>
<security
user='service-ezvm'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</ezvm>
<coips
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8100'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8100'/>
<security
user='service-coips'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</coips>
<coees
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8101'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8101'/>
<security
user='service-coees'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</coees>
<cosacs
publisher='http://%(local_ip)s:8086'
operator='accords'
identity='%(local_ip)s:8286'
verbose='0'
debug='0'
threads='1'>
<rest host='%(local_ip)s' port='8286'/>
<security
user='service-cosacs'
password='co-system'
monitor='1'
tls=''/>
<domain name='occi'/>
</cosacs>
</accords>
\ No newline at end of file
...@@ -22,8 +22,10 @@ domain = domain ...@@ -22,8 +22,10 @@ domain = domain
#password = $${slap-parameter:password} #password = $${slap-parameter:password}
#domain = $${slap-parameter:domain} #domain = $${slap-parameter:domain}
os-config = $${pocdirectory:poc}/os_config.xml os-config = $${pocdirectory:poc}/os_config.xml
listen-ip = $${slap-network-information:local-ipv4}
# Paths # Paths
accords-configuration-file = $${pocdirectory:poc}/accords.ini
manifest-source = ${occi-manifest:target} manifest-source = ${occi-manifest:target}
manifest-destination = $${pocdirectory:poc}/manifest.xml manifest-destination = $${pocdirectory:poc}/manifest.xml
manifest-name = $${pocdirectory:poc}/manifest.xml manifest-name = $${pocdirectory:poc}/manifest.xml
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment