Browse code

Update Horizon Neutron-related settings

- Horizon no longer has "enable_security_group" setting
so we need to remove it.
- There is no need to set enable_lb/firewall/vpn to True
when q-lbaas/q-fwaas/q-vpn is enabled because Horizon now checks if
Neutron ext-list and enables corresponding dashboards accordingly.

Change-Id: I37073d73e4cba0103ab1a3d935302f1cd0ef73c5

Akihiro Motoki authored on 2014/09/24 04:48:14
Showing 1 changed files
... ...
@@ -92,24 +92,6 @@ function init_horizon {
92 92
     local local_settings=$HORIZON_DIR/openstack_dashboard/local/local_settings.py
93 93
     cp $HORIZON_SETTINGS $local_settings
94 94
 
95
-    if is_service_enabled neutron; then
96
-        _horizon_config_set $local_settings OPENSTACK_NEUTRON_NETWORK enable_security_group $Q_USE_SECGROUP
97
-    fi
98
-    # enable loadbalancer dashboard in case service is enabled
99
-    if is_service_enabled q-lbaas; then
100
-        _horizon_config_set $local_settings OPENSTACK_NEUTRON_NETWORK enable_lb True
101
-    fi
102
-
103
-    # enable firewall dashboard in case service is enabled
104
-    if is_service_enabled q-fwaas; then
105
-        _horizon_config_set $local_settings OPENSTACK_NEUTRON_NETWORK enable_firewall True
106
-    fi
107
-
108
-    # enable VPN dashboard in case service is enabled
109
-    if is_service_enabled q-vpn; then
110
-        _horizon_config_set $local_settings OPENSTACK_NEUTRON_NETWORK enable_vpn True
111
-    fi
112
-
113 95
     _horizon_config_set $local_settings "" OPENSTACK_HOST \"${KEYSTONE_SERVICE_HOST}\"
114 96
     _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}/v2.0\""
115 97
     if [[ -n "$KEYSTONE_TOKEN_HASH_ALGORITHM" ]]; then