summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2017-09-11 14:57:09 +0200
committerTomas Sedovic <tomas@sedovic.cz>2017-09-13 11:31:56 +0200
commitb6dd8f112cd5506923b4b3ce51a1774b0bfc037c (patch)
tree6fc1dec7c49ff3c8698e488286cc65a4dd8d1ca3 /roles
parentc478cfcd54bc89918bea21b9e47fcc9421bec568 (diff)
downloadopenshift-b6dd8f112cd5506923b4b3ce51a1774b0bfc037c.tar.gz
openshift-b6dd8f112cd5506923b4b3ce51a1774b0bfc037c.tar.bz2
openshift-b6dd8f112cd5506923b4b3ce51a1774b0bfc037c.tar.xz
openshift-b6dd8f112cd5506923b4b3ce51a1774b0bfc037c.zip
Pre-create a Cinder registry volume
Diffstat (limited to 'roles')
-rw-r--r--roles/openstack-create-cinder-registry/tasks/main.yaml5
-rw-r--r--roles/static_inventory/templates/inventory.j28
2 files changed, 12 insertions, 1 deletions
diff --git a/roles/openstack-create-cinder-registry/tasks/main.yaml b/roles/openstack-create-cinder-registry/tasks/main.yaml
new file mode 100644
index 000000000..6e9d1c2e7
--- /dev/null
+++ b/roles/openstack-create-cinder-registry/tasks/main.yaml
@@ -0,0 +1,5 @@
+---
+- os_volume:
+ display_name: "{{ cinder_hosted_registry_name }}"
+ size: "{{ cinder_hosted_registry_size_gb }}"
+ register: cinder_registry_volume
diff --git a/roles/static_inventory/templates/inventory.j2 b/roles/static_inventory/templates/inventory.j2
index 987c98ec6..640a46ba2 100644
--- a/roles/static_inventory/templates/inventory.j2
+++ b/roles/static_inventory/templates/inventory.j2
@@ -42,10 +42,16 @@ etcd
lb
# Set variables common for all OSEv3 hosts
-#[OSEv3:vars]
+[OSEv3:vars]
# For OSEv3 normal group vars, see ./group_vars/OSEv3.yml
+{% if cinder_registry_volume is defined %}
+openshift_hosted_registry_storage_openstack_volumeID="{{ cinder_registry_volume.id }}"
+openshift_hosted_registry_storage_volume_size="{{ cinder_registry_volume.volume.size }}Gi"
+{% endif %}
+
+
# Host Groups
[masters:children]