diff options
Diffstat (limited to 'deploy/adapters/ansible/roles/neutron-compute')
4 files changed, 10 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/neutron-compute/handlers/main.yml b/deploy/adapters/ansible/roles/neutron-compute/handlers/main.yml index 83737980..1e2ad35d 100644 --- a/deploy/adapters/ansible/roles/neutron-compute/handlers/main.yml +++ b/deploy/adapters/ansible/roles/neutron-compute/handlers/main.yml @@ -12,4 +12,4 @@ with_items: "{{ services | union(services_noarch) }}" - name: restart nova-compute services - service: name=nova-compute state=restarted enabled=yes + service: name={{ nova_compute_service }} state=restarted enabled=yes diff --git a/deploy/adapters/ansible/roles/neutron-compute/templates/neutron.conf b/deploy/adapters/ansible/roles/neutron-compute/templates/neutron.conf index a676e951..d74435fe 100644 --- a/deploy/adapters/ansible/roles/neutron-compute/templates/neutron.conf +++ b/deploy/adapters/ansible/roles/neutron-compute/templates/neutron.conf @@ -2,7 +2,6 @@ verbose = {{ VERBOSE }} debug = {{ VERBOSE }} state_path = /var/lib/neutron -lock_path = $state_path/lock notify_nova_on_port_status_changes = True notify_nova_on_port_data_changes = True log_dir = /var/log/neutron @@ -103,3 +102,6 @@ rabbit_host = {{ rabbit_host }} rabbit_password = {{ RABBIT_PASS }} rabbit_port = 5672 rabbit_userid = {{ RABBIT_USER }} + +[oslo_concurrency] +lock_path = $state_path/lock diff --git a/deploy/adapters/ansible/roles/neutron-compute/vars/Debian.yml b/deploy/adapters/ansible/roles/neutron-compute/vars/Debian.yml index 83d7f323..d0ae2bdd 100644 --- a/deploy/adapters/ansible/roles/neutron-compute/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/neutron-compute/vars/Debian.yml @@ -17,3 +17,6 @@ packages: services: - neutron-openvswitch-agent + +nova_compute_service: + - nova-compute diff --git a/deploy/adapters/ansible/roles/neutron-compute/vars/RedHat.yml b/deploy/adapters/ansible/roles/neutron-compute/vars/RedHat.yml index 65dda6b5..8486a1aa 100644 --- a/deploy/adapters/ansible/roles/neutron-compute/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/neutron-compute/vars/RedHat.yml @@ -16,3 +16,6 @@ services: - openvswitch - neutron-openvswitch-agent - libvirtd + +nova_compute_service: + - openstack-nova-compute |