Commit 997efa12 authored by Boxiang Sun's avatar Boxiang Sun

kvm: port fixup

parent b461c3d2
...@@ -19,7 +19,7 @@ md5sum = abd8493f35e153a5984ed22c8fe49792 ...@@ -19,7 +19,7 @@ md5sum = abd8493f35e153a5984ed22c8fe49792
[template-kvm] [template-kvm]
filename = instance-kvm.cfg.jinja2 filename = instance-kvm.cfg.jinja2
md5sum = 780332c37e5b7ad4f799bab417685fe9 md5sum = 2b66607d372ac1bda66a686491dde4d0
[template-kvm-cluster] [template-kvm-cluster]
filename = instance-kvm-cluster.cfg.jinja2.in filename = instance-kvm-cluster.cfg.jinja2.in
......
...@@ -670,8 +670,8 @@ context = ...@@ -670,8 +670,8 @@ context =
[kvm-nginx-port] [kvm-nginx-port]
recipe = slapos.cookbook:free_port recipe = slapos.cookbook:free_port
minimum = 6080 minimum = 6180
maximum = 6100 maximum = 6200
ip = {{ partition_ipv6 }} ip = {{ partition_ipv6 }}
[nginx-params] [nginx-params]
...@@ -893,7 +893,7 @@ tap-ipv4 = {{ slap_configuration.get('tap-ipv4-addr', '') }} ...@@ -893,7 +893,7 @@ tap-ipv4 = {{ slap_configuration.get('tap-ipv4-addr', '') }}
tap-ipv6 = {{ slap_configuration.get('tap-ipv6-addr', '') }} tap-ipv6 = {{ slap_configuration.get('tap-ipv6-addr', '') }}
{% endif -%} {% endif -%}
{% set kvm_http = 'http://${slap-network-information:local-ipv4}:' ~ slapparameter_dict.get('httpd-port', 8081) -%} {% set kvm_http = 'http://${slap-network-information:local-ipv4}:' ~ slapparameter_dict.get('httpd-port', ${kvm-slapos-parameter-port:port}) -%}
{% if enable_http %} {% if enable_http %}
{% if use_nat -%} {% if use_nat -%}
{% set kvm_http = 'http://10.0.2.100' -%} {% set kvm_http = 'http://10.0.2.100' -%}
......
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