Source installation in virtualenv

Use virtualenv for installation of OpenStack projects and
dependencies to avoid conflicts with Python libraries installed
by non-OpenStack binary packages.

Change-Id: I21ecd673b2e93335b1d3dd4e279e940c9d694c3c
Implements: blueprint virtualenv

43 files changed, 48 insertions, 46 deletions

diff --git a/ansible/roles/cinder/templates/cinder-api.json.j2 b/ansible/roles/cinder/templates/cinder-api.json.j2
index 07142fae3..7ffaf6fca 100644
--- a/ansible/roles/cinder/templates/cinder-api.json.j2
+++ b/ansible/roles/cinder/templates/cinder-api.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/cinder-api --config-file /etc/cinder/cinder.conf",
+    "command": "cinder-api --config-file /etc/cinder/cinder.conf",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/cinder.conf",
diff --git a/ansible/roles/cinder/templates/cinder-backup.json.j2 b/ansible/roles/cinder/templates/cinder-backup.json.j2
index 76d909702..578e4ad80 100644
--- a/ansible/roles/cinder/templates/cinder-backup.json.j2
+++ b/ansible/roles/cinder/templates/cinder-backup.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf",
+    "command": "cinder-backup --config-file /etc/cinder/cinder.conf",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/cinder.conf",
diff --git a/ansible/roles/cinder/templates/cinder-scheduler.json.j2 b/ansible/roles/cinder/templates/cinder-scheduler.json.j2
index ada942eb0..89f521d5a 100644
--- a/ansible/roles/cinder/templates/cinder-scheduler.json.j2
+++ b/ansible/roles/cinder/templates/cinder-scheduler.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf",
+    "command": "cinder-scheduler --config-file /etc/cinder/cinder.conf",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/cinder.conf",
diff --git a/ansible/roles/cinder/templates/cinder-volume.json.j2 b/ansible/roles/cinder/templates/cinder-volume.json.j2
index f06290246..700ba3f39 100644
--- a/ansible/roles/cinder/templates/cinder-volume.json.j2
+++ b/ansible/roles/cinder/templates/cinder-volume.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf",
+    "command": "cinder-volume --config-file /etc/cinder/cinder.conf",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/cinder.conf",
diff --git a/ansible/roles/glance/templates/glance-api.json.j2 b/ansible/roles/glance/templates/glance-api.json.j2
index afcedecb8..755f649c3 100644
--- a/ansible/roles/glance/templates/glance-api.json.j2
+++ b/ansible/roles/glance/templates/glance-api.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/glance-api",
+    "command": "glance-api",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/glance-api.conf",
diff --git a/ansible/roles/glance/templates/glance-registry.json.j2 b/ansible/roles/glance/templates/glance-registry.json.j2
index ea752ab00..43d9055b6 100644
--- a/ansible/roles/glance/templates/glance-registry.json.j2
+++ b/ansible/roles/glance/templates/glance-registry.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/glance-registry",
+    "command": "glance-registry",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/glance-registry.conf",
diff --git a/ansible/roles/heat/templates/heat-api-cfn.json.j2 b/ansible/roles/heat/templates/heat-api-cfn.json.j2
index d722e5e5f..6d10c115f 100644
--- a/ansible/roles/heat/templates/heat-api-cfn.json.j2
+++ b/ansible/roles/heat/templates/heat-api-cfn.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/heat-api-cfn",
+    "command": "heat-api-cfn",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/heat.conf",
diff --git a/ansible/roles/heat/templates/heat-api.json.j2 b/ansible/roles/heat/templates/heat-api.json.j2
index 04748480e..495ba4ec2 100644
--- a/ansible/roles/heat/templates/heat-api.json.j2
+++ b/ansible/roles/heat/templates/heat-api.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/heat-api",
+    "command": "heat-api",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/heat.conf",
diff --git a/ansible/roles/heat/templates/heat-engine.json.j2 b/ansible/roles/heat/templates/heat-engine.json.j2
index 277205a59..2cdaef365 100644
--- a/ansible/roles/heat/templates/heat-engine.json.j2
+++ b/ansible/roles/heat/templates/heat-engine.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/heat-engine",
+    "command": "heat-engine",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/heat.conf",
diff --git a/ansible/roles/horizon/templates/horizon.conf.j2 b/ansible/roles/horizon/templates/horizon.conf.j2
index f52469436..53716c603 100644
--- a/ansible/roles/horizon/templates/horizon.conf.j2
+++ b/ansible/roles/horizon/templates/horizon.conf.j2
@@ -1,4 +1,5 @@
 {% set apache_dir = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
+{% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
 Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:80
 
 <VirtualHost *:80>
@@ -7,16 +8,16 @@ Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['addr
     CustomLog /var/log/{{ apache_dir }}/horizon-access.log combined
 
     WSGIScriptReloading On
-    WSGIDaemonProcess horizon-http processes=5 threads=1 user=horizon group=horizon display-name=%{GROUP}
+    WSGIDaemonProcess horizon-http processes=5 threads=1 user=horizon group=horizon display-name=%{GROUP} python-path={{ python_path }}
     WSGIProcessGroup horizon-http
-    WSGIScriptAlias / /usr/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi
+    WSGIScriptAlias / {{ python_path }}/openstack_dashboard/wsgi/django.wsgi
     WSGIPassAuthorization On
 
     <Location "/">
         Require all granted
     </Location>
 
-    Alias /static /usr/lib/python2.7/site-packages/static
+    Alias /static {{ python_path }}/static
     <Location "/static">
         SetHandler None
     </Location>
diff --git a/ansible/roles/ironic/templates/ironic-api.json.j2 b/ansible/roles/ironic/templates/ironic-api.json.j2
index 530f8554b..621f0e29d 100644
--- a/ansible/roles/ironic/templates/ironic-api.json.j2
+++ b/ansible/roles/ironic/templates/ironic-api.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/ironic-api",
+    "command": "ironic-api",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/ironic.conf",
diff --git a/ansible/roles/ironic/templates/ironic-conductor.json.j2 b/ansible/roles/ironic/templates/ironic-conductor.json.j2
index 3b6ef5ff0..68e5596f6 100644
--- a/ansible/roles/ironic/templates/ironic-conductor.json.j2
+++ b/ansible/roles/ironic/templates/ironic-conductor.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/ironic-conductor",
+    "command": "ironic-conductor",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/ironic.conf",
diff --git a/ansible/roles/ironic/templates/ironic-discoverd.json.j2 b/ansible/roles/ironic/templates/ironic-discoverd.json.j2
index 1af9e5415..8ecc61171 100644
--- a/ansible/roles/ironic/templates/ironic-discoverd.json.j2
+++ b/ansible/roles/ironic/templates/ironic-discoverd.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/ironic-discoverd --config-file /etc/ironic-discoverd/discoverd.conf",
+    "command": "ironic-discoverd --config-file /etc/ironic-discoverd/discoverd.conf",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/discoverd.conf",
diff --git a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
index 875b977ef..464c31823 100644
--- a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
+++ b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
@@ -1,9 +1,10 @@
 {% set apache_dir = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
+{% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
 Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_public_port }}
 Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ keystone_admin_port }}
 
 <VirtualHost *:{{ keystone_public_port }}>
-    WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP}
+    WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP} python-path={{ python_path }}
     WSGIProcessGroup keystone-public
     WSGIScriptAlias / /var/www/cgi-bin/keystone/main
     WSGIApplicationGroup %{GLOBAL}
@@ -16,7 +17,7 @@ Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['addr
 </VirtualHost>
 
 <VirtualHost *:{{ keystone_admin_port }}>
-    WSGIDaemonProcess keystone-admin processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP}
+    WSGIDaemonProcess keystone-admin processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP} python-path={{ python_path }}
     WSGIProcessGroup keystone-admin
     WSGIScriptAlias / /var/www/cgi-bin/keystone/admin
     WSGIApplicationGroup %{GLOBAL}
diff --git a/ansible/roles/magnum/templates/magnum-api.json.j2 b/ansible/roles/magnum/templates/magnum-api.json.j2
index ac61e2d15..c4af2d218 100644
--- a/ansible/roles/magnum/templates/magnum-api.json.j2
+++ b/ansible/roles/magnum/templates/magnum-api.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/magnum-api --config-file /etc/magnum/magnum.conf",
+    "command": "magnum-api --config-file /etc/magnum/magnum.conf",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/magnum.conf",
diff --git a/ansible/roles/magnum/templates/magnum-conductor.json.j2 b/ansible/roles/magnum/templates/magnum-conductor.json.j2
index b1816a178..179182991 100644
--- a/ansible/roles/magnum/templates/magnum-conductor.json.j2
+++ b/ansible/roles/magnum/templates/magnum-conductor.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/magnum-conductor --config-file /etc/magnum/magnum.conf",
+    "command": "magnum-conductor --config-file /etc/magnum/magnum.conf",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/magnum.conf",
diff --git a/ansible/roles/murano/templates/murano-api.json.j2 b/ansible/roles/murano/templates/murano-api.json.j2
index 74155d85e..c67b1ef1f 100644
--- a/ansible/roles/murano/templates/murano-api.json.j2
+++ b/ansible/roles/murano/templates/murano-api.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/murano-api --config-file /etc/murano/murano.conf",
+    "command": "murano-api --config-file /etc/murano/murano.conf",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/murano.conf",
diff --git a/ansible/roles/murano/templates/murano-engine.json.j2 b/ansible/roles/murano/templates/murano-engine.json.j2
index 25f2c474f..a56bc16d4 100644
--- a/ansible/roles/murano/templates/murano-engine.json.j2
+++ b/ansible/roles/murano/templates/murano-engine.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/murano-engine --config-file /etc/murano/murano.conf",
+    "command": "murano-engine --config-file /etc/murano/murano.conf",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/murano.conf",
diff --git a/ansible/roles/neutron/templates/neutron-linuxbridge-agent.json.j2 b/ansible/roles/neutron/templates/neutron-linuxbridge-agent.json.j2
index 1c55a781d..0da4f5a16 100644
--- a/ansible/roles/neutron/templates/neutron-linuxbridge-agent.json.j2
+++ b/ansible/roles/neutron/templates/neutron-linuxbridge-agent.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/neutron-linuxbridge-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini",
+    "command": "neutron-linuxbridge-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/neutron.conf",
diff --git a/ansible/roles/neutron/templates/neutron-openvswitch-agent.json.j2 b/ansible/roles/neutron/templates/neutron-openvswitch-agent.json.j2
index aae90ccd3..36a9a03f7 100644
--- a/ansible/roles/neutron/templates/neutron-openvswitch-agent.json.j2
+++ b/ansible/roles/neutron/templates/neutron-openvswitch-agent.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini",
+    "command": "neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/neutron.conf",
diff --git a/ansible/roles/neutron/templates/neutron-server.json.j2 b/ansible/roles/neutron/templates/neutron-server.json.j2
index ea476745e..a57ba3156 100644
--- a/ansible/roles/neutron/templates/neutron-server.json.j2
+++ b/ansible/roles/neutron/templates/neutron-server.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/neutron-server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini",
+    "command": "neutron-server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/neutron.conf",
diff --git a/ansible/roles/nova/templates/nova-api.json.j2 b/ansible/roles/nova/templates/nova-api.json.j2
index 1e92b10af..f9cb27e9a 100644
--- a/ansible/roles/nova/templates/nova-api.json.j2
+++ b/ansible/roles/nova/templates/nova-api.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/nova-api",
+    "command": "nova-api",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/nova.conf",
diff --git a/ansible/roles/nova/templates/nova-compute.json.j2 b/ansible/roles/nova/templates/nova-compute.json.j2
index 107c160b9..f3a45f754 100644
--- a/ansible/roles/nova/templates/nova-compute.json.j2
+++ b/ansible/roles/nova/templates/nova-compute.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/nova-compute",
+    "command": "nova-compute",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/nova.conf",
diff --git a/ansible/roles/nova/templates/nova-conductor.json.j2 b/ansible/roles/nova/templates/nova-conductor.json.j2
index d61234880..1e214ad8b 100644
--- a/ansible/roles/nova/templates/nova-conductor.json.j2
+++ b/ansible/roles/nova/templates/nova-conductor.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/nova-conductor",
+    "command": "nova-conductor",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/nova.conf",
diff --git a/ansible/roles/nova/templates/nova-consoleauth.json.j2 b/ansible/roles/nova/templates/nova-consoleauth.json.j2
index 2956259c4..17837a86d 100644
--- a/ansible/roles/nova/templates/nova-consoleauth.json.j2
+++ b/ansible/roles/nova/templates/nova-consoleauth.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/nova-consoleauth",
+    "command": "nova-consoleauth",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/nova.conf",
diff --git a/ansible/roles/nova/templates/nova-network.json.j2 b/ansible/roles/nova/templates/nova-network.json.j2
index 2f45ce6ed..53e93e692 100644
--- a/ansible/roles/nova/templates/nova-network.json.j2
+++ b/ansible/roles/nova/templates/nova-network.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/nova-network",
+    "command": "nova-network",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/nova.conf",
diff --git a/ansible/roles/nova/templates/nova-novncproxy.json.j2 b/ansible/roles/nova/templates/nova-novncproxy.json.j2
index b801c7472..e2f98ec05 100644
--- a/ansible/roles/nova/templates/nova-novncproxy.json.j2
+++ b/ansible/roles/nova/templates/nova-novncproxy.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/nova-novncproxy",
+    "command": "nova-novncproxy",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/nova.conf",
diff --git a/ansible/roles/nova/templates/nova-scheduler.json.j2 b/ansible/roles/nova/templates/nova-scheduler.json.j2
index 65c6ff2d3..1a533aaf2 100644
--- a/ansible/roles/nova/templates/nova-scheduler.json.j2
+++ b/ansible/roles/nova/templates/nova-scheduler.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/nova-scheduler",
+    "command": "nova-scheduler",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/nova.conf",
diff --git a/ansible/roles/nova/templates/nova-spicehtml5proxy.json.j2 b/ansible/roles/nova/templates/nova-spicehtml5proxy.json.j2
index aab421806..223bb78b0 100644
--- a/ansible/roles/nova/templates/nova-spicehtml5proxy.json.j2
+++ b/ansible/roles/nova/templates/nova-spicehtml5proxy.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/nova-spicehtml5proxy",
+    "command": "nova-spicehtml5proxy",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/nova.conf",
diff --git a/ansible/roles/swift/templates/swift-account-auditor.json.j2 b/ansible/roles/swift/templates/swift-account-auditor.json.j2
index c5bd96776..490120d71 100644
--- a/ansible/roles/swift/templates/swift-account-auditor.json.j2
+++ b/ansible/roles/swift/templates/swift-account-auditor.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-account-auditor /etc/swift/account-auditor.conf --verbose",
+    "command": "swift-account-auditor /etc/swift/account-auditor.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",
diff --git a/ansible/roles/swift/templates/swift-account-reaper.json.j2 b/ansible/roles/swift/templates/swift-account-reaper.json.j2
index 2e7408496..4933cee3f 100644
--- a/ansible/roles/swift/templates/swift-account-reaper.json.j2
+++ b/ansible/roles/swift/templates/swift-account-reaper.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-account-reaper /etc/swift/account-reaper.conf --verbose",
+    "command": "swift-account-reaper /etc/swift/account-reaper.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",
diff --git a/ansible/roles/swift/templates/swift-account-replicator.json.j2 b/ansible/roles/swift/templates/swift-account-replicator.json.j2
index ca1abbf12..d48121ef6 100644
--- a/ansible/roles/swift/templates/swift-account-replicator.json.j2
+++ b/ansible/roles/swift/templates/swift-account-replicator.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-account-replicator /etc/swift/account-replicator.conf --verbose",
+    "command": "swift-account-replicator /etc/swift/account-replicator.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",
diff --git a/ansible/roles/swift/templates/swift-account-server.json.j2 b/ansible/roles/swift/templates/swift-account-server.json.j2
index 140cded88..8f7935df9 100644
--- a/ansible/roles/swift/templates/swift-account-server.json.j2
+++ b/ansible/roles/swift/templates/swift-account-server.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-account-server /etc/swift/account-server.conf --verbose",
+    "command": "swift-account-server /etc/swift/account-server.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",
diff --git a/ansible/roles/swift/templates/swift-container-auditor.json.j2 b/ansible/roles/swift/templates/swift-container-auditor.json.j2
index d3e4fbe07..a1ed9e347 100644
--- a/ansible/roles/swift/templates/swift-container-auditor.json.j2
+++ b/ansible/roles/swift/templates/swift-container-auditor.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-container-auditor /etc/swift/container-auditor.conf --verbose",
+    "command": "swift-container-auditor /etc/swift/container-auditor.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",
diff --git a/ansible/roles/swift/templates/swift-container-replicator.json.j2 b/ansible/roles/swift/templates/swift-container-replicator.json.j2
index 9a61642a0..98be79be3 100644
--- a/ansible/roles/swift/templates/swift-container-replicator.json.j2
+++ b/ansible/roles/swift/templates/swift-container-replicator.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-container-replicator /etc/swift/container-replicator.conf --verbose",
+    "command": "swift-container-replicator /etc/swift/container-replicator.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",
diff --git a/ansible/roles/swift/templates/swift-container-server.json.j2 b/ansible/roles/swift/templates/swift-container-server.json.j2
index 87e6cbc22..b508ee4fe 100644
--- a/ansible/roles/swift/templates/swift-container-server.json.j2
+++ b/ansible/roles/swift/templates/swift-container-server.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-container-server /etc/swift/container-server.conf --verbose",
+    "command": "swift-container-server /etc/swift/container-server.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",
diff --git a/ansible/roles/swift/templates/swift-container-updater.json.j2 b/ansible/roles/swift/templates/swift-container-updater.json.j2
index 9feb3ac1f..7df084792 100644
--- a/ansible/roles/swift/templates/swift-container-updater.json.j2
+++ b/ansible/roles/swift/templates/swift-container-updater.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-container-updater /etc/swift/container-updater.conf --verbose",
+    "command": "swift-container-updater /etc/swift/container-updater.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",
diff --git a/ansible/roles/swift/templates/swift-object-auditor.json.j2 b/ansible/roles/swift/templates/swift-object-auditor.json.j2
index a5058282e..79df2d51a 100644
--- a/ansible/roles/swift/templates/swift-object-auditor.json.j2
+++ b/ansible/roles/swift/templates/swift-object-auditor.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-object-auditor /etc/swift/object-auditor.conf --verbose",
+    "command": "swift-object-auditor /etc/swift/object-auditor.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",
diff --git a/ansible/roles/swift/templates/swift-object-expirer.json.j2 b/ansible/roles/swift/templates/swift-object-expirer.json.j2
index 301fdcf7c..85c4c77c2 100644
--- a/ansible/roles/swift/templates/swift-object-expirer.json.j2
+++ b/ansible/roles/swift/templates/swift-object-expirer.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-object-expirer /etc/swift/object-expirer.conf --verbose",
+    "command": "swift-object-expirer /etc/swift/object-expirer.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",
diff --git a/ansible/roles/swift/templates/swift-object-replicator.json.j2 b/ansible/roles/swift/templates/swift-object-replicator.json.j2
index 2b9f04582..1b11cac50 100644
--- a/ansible/roles/swift/templates/swift-object-replicator.json.j2
+++ b/ansible/roles/swift/templates/swift-object-replicator.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-object-replicator /etc/swift/object-replicator.conf --verbose",
+    "command": "swift-object-replicator /etc/swift/object-replicator.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",
diff --git a/ansible/roles/swift/templates/swift-object-server.json.j2 b/ansible/roles/swift/templates/swift-object-server.json.j2
index 4d1df326f..d49c62209 100644
--- a/ansible/roles/swift/templates/swift-object-server.json.j2
+++ b/ansible/roles/swift/templates/swift-object-server.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-object-server /etc/swift/object-server.conf --verbose",
+    "command": "swift-object-server /etc/swift/object-server.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",
diff --git a/ansible/roles/swift/templates/swift-object-updater.json.j2 b/ansible/roles/swift/templates/swift-object-updater.json.j2
index 1410f4c4b..9cabfdbf7 100644
--- a/ansible/roles/swift/templates/swift-object-updater.json.j2
+++ b/ansible/roles/swift/templates/swift-object-updater.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-object-updater /etc/swift/object-updater.conf --verbose",
+    "command": "swift-object-updater /etc/swift/object-updater.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",
diff --git a/ansible/roles/swift/templates/swift-proxy-server.json.j2 b/ansible/roles/swift/templates/swift-proxy-server.json.j2
index 52328b724..1e80afa10 100644
--- a/ansible/roles/swift/templates/swift-proxy-server.json.j2
+++ b/ansible/roles/swift/templates/swift-proxy-server.json.j2
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/swift-proxy-server /etc/swift/proxy-server.conf --verbose",
+    "command": "swift-proxy-server /etc/swift/proxy-server.conf --verbose",
     "config_files": [
         {
             "source": "/var/lib/kolla/swift/swift.conf",