summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-01 13:35:04 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-10 10:55:33 +0000
commit3561aa906f9076d856f451830cac47c590538ec5 (patch)
tree42ac782f4a4e8e6c588fca531afe3cccc121abbd
parent21d627c7a49e17d539d0690fd9fd24760a6e42b7 (diff)
downloaddefinitions-3561aa906f9076d856f451830cac47c590538ec5.tar.gz
16 patch comments
-rw-r--r--openstack-cinder.configure2
-rw-r--r--openstack/etc/systemd/system/openstack-cinder-setup.service2
-rw-r--r--openstack/usr/share/openstack/cinder.yml107
3 files changed, 71 insertions, 40 deletions
diff --git a/openstack-cinder.configure b/openstack-cinder.configure
index f3d07477..0bbea000 100644
--- a/openstack-cinder.configure
+++ b/openstack-cinder.configure
@@ -61,7 +61,7 @@ if [ -z "$RABBITMQ_HOST" -o \
fi
##########################################################################
-# Generate config variable shell snippet
+# Generate configuration file
##########################################################################
OPENSTACK_DATA="$ROOT/etc/openstack"
diff --git a/openstack/etc/systemd/system/openstack-cinder-setup.service b/openstack/etc/systemd/system/openstack-cinder-setup.service
index b166674b..bac80b6b 100644
--- a/openstack/etc/systemd/system/openstack-cinder-setup.service
+++ b/openstack/etc/systemd/system/openstack-cinder-setup.service
@@ -1,5 +1,5 @@
[Unit]
-Description=Run cinder-setup Ansile scripts
+Description=Run cinder-setup Ansible scripts
After=local-fs.target openstack-keystone-setup.service postgres-server.service
[Service]
diff --git a/openstack/usr/share/openstack/cinder.yml b/openstack/usr/share/openstack/cinder.yml
index f5f9ddc8..9a1930b4 100644
--- a/openstack/usr/share/openstack/cinder.yml
+++ b/openstack/usr/share/openstack/cinder.yml
@@ -4,10 +4,18 @@
- "/etc/openstack/cinder.conf"
tasks:
- name: Create the cinder user.
- user: name=cinder comment="Openstack Cinder Daemons" shell=/sbin/nologin home=/var/lib/cinder
+ user:
+ name: cinder
+ comment: Openstack Cinder Daemons
+ shell: /sbin/nologin
+ home: /var/lib/cinder
- name: Create the /var folders for cinder
- file: path={{ item }} state=directory owner=cinder group=cinder
+ file:
+ path: "{{ item }}"
+ state: directory
+ owner: cinder
+ group: cinder
with_items:
- /var/run/cinder
- /var/lock/cinder
@@ -15,61 +23,84 @@
- /var/lib/cinder
- /var/lib/cinder/volumer
- - file: path=/etc/cinder state=directory
+ - name: Create /etc/cinder directory
+ file:
+ path: /etc/cinder
+ state: directory
+
- name: Add the configuration needed for cinder in /etc/cinder using templates
- template: src=/usr/share/openstack/cinder/{{ item }} dest=/etc/cinder/{{ item }}
+ template:
+ src: /usr/share/openstack/cinder/{{ item }}
+ dest: /etc/cinder/{{ item }}
with_lines:
- - (cd /usr/share/openstack/cinder && find -type f)
+ - cd /usr/share/openstack/cinder && find -type f
- - keystone_user: >
- user={{ CINDER_USER }}
- password={{ CINDER_PASSWORD }}
- tenant=service
- token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
+ - name: Create cinder service user in service tenant
+ keystone_user:
+ user: "{{ CINDER_USER }}"
+ password: "{{ CINDER_PASSWORD }}"
+ tenant: service
+ token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
- - keystone_user: >
- role=admin
- user={{ CINDER_USER }}
- 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_USER }}"
+ tenant: service
+ token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
- - 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 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 }}"
- - 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: 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 }}"
- - postgresql_user: name={{ CINDER_DB_USER }}
+ - name: Create postgresql user for cinder
+ postgresql_user:
+ name: "{{ CINDER_DB_USER }}"
sudo: yes
sudo_user: cinder
- - postgresql_db: name=cinder owner={{ CINDER_DB_USER }}
+
+ - name: Create database for cinder services
+ postgresql_db:
+ name: cinder
+ owner: "{{ CINDER_DB_USER }}"
sudo: yes
sudo_user: cinder
- - cinder_manage: action=dbsync
+ - name: Initiate cinder database
+ cinder_manage:
+ action: dbsync
sudo: yes
sudo_user: cinder
- name: Enable and start openstack-cinder services
- service: name={{ item }} enabled=yes state=started
+ service:
+ name: "{{ item }}"
+ enabled: yes
+ state: started
with_items:
- openstack-cinder-api
- openstack-cinder-scheduler
- openstack-cinder-volume
- openstack-cinder-backup
- - lvg: vg=cinder-volumes pvs={{ CINDER_DEVICE }}
+ - lvg:
+ vg: cinder-volumes
+ pvs: "{{ CINDER_DEVICE }}"