From f93f32f6c1a7ae7281cad73ec3d42d9a470f48c7 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Wed, 1 Apr 2015 16:00:58 +0000
Subject: 27 patch comments

---
 openstack-nova.configure               |  2 +-
 openstack/usr/share/openstack/nova.yml | 83 +++++++++++++++++++++++-----------
 2 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/openstack-nova.configure b/openstack-nova.configure
index ab05f9e0..f76c00b6 100644
--- a/openstack-nova.configure
+++ b/openstack-nova.configure
@@ -85,7 +85,7 @@ if [ -z "$NOVA_SERVICE_USER" -o \
 fi
 
 ##########################################################################
-# Generate config variable shell snippet
+# Generate configuration file
 ##########################################################################
 
 OPENSTACK_DATA="$ROOT/etc/openstack"
diff --git a/openstack/usr/share/openstack/nova.yml b/openstack/usr/share/openstack/nova.yml
index 947df037..c1122c60 100644
--- a/openstack/usr/share/openstack/nova.yml
+++ b/openstack/usr/share/openstack/nova.yml
@@ -4,10 +4,20 @@
   - "/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
+    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
+    file:
+        path: "{{ item }}"
+        state: directory
+        owner: nova
+        group: nova
     with_items:
     - /var/run/nova
     - /var/lock/nova
@@ -17,40 +27,56 @@
 
   - 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 }}
+    template:
+        src: /usr/share/openstack/nova/{{ item }}
+        dest: /etc/nova/{{ item }}
     with_lines:
-    - (cd /usr/share/openstack/nova && find -type f)
+    - cd /usr/share/openstack/nova && find -type f
 
-  - keystone_user: >
-        user={{ NOVA_SERVICE_USER }}
-        password={{ NOVA_SERVICE_PASSWORD }}
-        tenant=service
-        token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
+  - name: Create nova service user in service tenant
+    keystone_user:
+        user: "{{ NOVA_SERVICE_USER }}"
+        password: "{{ NOVA_SERVICE_PASSWORD }}"
+        tenant: service
+        token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
 
-  - keystone_user: >
-        role=admin
-        user={{ NOVA_SERVICE_USER }}
-        tenant=service
-        token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
+  - name: Assign admin role to nova service user in the service tenant
+    keystone_user:
+        role: admin
+        user: "{{ NOVA_SERVICE_USER }}"
+        tenant: service
+        token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
 
-  - keystone_service: >
-        name=nova
-        type=compute
-        description="Openstack Compute Service"
-        publicurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s'
-        internalurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s'
-        adminurl='http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s'
-        region='regionOne'
-        token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
+  - name: Add nova endpoint
+    keystone_service:
+        name: nova
+        type: compute
+        description: Openstack Compute Service
+        publicurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s'
+        internalurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s'
+        adminurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8774/v2/%(tenant_id)s'
+        region: 'regionOne'
+        token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
 
-  - postgresql_user: name={{ NOVA_DB_USER }} login_host={{ CONTROLLER_HOST_ADDRESS }} password={{ NOVA_DB_PASSWORD }}
+  - name: Create postgresql user for nova
+    postgresql_user:
+        name: "{{ NOVA_DB_USER }}"
+        login_host: "{{ CONTROLLER_HOST_ADDRESS }}"
+        password: "{{ NOVA_DB_PASSWORD }}"
     sudo: yes
     sudo_user: nova
-  - postgresql_db: name=nova owner={{ NOVA_DB_USER }} login_host={{ CONTROLLER_HOST_ADDRESS }}
+
+  - name: Create database for nova services
+    postgresql_db:
+        name: nova
+        owner: "{{ NOVA_DB_USER }}"
+        login_host: "{{ CONTROLLER_HOST_ADDRESS }}"
     sudo: yes
     sudo_user: nova
 
-  - nova_manage: action=dbsync
+  - name: Initiate nova database
+    nova_manage:
+        action: dbsync
     sudo: yes
     sudo_user: nova
 
@@ -61,7 +87,10 @@
 # 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
+    service:
+        name: "{{ item }}"
+        enabled: yes
+        state: started
     with_items:
     - openstack-nova-api.service
     - openstack-nova-cert.service
-- 
cgit v1.2.1