summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-01 09:16:32 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-04-08 18:29:28 +0100
commitcb66e8461ceb36831d07cdcec1059768398990bd (patch)
tree1efc4fc62cc14cc60db1f3dea82a356c5fa2ccbe
parent81d0fde3e98d797fda269728ce4f48012ae4c0a6 (diff)
downloaddefinitions-cb66e8461ceb36831d07cdcec1059768398990bd.tar.gz
12 patch comments
-rw-r--r--openstack-glance.configure7
-rw-r--r--openstack/usr/share/openstack/glance.yml97
2 files changed, 69 insertions, 35 deletions
diff --git a/openstack-glance.configure b/openstack-glance.configure
index 7051f156..c75949eb 100644
--- a/openstack-glance.configure
+++ b/openstack-glance.configure
@@ -37,6 +37,7 @@ if [ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -a \
-z "$RABBITMQ_PORT" -a \
-z "$RABBITMQ_USER" -a \
-z "$RABBITMQ_PASSWORD" -a \
+ -z "$MANAGEMENT_INTERFACE_IP_ADDRESS" -a \
-z "$CONTROLLER_HOST_ADDRESS" ]; then
# No Glance options defined, do nothing.
exit 0
@@ -51,13 +52,14 @@ if [ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -o \
-z "$RABBITMQ_PORT" -o \
-z "$RABBITMQ_USER" -o \
-z "$RABBITMQ_PASSWORD" -o \
+ -z "$MANAGEMENT_INTERFACE_IP_ADDRESS" -o \
-z "$CONTROLLER_HOST_ADDRESS" ]; then
echo Some options required for Glance were defined, but not all.
exit 1
fi
##########################################################################
-# Generate config variable shell snippet
+# Generate configuration file
##########################################################################
OPENSTACK_DATA="$ROOT/etc/openstack"
@@ -72,11 +74,12 @@ glance_configuration={
'GLANCE_SERVICE_USER': os.environ['GLANCE_SERVICE_USER'],
'GLANCE_DB_USER': os.environ['GLANCE_DB_USER'],
'GLANCE_DB_PASSWORD': os.environ['GLANCE_DB_PASSWORD'],
- 'CONTROLLER_HOST_ADDRESS': os.environ['CONTROLLER_HOST_ADDRESS'],
'RABBITMQ_HOST': os.environ['RABBITMQ_HOST'],
'RABBITMQ_PORT': os.environ['RABBITMQ_PORT'],
'RABBITMQ_USER': os.environ['RABBITMQ_USER'],
'RABBITMQ_PASSWORD': os.environ['RABBITMQ_PASSWORD'],
+ 'MANAGEMENT_INTERFACE_IP_ADDRESS': os.environ['MANAGEMENT_INTERFACE_IP_ADDRESS'],
+ 'CONTROLLER_HOST_ADDRESS': os.environ['CONTROLLER_HOST_ADDRESS'],
}
yaml.dump(glance_configuration, sys.stdout, default_flow_style=False)
diff --git a/openstack/usr/share/openstack/glance.yml b/openstack/usr/share/openstack/glance.yml
index 3bf51471..aa7e4c78 100644
--- a/openstack/usr/share/openstack/glance.yml
+++ b/openstack/usr/share/openstack/glance.yml
@@ -4,10 +4,18 @@
- "/etc/openstack/glance.conf"
tasks:
- name: Create the glance user.
- user: name=glance comment="Openstack Glance Daemons" shell=/sbin/nologin home=/var/lib/glance
+ user:
+ name: glance
+ comment: Openstack Glance Daemons
+ shell: /sbin/nologin
+ home: /var/lib/glance
- name: Create the /var folders for glance
- file: path={{ item }} state=directory owner=glance group=glance
+ file:
+ path: "{{ item }}"
+ state: directory
+ owner: glance
+ group: glance
with_items:
- /var/run/glance
- /var/lock/glance
@@ -16,47 +24,70 @@
- /var/lib/glance/images
- /var/lib/glance/image-cache
- - file: path=/etc/glance state=directory
+ - name: Create /etc/glance directory
+ file:
+ path: /etc/glance
+ state: directory
+
- name: Add the configuration needed for glance in /etc/glance using templates
- template: src=/usr/share/openstack/glance/{{ item }} dest=/etc/glance/{{ item }}
+ template:
+ src: /usr/share/openstack/glance/{{ item }}
+ dest: /etc/glance/{{ item }}
with_lines:
- - (cd /usr/share/openstack/glance && find -type f)
-
- - keystone_user: >
- user={{ GLANCE_SERVICE_USER }}
- password={{ GLANCE_SERVICE_PASSWORD }}
- tenant=service
- token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
-
- - keystone_user: >
- role=admin
- user={{ GLANCE_SERVICE_USER }}
- tenant=service
- token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
-
- - keystone_service: >
- name=glance
- type=image
- description="Openstack Image Service"
- publicurl=http://{{ CONTROLLER_HOST_ADDRESS }}:9292
- internalurl=http://{{ CONTROLLER_HOST_ADDRESS }}:9292
- adminurl=http://{{ CONTROLLER_HOST_ADDRESS }}:9292
- region='regionOne'
- token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
-
- - postgresql_user: name={{ GLANCE_DB_USER }} login_host={{ CONTROLLER_HOST_ADDRESS }} password={{ GLANCE_DB_PASSWORD }}
+ - cd /usr/share/openstack/glance && find -type f
+
+ - name: Create glance service user in service tenant
+ keystone_user:
+ user: "{{ GLANCE_SERVICE_USER }}"
+ password: "{{ GLANCE_SERVICE_PASSWORD }}"
+ tenant: service
+ token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
+
+ - name: Assign admin role to glances service user in the service tenant
+ keystone_user:
+ role: admin
+ user: "{{ GLANCE_SERVICE_USER }}"
+ tenant: service
+ token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
+
+ - name: Add glance endpoint
+ keystone_service:
+ name: glance
+ type: image
+ description: Openstack Image Service
+ publicurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9292
+ internalurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9292
+ adminurl: http://{{ CONTROLLER_HOST_ADDRESS }}:9292
+ region: regionOne
+ token: "{{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}"
+
+ - name: Create postgresql user for glance
+ postgresql_user:
+ name: "{{ GLANCE_DB_USER }}"
+ login_host: "{{ CONTROLLER_HOST_ADDRESS }}"
+ password: "{{ GLANCE_DB_PASSWORD }}"
sudo: yes
sudo_user: glance
- - postgresql_db: name=glance owner={{ GLANCE_DB_USER }} login_host={{ CONTROLLER_HOST_ADDRESS }}
+
+ - name: Create database for glance services
+ postgresql_db:
+ name: glance
+ owner: "{{ GLANCE_DB_USER }}"
+ login_host: "{{ CONTROLLER_HOST_ADDRESS }}"
sudo: yes
sudo_user: glance
- - glance_manage: action=dbsync
+ - name: Initiate glance database
+ glance_manage:
+ action: dbsync
sudo: yes
sudo_user: glance
- - name: Enable and start openstack-glance service
- service: name={{ item }} enabled=yes state=started
+ - name: Enable and start openstack-glance services
+ service:
+ name: "{{ item }}"
+ enabled: yes
+ state: started
with_items:
- openstack-glance-api.service
- openstack-glance-registry.service