Merge pull request #132 from Mirantis/pr_add_novnc_haproxy
add novncproxy under haproxy
diff --git a/haproxy/proxy/listen/openstack/novnc.yml b/haproxy/proxy/listen/openstack/novnc.yml
new file mode 100644
index 0000000..9646651
--- /dev/null
+++ b/haproxy/proxy/listen/openstack/novnc.yml
@@ -0,0 +1,25 @@
+parameters:
+ haproxy:
+ proxy:
+ listen:
+ nova_novnc:
+ type: general-service
+ service_name: http
+ check: false
+ binds:
+ - address: ${_param:cluster_vip_address}
+ port: 6080
+ servers:
+ - name: ctl01
+ host: ${_param:cluster_node01_address}
+ port: 6080
+ params: check
+ - name: ctl02
+ host: ${_param:cluster_node02_address}
+ port: 6080
+ params: check
+ - name: ctl03
+ host: ${_param:cluster_node03_address}
+ port: 6080
+ params: check
+
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index c9d8a07..545a432 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -3,6 +3,7 @@
- service.nova.control.cluster
- service.keepalived.cluster.single
- system.haproxy.proxy.listen.openstack.nova
+- system.haproxy.proxy.listen.openstack.novnc
parameters:
_param:
nova_vncproxy_url: http://${_param:cluster_vip_address}:6080
@@ -30,6 +31,7 @@
private_address: ${_param:cluster_local_address}
public_address: ${_param:cluster_vip_address}
public_name: ${_param:cluster_vip_address}
+ novncproxy_address: ${_param:cluster_local_address}
novncproxy_port: 6080
database:
engine: mysql