openstack/zun
Code Issues Proposed changes

Merge "MultiHost support"

Browse Source
This commit is contained in:
Jenkins 2017-05-18 14:55:03 +00:00 committed by Gerrit Code Review
commit b335f23644
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/zun
View File

@ -265,7 +265,7 @@ function create_zun_conf {
iniset $ZUN_CONF etcd etcd_port "$ZUN_ETCD_PORT" iniset $ZUN_CONF etcd etcd_port "$ZUN_ETCD_PORT"
iniset $ZUN_CONF websocket_proxy wsproxy_port "$ZUN_WEBSOCKET_PROXY_PORT" iniset $ZUN_CONF websocket_proxy wsproxy_port "$ZUN_WEBSOCKET_PROXY_PORT"
iniset $ZUN_CONF websocket_proxy wsproxy_host "$ZUN_WEBSOCKET_PROXY_IP" iniset $ZUN_CONF websocket_proxy wsproxy_host "$ZUN_WEBSOCKET_PROXY_IP"
iniset $ZUN_CONF api host_ip 0.0.0.0 iniset $ZUN_CONF api host_ip "$ZUN_SERVICE_HOST"
iniset $ZUN_CONF api port "$ZUN_SERVICE_PORT" iniset $ZUN_CONF api port "$ZUN_SERVICE_PORT"
iniset $ZUN_CONF oslo_policy policy_file $ZUN_POLICY_JSON iniset $ZUN_CONF oslo_policy policy_file $ZUN_POLICY_JSON

10
devstack/settings
View File

@ -16,9 +16,13 @@
# OVS_PHYSICAL_BRIDGE=br-ex # OVS_PHYSICAL_BRIDGE=br-ex
# Enable Zun services # Enable Zun services
enable_service zun-api if [[ ${HOST_IP} == ${SERVICE_HOST} ]]; then
enable_service zun-compute enable_service zun-api
enable_service zun-wsproxy enable_service zun-compute
enable_service zun-wsproxy
else
enable_service zun-compute
fi
if [[ ${ZUN_DB_TYPE} == "etcd" ]]; then if [[ ${ZUN_DB_TYPE} == "etcd" ]]; then
enable_service zun-etcd enable_service zun-etcd