Commit 0c7e0e78 authored by Alain Takoudjou's avatar Alain Takoudjou

Set working eggs, fix md5 and loggin informations

parent dfb8e86f
...@@ -275,12 +275,15 @@ config-custom_domain = $${slap-parameter:domain} ...@@ -275,12 +275,15 @@ config-custom_domain = $${slap-parameter:domain}
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
vnc-backend-url = https://[$${novnc-instance:ip}]:$${novnc-instance:port}/vnc_auto.html?host=[$${novnc-instance:ip}]&port=$${novnc-instance:port}&encrypt=1&password=$${kvm-instance:vnc-passwd} vnc-backend-url = https://[$${novnc-instance:ip}]:$${novnc-instance:port}/vnc_auto.html?host=[$${novnc-instance:ip}]&port=$${novnc-instance:port}&encrypt=1&password=$${kvm-instance:vnc-passwd}
vnc-url = $${request-slave-frontend:connection-url}/vnc_auto.html?host=$${request-slave-frontend:connection-domainname}&port=$${request-slave-frontend:connection-port}&encrypt=1&path=$${request-slave-frontend:connection-resource}&password=$${kvm-instance:vnc-passwd} vnc-url = $${request-slave-frontend:connection-url}/vnc_auto.html?host=$${request-slave-frontend:connection-domainname}&port=$${request-slave-frontend:connection-port}&encrypt=1&path=$${request-slave-frontend:connection-resource}&password=$${kvm-instance:vnc-passwd}
ssh = ssh stack@$${tunnel-ipv6-ssh:ipv6} -p $${tunnel-ipv6-ssh:ipv6-port} ssh = ssh $${slap-parameter:system-user}@$${tunnel-ipv6-ssh:ipv6} -p $${tunnel-ipv6-ssh:ipv6-port}
ssh-defaul-passwd = openstack ssh-defaul-passwd = $${slap-parameter:system-passwd}
openstack-services-passwd = $${master-passwd:passwd} openstack-url = $${request-openstack-frontend:connection-site_url}/horizon
openstack-url = $${request-openstack-frontend:connection-site_url}
openstack-vnc = $${request-openstack-vnc-frontend:connection-url}/vnc_auto.html openstack-vnc = $${request-openstack-vnc-frontend:connection-url}/vnc_auto.html
openstack-services-host = $${slap-network-information:global-ipv6} openstack-services-host = $${slap-network-information:global-ipv6}
openstack-services-passwd = $${master-passwd:passwd}
openstack-project = $${slap-parameter:project}
openstack-admin-user = admin
openstack-project-user = $${slap-parameter:user-name}
[frontend-promise] [frontend-promise]
recipe = slapos.cookbook:check_url_available recipe = slapos.cookbook:check_url_available
...@@ -319,11 +322,14 @@ nbd-port = 1024 ...@@ -319,11 +322,14 @@ nbd-port = 1024
nbd-host = 2001:470:1f14:169:dd6b:3f84:9205:6218 nbd-host = 2001:470:1f14:169:dd6b:3f84:9205:6218
nbd2-port = 1024 nbd2-port = 1024
nbd2-host = nbd2-host =
#Create this user and password on system
system-user = stack system-user = stack
system-passwd = openstack system-passwd = openstack
#Project name and user-name for openstack. Password is generated by SlapOS
project = slapos project = slapos
user-name = slapos user-name = slapos
glance-image-url = http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img glance-image-url = http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img
glance-image-name = cirros-0.3.1-x86_64 glance-image-name = cirros-0.3.1-x86_64
......
...@@ -35,7 +35,7 @@ eggs = ...@@ -35,7 +35,7 @@ eggs =
[template-openstack-main] [template-openstack-main]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-main.cfg url = ${:_profile_base_location_}/instance-main.cfg
md5sum = bf86f17749961de846ef191bf96c8ad1 md5sum = 8e0090858793239c602137da88e7d6be
output = ${buildout:directory}/template-openstack-main.cfg output = ${buildout:directory}/template-openstack-main.cfg
mode = 0644 mode = 0644
...@@ -154,3 +154,104 @@ signature-certificate-list = ...@@ -154,3 +154,104 @@ signature-certificate-list =
-----END CERTIFICATE----- -----END CERTIFICATE-----
[versions] [versions]
Jinja2 = 2.7.1
MarkupSafe = 0.18
Werkzeug = 0.9.4
apache-libcloud = 0.13.2
async = 0.6.1
buildout-versions = 1.7
cliff = 1.4.5
cmd2 = 0.6.7
gitdb = 0.5.4
itsdangerous = 0.23
lxml = 3.2.4
meld3 = 0.6.10
paramiko = 1.12.0
plone.recipe.command = 1.1
pyOpenSSL = 0.13.1
pycrypto = 2.6.1
pyparsing = 2.0.1
requests = 2.0.1
slapos.recipe.build = 0.12
slapos.recipe.cmmi = 0.2
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.5
slapos.toolbox = 0.37.4
smmap = 0.8.2
websockify = 0.5.1
z3c.recipe.scripts = 1.0.1
# Required by:
# slapos.core==0.35.1
# slapos.toolbox==0.37.4
Flask = 0.10.1
# Required by:
# slapos.toolbox==0.37.4
GitPython = 0.3.2.RC1
# Required by:
# slapos.toolbox==0.37.4
atomize = 0.1.1
# Required by:
# paramiko==1.12.0
ecdsa = 0.10
# Required by:
# slapos.toolbox==0.37.4
feedparser = 5.1.3
# Required by:
# slapos.cookbook==0.83.1
inotifyx = 0.2.0-1
# Required by:
# slapos.cookbook==0.83.1
lock-file = 2.0
# Required by:
# slapos.cookbook==0.83.1
netaddr = 0.7.10
# Required by:
# slapos.core==0.35.1
netifaces = 0.8-1
# Required by:
# websockify==0.5.1
numpy = 1.8.0
# Required by:
# slapos.toolbox==0.37.4
psutil = 1.1.3
# Required by:
# slapos.core==0.35.1
pyflakes = 0.7.3
# Required by:
# slapos.cookbook==0.83.1
pytz = 2013.8
# Required by:
# slapos.cookbook==0.83.1
# slapos.toolbox==0.37.4
slapos.core = 0.35.1
# Required by:
# slapos.core==0.35.1
supervisor = 3.0
# Required by:
# slapos.core==0.35.1
unittest2 = 0.5.1
# Required by:
# slapos.cookbook==0.83.1
# slapos.toolbox==0.37.4
xml-marshaller = 0.9.7
# Required by:
# slapos.core==0.35.1
zope.interface = 4.0.5
\ No newline at end of file
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