Commit 686dd0af authored by Alain Takoudjou's avatar Alain Takoudjou

Fix frontend, add promice

parent 64759eee
...@@ -7,8 +7,7 @@ ...@@ -7,8 +7,7 @@
parts = parts =
certificate-authority certificate-authority
kvm-instance kvm-instance
kvm-controller-instance kvm-controller-instance
kvm-promise
tunnel-ipv6-ssh tunnel-ipv6-ssh
tunnel-ipv6-http tunnel-ipv6-http
tunnel-ipv6-https tunnel-ipv6-https
...@@ -22,7 +21,9 @@ parts = ...@@ -22,7 +21,9 @@ parts =
tunnel-ipv6-rabbit tunnel-ipv6-rabbit
tunnel-ipv6-ec2 tunnel-ipv6-ec2
websockify-sighandler websockify-sighandler
kvm-promise
novnc-promise novnc-promise
openstack-frontend-promise
publish-kvm-connection-information publish-kvm-connection-information
eggs-directory = ${buildout:eggs-directory} eggs-directory = ${buildout:eggs-directory}
...@@ -185,7 +186,7 @@ runner-path = $${directory:services}/6tunnel-novadb ...@@ -185,7 +186,7 @@ runner-path = $${directory:services}/6tunnel-novadb
recipe = slapos.cookbook:novnc recipe = slapos.cookbook:novnc
path = $${ca-novnc:executable} path = $${ca-novnc:executable}
ip = $${slap-network-information:global-ipv6} ip = $${slap-network-information:global-ipv6}
port = 6081 port = 6090
vnc-ip = $${gen-kvm-run:vnc_ip} vnc-ip = $${gen-kvm-run:vnc_ip}
vnc-port = $${gen-kvm-run:vnc_port} vnc-port = $${gen-kvm-run:vnc_port}
novnc-location = ${noVNC:location} novnc-location = ${noVNC:location}
...@@ -252,30 +253,36 @@ config = host port ...@@ -252,30 +253,36 @@ config = host port
config-host = $${novnc-instance:ip} config-host = $${novnc-instance:ip}
config-port = $${novnc-instance:port} config-port = $${novnc-instance:port}
return = url resource port domainname return = url resource port domainname
#sla = instance_guid sla = instance_guid
#sla-instance_guid = $${slap-parameter:frontend-instance-guid} sla-instance_guid = $${slap-parameter:frontend-instance-guid}
[request-openstack-frontend] [request-openstack-vnc-frontend]
<= slap-connection
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = Frontend OpenStack software-url = $${slap-parameter:kvm-frontend-url}
# XXX We have hardcoded SR URL here. server-url = $${slap-connection:server-url}
software-url = $${slap-parameter:frontend-software-url} key-file = $${slap-connection:key-file}
cert-file = $${slap-connection:cert-file}
computer-id = $${slap-connection:computer-id}
partition-id = $${slap-connection:partition-id}
name = VNC Frontend
software-type = $${slap-parameter:frontend-software-type}
slave = true slave = true
config = url custom_domain config = host port
config-url = http://[$${slap-network-information:global-ipv6}]:80/ config-host = $${slap-network-information:global-ipv6}
return = site_url config-port = 6080
config-custom_domain = $${slap-parameter:domain} return = url resource port domainname
sla = instance_guid
sla-instance_guid = $${slap-parameter:frontend-instance-guid}
[request-openstack-vnc-frontend] [request-openstack-frontend]
<= slap-connection <= slap-connection
recipe = slapos.cookbook:requestoptional recipe = slapos.cookbook:requestoptional
name = Frontend OpenStack VNC name = Frontend OpenStack
# XXX We have hardcoded SR URL here. # XXX We have hardcoded SR URL here.
software-url = $${slap-parameter:frontend-software-url} software-url = $${slap-parameter:frontend-software-url}
slave = true slave = true
config = url custom_domain config = url custom_domain
config-url = http://[$${slap-network-information:global-ipv6}]:6080/ config-url = http://[$${slap-network-information:global-ipv6}]:80/
return = site_url return = site_url
config-custom_domain = $${slap-parameter:domain} config-custom_domain = $${slap-parameter:domain}
...@@ -285,16 +292,26 @@ vnc-backend-url = https://[$${novnc-instance:ip}]:$${novnc-instance:port}/vnc_au ...@@ -285,16 +292,26 @@ vnc-backend-url = https://[$${novnc-instance:ip}]:$${novnc-instance:port}/vnc_au
vnc-password = $${gen-passwd:passwd} vnc-password = $${gen-passwd: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} 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}
ssh = ssh stack@$${tunnel-ipv6-ssh:ipv6} -p $${tunnel-ipv6-ssh:ipv6-port} ssh = ssh stack@$${tunnel-ipv6-ssh:ipv6} -p $${tunnel-ipv6-ssh:ipv6-port}
server-url = $${request-openstack-frontend:connection-site_url}
openstack-vnc = $${request-openstack-vnc-frontend:connection-site_url}
openstack-services-host = $${slap-network-information:global-ipv6}
ssh-defaul-passwd = openstack ssh-defaul-passwd = openstack
openstack-url = $${request-openstack-frontend:connection-site_url}
openstack-vnc = $${request-openstack-vnc-frontend:connection-url}/vnc_auto.html
openstack-services-host = $${slap-network-information:global-ipv6}
[openstack-frontend-promise]
recipe = slapos.cookbook:check_url_available
path = $${directory:promises}/openstack_frontend
url = $${request-openstack-frontend:connection-site_url}
dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl
match = OpenStack
[slap-parameter] [slap-parameter]
# Default values if not specified # Default values if not specified
frontend-software-type = frontend frontend-software-type = frontend
kvm-frontend-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg kvm-frontend-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg
frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg frontend-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
frontend-instance-guid =
ram-size = 2048 ram-size = 2048
disk-size = 20 disk-size = 20
......
...@@ -27,7 +27,7 @@ eggs = ...@@ -27,7 +27,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 = 2c67b51e981ad2ee404ff6001fa4b901 md5sum = 24d770994adee290b24b090defd5ddf7
output = ${buildout:directory}/template-openstack-main.cfg output = ${buildout:directory}/template-openstack-main.cfg
mode = 0644 mode = 0644
......
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