x/compass-adapters
Code Issues Proposed changes

seperate vnc proxy role

Browse Source 
Change-Id: Ia129106e24af9337ec44812d9686f789829e9dff
This commit is contained in:
SamSu 2014-04-08 11:11:45 -07:00
parent 3eb7f044b4
commit bf9be8b8a1
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
chef/databags/openstack/openstack.json
View File

@ -5,8 +5,9 @@
"os-ops-messaging": "openstack message queue node", "os-ops-messaging": "openstack message queue node",
"os-image": "openstack image node", "os-image": "openstack image node",
"os-ops-database": "openstack database node", "os-ops-database": "openstack database node",
"os-compute-worker": "openstack nova node", "os-compute-worker": "openstack compute node",
"os-ha": "Software load balance node" "os-ha": "Software load balance node",
"os-compute-vncproxy": "vnc proxy"
}, },
"test_roles": { "test_roles": {
"default": ["test-synclog"] "default": ["test-synclog"]
@ -47,7 +48,6 @@
"role_mapping": { "role_mapping": {
"os-controller": { "os-controller": {
"/endpoints/compute/metadata/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"], "/endpoints/compute/metadata/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"],
"/endpoints/compute/novnc/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"],
"/endpoints/compute/service/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"], "/endpoints/compute/service/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"],
"/endpoints/compute/xvpvnc/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"], "/endpoints/compute/xvpvnc/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"],
"/endpoints/ec2/admin/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"], "/endpoints/ec2/admin/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"],
@ -58,6 +58,9 @@
"/endpoints/network/service/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"], "/endpoints/network/service/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"],
"/endpoints/volume/service/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"] "/endpoints/volume/service/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"]
}, },
"os-compute-vncproxy": {
"/endpoints/compute/novnc/host": ["/networking/global/ha_vip", "/networking/interfaces/management/ip"]
},
"os-ops-database": { "os-ops-database": {
"/db/mysql/bind_address": "/networking/interfaces/management/ip" "/db/mysql/bind_address": "/networking/interfaces/management/ip"
}, },
@ -254,6 +257,7 @@
"os-ops-database", "os-ops-database",
"os-ops-messaging", "os-ops-messaging",
"os-controller", "os-controller",
"os-compute-vncproxy",
"os-image", "os-image",
"os-block-storage-worker", "os-block-storage-worker",
"os-network", "os-network",
@ -281,6 +285,7 @@
"os-ops-database", "os-ops-database",
"os-ops-messaging", "os-ops-messaging",
"os-controller", "os-controller",
"os-compute-vncproxy",
"os-image", "os-image",
"os-block-storage-worker", "os-block-storage-worker",
"os-network", "os-network",

2
chef/roles/os-controller.rb
View File

@ -12,6 +12,6 @@ run_list(
'role[os-compute-cert]', 'role[os-compute-cert]',
'role[os-compute-controller]', 'role[os-compute-controller]',
'role[os-compute-scheduler]', 'role[os-compute-scheduler]',
'role[os-compute-vncproxy]', # 'role[os-compute-vncproxy]',
'role[os-network-server]' 'role[os-network-server]'
) )