diff --git a/hooks/quantum_utils.py b/hooks/quantum_utils.py index 3be8aa2b..6cad7033 100644 --- a/hooks/quantum_utils.py +++ b/hooks/quantum_utils.py @@ -898,15 +898,18 @@ def git_post_install(projects_yaml): service_name = 'quantum-gateway' user_name = 'neutron' + bin_dir = os.path.join(charm_dir(), 'venv/bin') neutron_api_context = { 'service_description': 'Neutron API server', 'service_name': service_name, 'process_name': 'neutron-server', + 'executable_name': os.path.join(bin_dir, 'neutron-server'), } neutron_dhcp_agent_context = { 'service_description': 'Neutron DHCP Agent', 'service_name': service_name, 'process_name': 'neutron-dhcp-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-dhcp-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/dhcp_agent.ini'], 'log_file': '/var/log/neutron/dhcp-agent.log', @@ -915,6 +918,7 @@ def git_post_install(projects_yaml): 'service_description': 'Neutron L3 Agent', 'service_name': service_name, 'process_name': 'neutron-l3-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-l3-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/l3_agent.ini', '/etc/neutron/fwaas_driver.ini'], @@ -926,7 +930,7 @@ def git_post_install(projects_yaml): 'user_name': user_name, 'start_dir': '/var/lib/neutron', 'process_name': 'neutron-lbaas-agent', - 'executable_name': '/usr/local/bin/neutron-lbaas-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-lbaas-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/lbaas_agent.ini'], 'log_file': '/var/log/neutron/lbaas-agent.log', @@ -937,7 +941,7 @@ def git_post_install(projects_yaml): 'user_name': user_name, 'start_dir': '/var/lib/neutron', 'process_name': 'neutron-metadata-agent', - 'executable_name': '/usr/local/bin/neutron-metadata-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-metadata-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/metadata_agent.ini'], 'log_file': '/var/log/neutron/metadata-agent.log', @@ -948,7 +952,7 @@ def git_post_install(projects_yaml): 'user_name': user_name, 'start_dir': '/var/lib/neutron', 'process_name': 'neutron-metering-agent', - 'executable_name': '/usr/local/bin/neutron-metering-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-metering-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/metering_agent.ini'], 'log_file': '/var/log/neutron/metering-agent.log', @@ -957,6 +961,7 @@ def git_post_install(projects_yaml): 'service_description': 'Neutron OVS cleanup', 'service_name': service_name, 'process_name': 'neutron-ovs-cleanup', + 'executable_name': os.path.join(bin_dir, 'neutron-ovs-cleanup'), 'config_file': '/etc/neutron/neutron.conf', 'log_file': '/var/log/neutron/ovs-cleanup.log', } @@ -966,7 +971,7 @@ def git_post_install(projects_yaml): 'user_name': user_name, 'start_dir': '/var/lib/neutron', 'process_name': 'neutron-restproxy-agent', - 'executable_name': '/usr/local/bin/neutron-restproxy-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-restproxy-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/plugins/bigswitch/restproxy.ini'], 'log_file': '/var/log/neutron/bigswitch-agent.log', @@ -977,7 +982,7 @@ def git_post_install(projects_yaml): 'user_name': user_name, 'start_dir': '/var/lib/neutron', 'process_name': 'neutron-ibm-agent', - 'executable_name': '/usr/local/bin/neutron-ibm-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-ibm-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini'], 'log_file': '/var/log/neutron/ibm-agent.log', @@ -988,7 +993,7 @@ def git_post_install(projects_yaml): 'user_name': user_name, 'start_dir': '/var/lib/neutron', 'process_name': 'neutron-linuxbridge-agent', - 'executable_name': '/usr/local/bin/neutron-linuxbridge-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-linuxbridge-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/plugins/ml2/ml2_conf.ini'], 'log_file': '/var/log/neutron/linuxbridge-agent.log', @@ -999,7 +1004,7 @@ def git_post_install(projects_yaml): 'user_name': user_name, 'start_dir': '/var/lib/neutron', 'process_name': 'neutron-mlnx-agent', - 'executable_name': '/usr/local/bin/neutron-mlnx-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-mlnx-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/plugins/mlnx/mlnx_conf.ini'], 'log_file': '/var/log/neutron/mlnx-agent.log', @@ -1009,7 +1014,7 @@ def git_post_install(projects_yaml): 'service_name': service_name, 'start_dir': '/var/lib/neutron', 'process_name': 'neutron-nec-agent', - 'executable_name': '/usr/local/bin/neutron-nec-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-nec-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/plugins/nec/nec.ini'], 'log_file': '/var/log/neutron/nec-agent.log', @@ -1020,7 +1025,7 @@ def git_post_install(projects_yaml): 'user_name': user_name, 'start_dir': '/var/lib/neutron', 'process_name': 'neutron-nvsd-agent', - 'executable_name': '/usr/local/bin/neutron-nvsd-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-nvsd-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/plugins/oneconvergence/nvsdplugin.ini'], 'log_file': '/var/log/neutron/nvsd-agent.log', @@ -1031,7 +1036,7 @@ def git_post_install(projects_yaml): 'user_name': user_name, 'start_dir': '/var/lib/neutron', 'process_name': 'neutron-ofagent-agent', - 'executable_name': '/usr/local/bin/neutron-ofagent-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-ofagent-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/plugins/ml2/ml2_conf_ofa.ini'], 'log_file': '/var/log/neutron/openflow-agent.log', @@ -1042,7 +1047,7 @@ def git_post_install(projects_yaml): 'user_name': user_name, 'start_dir': '/var/lib/neutron', 'process_name': 'neutron-openvswitch-agent', - 'executable_name': '/usr/local/bin/neutron-openvswitch-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-openvswitch-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/plugins/ml2/ml2_conf.ini'], 'log_file': '/var/log/neutron/openvswitch-agent.log', @@ -1053,7 +1058,7 @@ def git_post_install(projects_yaml): 'user_name': user_name, 'start_dir': '/var/lib/neutron', 'process_name': 'neutron-ryu-agent', - 'executable_name': '/usr/local/bin/neutron-ryu-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-ryu-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/plugins/ryu/ryu.ini'], 'log_file': '/var/log/neutron/ryu-agent.log', @@ -1064,7 +1069,7 @@ def git_post_install(projects_yaml): 'user_name': user_name, 'start_dir': '/var/lib/neutron', 'process_name': 'neutron-sriov-nic-agent', - 'executable_name': '/usr/local/bin/neutron-sriov-nic-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-sriov-nic-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/plugins/ml2/ml2_conf_sriov'], 'log_file': '/var/log/neutron/sriov-agent.log', @@ -1073,6 +1078,7 @@ def git_post_install(projects_yaml): 'service_description': 'Neutron VPN Agent', 'service_name': service_name, 'process_name': 'neutron-vpn-agent', + 'executable_name': os.path.join(bin_dir, 'neutron-vpn-agent'), 'config_files': ['/etc/neutron/neutron.conf', '/etc/neutron/vpn_agent.ini', '/etc/neutron/l3_agent.ini', diff --git a/templates/git/upstart/neutron-agent.upstart b/templates/git/upstart/neutron-agent.upstart index 3853caa4..b3a4fd72 100644 --- a/templates/git/upstart/neutron-agent.upstart +++ b/templates/git/upstart/neutron-agent.upstart @@ -18,7 +18,7 @@ pre-start script fi end script -exec start-stop-daemon --start --chuid neutron --exec /usr/local/bin/{{ process_name }} -- \ +exec start-stop-daemon --start --chuid neutron --exec {{ executable_name }} -- \ {% for config_file in config_files -%} --config-file={{ config_file }} \ {% endfor -%} diff --git a/templates/git/upstart/neutron-ovs-cleanup.upstart b/templates/git/upstart/neutron-ovs-cleanup.upstart index fa2c2149..2bb07444 100644 --- a/templates/git/upstart/neutron-ovs-cleanup.upstart +++ b/templates/git/upstart/neutron-ovs-cleanup.upstart @@ -7,7 +7,7 @@ stop on runlevel [!2345] pre-start script [ ! -x /usr/local/bin/{{ process_name }} ] && exit 0 start-stop-daemon --start --chuid neutron \ - --exec /usr/local/bin/{{ process_name }} -- \ + --exec {{ executable_name }} -- \ --log-file {{ log_file }} \ --config-file {{ config_file }} --verbose end script diff --git a/templates/git/upstart/neutron-server.upstart b/templates/git/upstart/neutron-server.upstart index 2d2c73a2..c19288c4 100644 --- a/templates/git/upstart/neutron-server.upstart +++ b/templates/git/upstart/neutron-server.upstart @@ -16,7 +16,7 @@ end script script [ -r /etc/default/{{ process_name }} ] && . /etc/default/{{ process_name }} [ -r "$NEUTRON_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $NEUTRON_PLUGIN_CONFIG" - exec start-stop-daemon --start --chuid neutron --exec /usr/local/bin/neutron-server -- \ + exec start-stop-daemon --start --chuid neutron --exec {{ executable_name }} -- \ --config-file /etc/neutron/neutron.conf \ --log-file /var/log/neutron/server.log $CONF_ARG end script