Merge remote-tracking branch 'baserock/baserock/adamcoldrick/mason-2015' into sam/mason-zuul-2

Conflicts:
	baserock_irclogs/systems/irclogs-x86_64.morph
	hosts
	scripts/licensecheck.pl

Change-Id: Ib298ce7928a8f5a23918b1226746c39e48fe705f

1 files changed, 60 insertions, 0 deletions

diff --git a/openstack/usr/share/openstack/cinder-db.yml b/openstack/usr/share/openstack/cinder-db.yml
new file mode 100644
index 00000000..2a211720
--- /dev/null
+++ b/openstack/usr/share/openstack/cinder-db.yml
@@ -0,0 +1,60 @@
+---
+- hosts: localhost
+  vars_files:
+  - "/etc/openstack/cinder.conf"
+  tasks:
+  - name: Create cinder service user in service tenant
+    keystone_user:
+        user: "{{ CINDER_SERVICE_USER }}"
+        password: "{{ CINDER_SERVICE_PASSWORD }}"
+        tenant: service
+        token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
+
+  - name: Assign admin role to cinder service user in the service tenant
+    keystone_user:
+        role: admin
+        user: "{{ CINDER_SERVICE_USER }}"
+        tenant: service
+        token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
+
+  - name: Add cinder endpoint
+    keystone_service:
+        name: cinder
+        type: volume
+        description: Openstack Block Storage
+        publicurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v1/%(tenant_id)s'
+        internalurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v1/%(tenant_id)s'
+        adminurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v1/%(tenant_id)s'
+        region: regionOne
+        token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
+
+  - name: Add cinderv2 endpoint
+    keystone_service:
+        name: cinderv2
+        type: volumev2
+        description: Openstack Block Storage
+        publicurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v2/%(tenant_id)s'
+        internalurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v2/%(tenant_id)s'
+        adminurl: 'http://{{ CONTROLLER_HOST_ADDRESS }}:8776/v2/%(tenant_id)s'
+        region: regionOne
+        token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
+
+  - name: Create postgresql user for cinder
+    postgresql_user:
+        name: "{{ CINDER_DB_USER }}"
+        password: "{{ CINDER_DB_PASSWORD }}"
+    sudo: yes
+    sudo_user: cinder
+
+  - name: Create database for cinder services
+    postgresql_db:
+        name: cinder
+        owner: "{{ CINDER_DB_USER }}"
+    sudo: yes
+    sudo_user: cinder
+
+  - name: Initiate cinder database
+    cinder_manage:
+        action: dbsync
+    sudo: yes
+    sudo_user: cinder