Skip to content

S
slapos
Commit 38322167 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin
Browse files
Options

Update occi manifest and configuration

parent 905dbe57
Hide whitespace changes
Inline Side-by-side
Showing with 329 additions and 68 deletions
slapos/recipe/occi/__init__.py
View file @ 38322167
...@@ -40,11 +40,14 @@ class Recipe(GenericBaseRecipe): ...@@ -40,11 +40,14 @@ class Recipe(GenericBaseRecipe):
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_config_parameters))
path_list.append(os_config_file) path_list.append(os_config_file)
# Put modified accords configuration file
#XXX-TODO
# Initiate configuration # Initiate configuration
Popen('./accords-config', Popen('./accords-config',
cwd=poc_location cwd=poc_location
......
slapos/recipe/occi/template/accords.in 0 → 100644
View file @ 38322167
#!/bin/sh
#Should be #!(dash_location)s
#Workaround
LD_LIBRARY_PATH=%(accords_lib_directory)s
POC=%(poc_location)s
MANIFEST=%(manifest_name)s
cd $POC
./co-start
./co-parser $MANIFEST
./co-broker $MANIFEST
slapos/recipe/occi/template/accords.xml.in 0 → 100644
View file @ 38322167
<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
slapos/recipe/occi/template/coips.xml.in 0 → 100644
View file @ 38322167
<?xml version="1.0" encoding="UTF8"?>
<manifest name="coips:model" xmlns="http://www.compatibleone.fr/schemes/cords.xsd">
<description>Infrastructure profile used by production tool</description>
<node name="coips:model">
<infrastructure name="coips:model">
<compute name="coips:model" cores="1" speed="1GHz" architecture="x686" memory="1GB"/>
<storage name="coips:model" size="10GB" type="SATA"/>
<network name="coips:model" vlan="true" label="database"/>
</infrastructure>
</node>
</manifest>
\ No newline at end of file
slapos/recipe/occi/template/os-config.xml.in deleted 100644 → 0
View file @ 905dbe57
<os_configs>
<os_config
id="e1f892e3-0001-4326-8866-9354b95d3b17"
name="%(userid)s"
user="%(userid)s"
password="%(password)s"
namespace="%(domain)s"
description="ACCORDS rocks"
agent=’OpenStackClient/1.0a.0.01’
host=’http://94.143.114.137:5000/v2.0/’
version="v1.1"
authenticate=""
base=""
tls="0"
current="0" />
</os_configs>
\ No newline at end of file
slapos/recipe/occi/template/os_config.xml.in 0 → 100644
View file @ 38322167
<os_configs>
<os_config
id="e1f892e3-slap-slap-slap-9354b95d3b17"
name="slaposrecipe"
description="Configuration of Account used by slapos recipe"
user="%(userid)s"
password="%(password)s"
authenticate=""
agent="CompatibleOne/OpenStackClient/1.0a.0.01"
host="http://94.143.114.137:5000/v2.0/"
version="v1.1"
namespace="%(domain)s"
base=""
tls="0"
current="0"
/>
</os_configs>
\ No newline at end of file
software/occi-xwiki/xwiki.manifest.xml
View file @ 38322167
<?xml version="1.0" encoding="UTF8"?> <?xml version="1.0" encoding="UTF8"?>
<manifest name="pocxwiki" xmlns="http://www.compatibleone.fr/schemes/cords.xsd"> <manifest name="test2" xmlns="http://www.compatibleone.fr/schemes/cords.xsd">
<description>This manifest describes the CompatibleOne XWIKI Proof of Concept, comprising <description>test 1 : open stack small compute</description>
two appliance nodes, a web application server front end connected to a backe end sql database engine and whilst allowing public access to service instances of the manifest restricts administration access to the list of persons described in the account section.</description>
<node name="Sqldatabase">
<infrastructure name="database">
<compute name="FastDualCore" cores="2" speed="3GHz" architecture="x686" memory="8GB"/>
<storage name="LargeDisk" size="1TB" type="SATA"/>
<network name="EtherNet" vlan="true" label="database"/>
</infrastructure>
<image name="MySQL">
<system name="debian squeeze"/>
<package name="MySql"/>
<package name="XwikiData"/>
<package name="XwikiDataPatch"/>
</image>
</node>
<node name="Xwiki">
<infrastructure name="LAMPServer">
<compute name="FastQuadCore" cores="4" speed="3GHz" architecture="x686" memory="32GB"/>
<storage name="MediumDisk" size="160GB" type="SATA"/>
<network name="EtherNet" vlan="true" label="database"/>
</infrastructure>
<image name="Xwiki">
<system name="debian squeeze"/>
<package name="Apache"/>
<package name="Php" version="5"/>
<package name="TomCat"/>
<package name="XwikiApplication"/>
<package name="XwikiCodePatch"/>
</image>
</node>
<configuration>
<action type="cordscript" expression="Xwiki.configure(Sqldatabase.hostname);"/>
</configuration>
<security name="public" level="public"/>
<account name="poc1">
<user name="fabio"/>
<user name="Jamie"/>
<user name="stephane"/>
<user name="brian"/>
<user name="jean"/>
</account>
<node name="test2" type="simple" access="public" scope="normal" provider="openstack" >
<infrastructure name="test2">
<compute name="test2" architecture="x86" cores="1" memory="1G" speed="1G"/>
<storage name="test2" size="10G"/>
<network name="test2" label="ethernet" vlan="100M"/1>
</infrastructure>
<image name="test2">
<system name="debian_with_cosacs"/>
<package
name="test2"
installation="mkdir /home/cosacs/vifib"
configuration="cp /home/cosacs/cosacs.xml /home/cosacs/vifib"
/>
</image>
</node>
<configuration name="test2">
<action name="test2_1" expression="test2.x='1';"/>
<action name="test2_2" expression="test2.y='2';"/>
<action name="test2_3" expression="test2.z='3';"/>
</configuration>
<interface name="test2"/>
<account name="slaposrecipe"/>
<security name="test2"/>
</manifest> </manifest>
\ No newline at end of file
stack/occi/instance-occi.cfg
View file @ 38322167
...@@ -15,13 +15,13 @@ offline = true ...@@ -15,13 +15,13 @@ offline = true
recipe = slapos.cookbook:occi recipe = slapos.cookbook:occi
# Options # Options
userid = hardcode userid = cedric.de
password = hardcode password = phahghae
domain = hardcode domain = domain
#userid = $${slap-parameter:userid} #userid = $${slap-parameter:userid}
#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
# Paths # Paths
manifest-source = ${occi-manifest:location}/${occi-manifest:filename} manifest-source = ${occi-manifest:location}/${occi-manifest:filename}
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7