summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/nova-controller
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/adapters/ansible/roles/nova-controller')
-rw-r--r--deploy/adapters/ansible/roles/nova-controller/handlers/main.yml20
-rw-r--r--deploy/adapters/ansible/roles/nova-controller/tasks/nova_config.yml7
-rw-r--r--deploy/adapters/ansible/roles/nova-controller/tasks/nova_install.yml15
-rw-r--r--deploy/adapters/ansible/roles/nova-controller/templates/nova.conf2
-rw-r--r--deploy/adapters/ansible/roles/nova-controller/vars/Debian.yml1
-rw-r--r--deploy/adapters/ansible/roles/nova-controller/vars/RedHat.yml16
-rw-r--r--deploy/adapters/ansible/roles/nova-controller/vars/main.yml4
7 files changed, 30 insertions, 35 deletions
diff --git a/deploy/adapters/ansible/roles/nova-controller/handlers/main.yml b/deploy/adapters/ansible/roles/nova-controller/handlers/main.yml
index 0f922941..37b106a3 100644
--- a/deploy/adapters/ansible/roles/nova-controller/handlers/main.yml
+++ b/deploy/adapters/ansible/roles/nova-controller/handlers/main.yml
@@ -1,21 +1,7 @@
---
-- name: restart nova-api
- service: name=nova-api state=restarted enabled=yes
-
-- name: restart nova-cert
- service: name=nova-cert state=restarted enabled=yes
-
-- name: restart nova-consoleauth
- service: name=nova-consoleauth state=restarted enabled=yes
-
-- name: restart nova-scheduler
- service: name=nova-scheduler state=restarted enabled=yes
-
-- name: restart nova-conductor
- service: name=nova-conductor state=restarted enabled=yes
-
-- name: restart nova-novncproxy
- service: name=nova-novncproxy state=restarted enabled=yes
+- name: restart nova service
+ service: name={{ item}} state=restarted enabled=yes
+ with_items: services | union(services_noarch)
- name: remove nova-sqlite-db
shell: rm /var/lib/nova/nova.sqlite || touch nova.sqlite.db.removed
diff --git a/deploy/adapters/ansible/roles/nova-controller/tasks/nova_config.yml b/deploy/adapters/ansible/roles/nova-controller/tasks/nova_config.yml
index 62351faa..fbf8e773 100644
--- a/deploy/adapters/ansible/roles/nova-controller/tasks/nova_config.yml
+++ b/deploy/adapters/ansible/roles/nova-controller/tasks/nova_config.yml
@@ -6,11 +6,6 @@
retries: 5
delay: 3
notify:
- - restart nova-api
- - restart nova-cert
- - restart nova-consoleauth
- - restart nova-scheduler
- - restart nova-conductor
- - restart nova-novncproxy
+ - restart nova service
- meta: flush_handlers
diff --git a/deploy/adapters/ansible/roles/nova-controller/tasks/nova_install.yml b/deploy/adapters/ansible/roles/nova-controller/tasks/nova_install.yml
index 83bc287a..bb1dbac7 100644
--- a/deploy/adapters/ansible/roles/nova-controller/tasks/nova_install.yml
+++ b/deploy/adapters/ansible/roles/nova-controller/tasks/nova_install.yml
@@ -2,22 +2,17 @@
- include_vars: "{{ ansible_os_family }}.yml"
- name: install nova related packages
- action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes"
- with_items: packages
+ action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
+ with_items: packages | union(packages_noarch)
-- name: generate nova controll service list
+- name: generate nova control service list
shell: echo {{ item }} >> /opt/service
- with_items: services
+ with_items: services | union(services_noarch)
- name: update nova conf
template: src=nova.conf
dest=/etc/nova/nova.conf
backup=yes
notify:
- - restart nova-api
- - restart nova-cert
- - restart nova-consoleauth
- - restart nova-scheduler
- - restart nova-conductor
- - restart nova-novncproxy
+ - restart nova service
- remove nova-sqlite-db
diff --git a/deploy/adapters/ansible/roles/nova-controller/templates/nova.conf b/deploy/adapters/ansible/roles/nova-controller/templates/nova.conf
index 4c837e33..9b4280c1 100644
--- a/deploy/adapters/ansible/roles/nova-controller/templates/nova.conf
+++ b/deploy/adapters/ansible/roles/nova-controller/templates/nova.conf
@@ -3,7 +3,7 @@ dhcpbridge_flagfile=/etc/nova/nova.conf
dhcpbridge=/usr/bin/nova-dhcpbridge
logdir=/var/log/nova
state_path=/var/lib/nova
-lock_path=/var/lock/nova
+lock_path=/var/lib/nova/tmp
force_dhcp_release=True
iscsi_helper=tgtadm
libvirt_use_virtio_for_bridges=True
diff --git a/deploy/adapters/ansible/roles/nova-controller/vars/Debian.yml b/deploy/adapters/ansible/roles/nova-controller/vars/Debian.yml
index 7cd81caf..e96a1b1f 100644
--- a/deploy/adapters/ansible/roles/nova-controller/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/nova-controller/vars/Debian.yml
@@ -6,7 +6,6 @@ packages:
- nova-consoleauth
- nova-novncproxy
- nova-scheduler
- - python-novaclient
- python-oslo.rootwrap
services:
diff --git a/deploy/adapters/ansible/roles/nova-controller/vars/RedHat.yml b/deploy/adapters/ansible/roles/nova-controller/vars/RedHat.yml
new file mode 100644
index 00000000..e2709a3e
--- /dev/null
+++ b/deploy/adapters/ansible/roles/nova-controller/vars/RedHat.yml
@@ -0,0 +1,16 @@
+---
+packages:
+ - openstack-nova-api
+ - openstack-nova-cert
+ - openstack-nova-conductor
+ - openstack-nova-console
+ - openstack-nova-novncproxy
+ - openstack-nova-scheduler
+
+services:
+ - openstack-nova-api
+ - openstack-nova-cert
+ - openstack-nova-conductor
+ - openstack-nova-consoleauth
+ - openstack-nova-novncproxy
+ - openstack-nova-scheduler
diff --git a/deploy/adapters/ansible/roles/nova-controller/vars/main.yml b/deploy/adapters/ansible/roles/nova-controller/vars/main.yml
new file mode 100644
index 00000000..d43b8359
--- /dev/null
+++ b/deploy/adapters/ansible/roles/nova-controller/vars/main.yml
@@ -0,0 +1,4 @@
+---
+packages_noarch: []
+
+services_noarch: []