summaryrefslogtreecommitdiffstats
path: root/playbooks/provisioning/openstack/sample-inventory
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2017-09-12 17:05:56 +0200
committerGitHub <noreply@github.com>2017-09-12 17:05:56 +0200
commitafd6a03b071eced6bd0940bb96a2a39233739523 (patch)
tree0c16d74a9e341aa3c48149e0a049b077b4ecfd5d /playbooks/provisioning/openstack/sample-inventory
parent2d3fae8f65a234ecd66fdaa6017d9158616ab256 (diff)
downloadopenshift-afd6a03b071eced6bd0940bb96a2a39233739523.tar.gz
openshift-afd6a03b071eced6bd0940bb96a2a39233739523.tar.bz2
openshift-afd6a03b071eced6bd0940bb96a2a39233739523.tar.xz
openshift-afd6a03b071eced6bd0940bb96a2a39233739523.zip
Support Cinder-backed Openshift registry (#707)
* Attach and detach a volume, wait for it to be accessible This is mostly just handling the attach/detach code, making sure the necessary vars are accessible where they need to be as well as finding out the correct device name the volume is attached as. * Create temp directory for mounts, remove some debug info * add the fs actions * Remove debug * Prepare the volume automatically if possible * Add docs and sample inventory * Read OS_* creds from shell in sample inventory * Fix yamlint complaint * Update readme This mentions the potential pitfalls when using devstack. * Better check for the router deployment in CI * Set the openshift_hoster*_wait vars to True * Fix typo
Diffstat (limited to 'playbooks/provisioning/openstack/sample-inventory')
-rw-r--r--playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml20
-rw-r--r--playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml7
2 files changed, 27 insertions, 0 deletions
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml
index 4d27ae873..874ea7126 100644
--- a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml
+++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml
@@ -10,6 +10,26 @@ openshift_master_cluster_public_hostname: "{{ groups.lb.0|default(groups.masters
osm_default_node_selector: 'region=primary'
+openshift_hosted_router_wait: True
+openshift_hosted_registry_wait: True
+
+## Openstack credentials
+#openshift_cloudprovider_kind=openstack
+#openshift_cloudprovider_openstack_auth_url: "{{ lookup('env','OS_AUTH_URL') }}"
+#openshift_cloudprovider_openstack_username: "{{ lookup('env','OS_USERNAME') }}"
+#openshift_cloudprovider_openstack_password: "{{ lookup('env','OS_PASSWORD') }}"
+#openshift_cloudprovider_openstack_tenant_name: "{{ lookup('env','OS_TENANT_NAME') }}"
+#openshift_cloudprovider_openstack_region="{{ lookup('env', 'OS_REGION_NAME') }}"
+
+
+## Use Cinder volume for Openshift registry:
+#openshift_hosted_registry_storage_kind: openstack
+#openshift_hosted_registry_storage_access_modes: ['ReadWriteOnce']
+#openshift_hosted_registry_storage_openstack_filesystem: xfs
+#openshift_hosted_registry_storage_openstack_volumeID: e0ba2d73-d2f9-4514-a3b2-a0ced507fa05
+#openshift_hosted_registry_storage_volume_size: 10Gi
+
+
# NOTE(shadower): the hostname check seems to always fail because the
# host's floating IP address doesn't match the address received from
# inside the host.
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
index 0e198342c..2e73d2e26 100644
--- a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
+++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
@@ -62,6 +62,13 @@ openstack_default_flavor: "m1.medium"
#docker_lb_volume_size: "5"
docker_volume_size: "15"
+## Set up a filesystem on the cinder volume specified in `OSEv3.yaml`.
+## You need to specify the file system and volume ID in OSEv3 via
+## `openshift_hosted_registry_storage_openstack_filesystem` and
+## `openshift_hosted_registry_storage_openstack_volumeID`.
+## WARNING: This will delete any data on the volume!
+#prepare_and_format_registry_volume: False
+
openstack_subnet_prefix: "192.168.99"
# # Red Hat subscription