Browse code

Merge "Remove explicit support for OneConvergence plugin"

Jenkins authored on 2015/10/08 15:05:32
Showing 1 changed files
1 1
deleted file mode 100644
... ...
@@ -1,77 +0,0 @@
1
-#!/bin/bash
2
-#
3
-# Neutron One Convergence plugin
4
-# ------------------------------
5
-
6
-# Save trace setting
7
-OC_XTRACE=$(set +o | grep xtrace)
8
-set +o xtrace
9
-
10
-source $TOP_DIR/lib/neutron_plugins/ovs_base
11
-
12
-Q_L3_ENABLED=true
13
-Q_L3_ROUTER_PER_TENANT=true
14
-Q_USE_NAMESPACE=true
15
-
16
-function neutron_plugin_install_agent_packages {
17
-    _neutron_ovs_base_install_agent_packages
18
-}
19
-# Configure common parameters
20
-function neutron_plugin_configure_common {
21
-
22
-    Q_PLUGIN_CONF_PATH=etc/neutron/plugins/oneconvergence
23
-    Q_PLUGIN_CONF_FILENAME=nvsdplugin.ini
24
-    Q_PLUGIN_CLASS="neutron.plugins.oneconvergence.plugin.OneConvergencePluginV2"
25
-}
26
-
27
-# Configure plugin specific information
28
-function neutron_plugin_configure_service {
29
-    iniset /$Q_PLUGIN_CONF_FILE nvsd nvsd_ip $NVSD_IP
30
-    iniset /$Q_PLUGIN_CONF_FILE nvsd nvsd_port $NVSD_PORT
31
-    iniset /$Q_PLUGIN_CONF_FILE nvsd nvsd_user $NVSD_USER
32
-    iniset /$Q_PLUGIN_CONF_FILE nvsd nvsd_passwd $NVSD_PASSWD
33
-}
34
-
35
-function neutron_plugin_configure_debug_command {
36
-    _neutron_ovs_base_configure_debug_command
37
-}
38
-
39
-function neutron_plugin_setup_interface_driver {
40
-    local conf_file=$1
41
-    iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver
42
-}
43
-
44
-function has_neutron_plugin_security_group {
45
-    # 1 means False here
46
-    return 0
47
-}
48
-
49
-function setup_integration_bridge {
50
-    _neutron_ovs_base_setup_bridge $OVS_BRIDGE
51
-}
52
-
53
-function neutron_plugin_configure_dhcp_agent {
54
-    setup_integration_bridge
55
-    iniset $Q_DHCP_CONF_FILE DEFAULT dhcp_agent_manager neutron.agent.dhcp_agent.DhcpAgentWithStateReport
56
-}
57
-
58
-function neutron_plugin_configure_l3_agent {
59
-    _neutron_ovs_base_configure_l3_agent
60
-    iniset $Q_L3_CONF_FILE DEFAULT l3_agent_manager neutron.agent.l3_agent.L3NATAgentWithStateReport
61
-}
62
-
63
-function neutron_plugin_configure_plugin_agent {
64
-
65
-    AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-nvsd-agent"
66
-
67
-    _neutron_ovs_base_configure_firewall_driver
68
-}
69
-
70
-function neutron_plugin_create_nova_conf {
71
-    if ( is_service_enabled n-cpu && ! ( is_service_enabled q-dhcp )) ; then
72
-        setup_integration_bridge
73
-    fi
74
-}
75
-
76
-# Restore xtrace
77
-$OC_XTRACE