summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authortzumainn <tzumainn@redhat.com>2017-09-13 12:22:52 -0400
committerGitHub <noreply@github.com>2017-09-13 12:22:52 -0400
commit443b8284c31afec35e36e9df347285d1087e945a (patch)
treec7626ec4232af4d5ee532ad5cb2b1a3c3fbf42e5 /roles
parentc478cfcd54bc89918bea21b9e47fcc9421bec568 (diff)
parentd2be3821ae085ec7faa2091df7abaf7279a983e3 (diff)
downloadopenshift-443b8284c31afec35e36e9df347285d1087e945a.tar.gz
openshift-443b8284c31afec35e36e9df347285d1087e945a.tar.bz2
openshift-443b8284c31afec35e36e9df347285d1087e945a.tar.xz
openshift-443b8284c31afec35e36e9df347285d1087e945a.zip
Merge pull request #728 from tomassedovic/prebuild-cinder-registry
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..2245963c0 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 and 'volume' in cinder_registry_volume %}
+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]