diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2015-04-14 18:54:57 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-04-17 15:35:24 +0000 |
commit | 16ec568ee57045464cd2435358a28c25820a6a61 (patch) | |
tree | ed4a0f5936c03ba7e49db11f6d056b5b9ce15136 /openstack/usr/share | |
parent | f1baa4ade17fcd1eaa2fed4aecf3901c414acc9a (diff) | |
download | definitions-16ec568ee57045464cd2435358a28c25820a6a61.tar.gz |
OpenStack: Split nova into control and compute
This adds NOVA_ENABLE_{CONTROLLER,COMPUTE}. Both are enabled by deafult,
but if CONTROLLER is enabled but COMPUTE isn't, then the conductor
service is enabled.
Change-Id: I523a7270d4afdcd1e2a30eaac42ea499581fe971
Diffstat (limited to 'openstack/usr/share')
-rw-r--r-- | openstack/usr/share/openstack/nova-config.yml | 34 | ||||
-rw-r--r-- | openstack/usr/share/openstack/nova-db.yml (renamed from openstack/usr/share/openstack/nova.yml) | 51 |
2 files changed, 34 insertions, 51 deletions
diff --git a/openstack/usr/share/openstack/nova-config.yml b/openstack/usr/share/openstack/nova-config.yml new file mode 100644 index 00000000..4f43db39 --- /dev/null +++ b/openstack/usr/share/openstack/nova-config.yml @@ -0,0 +1,34 @@ +--- +- hosts: localhost + vars_files: + - "/etc/openstack/nova.conf" + tasks: + - name: Create the nova user. + user: + name: nova + comment: Openstack Nova Daemons + shell: /sbin/nologin + home: /var/lib/nova + groups: libvirt + append: yes + + - name: Create the /var folders for nova + file: + path: "{{ item }}" + state: directory + owner: nova + group: nova + with_items: + - /var/run/nova + - /var/lock/nova + - /var/log/nova + - /var/lib/nova + - /var/lib/nova/instances + + - file: path=/etc/nova state=directory + - name: Add the configuration needed for nova in /etc/nova using templates + template: + src: /usr/share/openstack/nova/{{ item }} + dest: /etc/nova/{{ item }} + with_lines: + - cd /usr/share/openstack/nova && find -type f diff --git a/openstack/usr/share/openstack/nova.yml b/openstack/usr/share/openstack/nova-db.yml index c1122c60..e7dc5b10 100644 --- a/openstack/usr/share/openstack/nova.yml +++ b/openstack/usr/share/openstack/nova-db.yml @@ -3,36 +3,6 @@ vars_files: - "/etc/openstack/nova.conf" tasks: - - name: Create the nova user. - user: - name: nova - comment: Openstack Nova Daemons - shell: /sbin/nologin - home: /var/lib/nova - groups: libvirt - append: yes - - - name: Create the /var folders for nova - file: - path: "{{ item }}" - state: directory - owner: nova - group: nova - with_items: - - /var/run/nova - - /var/lock/nova - - /var/log/nova - - /var/lib/nova - - /var/lib/nova/instances - - - file: path=/etc/nova state=directory - - name: Add the configuration needed for nova in /etc/nova using templates - template: - src: /usr/share/openstack/nova/{{ item }} - dest: /etc/nova/{{ item }} - with_lines: - - cd /usr/share/openstack/nova && find -type f - - name: Create nova service user in service tenant keystone_user: user: "{{ NOVA_SERVICE_USER }}" @@ -79,24 +49,3 @@ action: dbsync sudo: yes sudo_user: nova - - - -# [1] Never enable openstack-nova-conductor service in a node with -# openstack-nova-compute or the security benefits of removing -# database access from nova-compute will be negated -#systemctl start openstack-nova-conductor - - name: Enable and start openstack-nova services - service: - name: "{{ item }}" - enabled: yes - state: started - with_items: - - openstack-nova-api.service - - openstack-nova-cert.service - - openstack-nova-compute.service - - openstack-nova-consoleauth.service - - openstack-nova-novncproxy.service - - openstack-nova-scheduler.service - - openstack-nova-serialproxy.service -# - openstack-nova-conductor.service |