C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix creation of heketi volumes and storage provisioning validation

Browse source
This commit is contained in:
Sascha Marcel Schmidt 2018-06-27 10:12:23 +02:00
parent 74cad6b811
commit b56f465145
No known key found for this signature in database
GPG key ID: D1D6CE184437796D
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
contrib/network-storage/heketi/roles/provision/tasks/setup/storage.yml
View file

@ -1,11 +1,9 @@
--- ---
- name: "Test heketi storage." - name: "Test heketi storage."
tags: ["test"]
command: "kubectl get secrets,endpoints,services,jobs --output=json" command: "kubectl get secrets,endpoints,services,jobs --output=json"
changed_when: false changed_when: false
register: "heketi_storage_state" register: "heketi_storage_state"
- name: "Create heketi storage." - name: "Create heketi storage."
tags: ["test"]
command: "kubectl create -f {{ artifacts_dir }}/heketi-storage.json" command: "kubectl create -f {{ artifacts_dir }}/heketi-storage.json"
vars: vars:
secret_query: "items[?metadata.name=='heketi-storage-secret' && kind=='Secret']" secret_query: "items[?metadata.name=='heketi-storage-secret' && kind=='Secret']"
@ -18,7 +16,6 @@
- "heketi_storage_state.stdout|from_json|json_query(service_query)|length == 0" - "heketi_storage_state.stdout|from_json|json_query(service_query)|length == 0"
- "heketi_storage_state.stdout|from_json|json_query(job_query)|length == 0" - "heketi_storage_state.stdout|from_json|json_query(job_query)|length == 0"
- name: "Get state of heketi storage service, endpoint, secret and job." - name: "Get state of heketi storage service, endpoint, secret and job."
tags: ["test"]
command: "kubectl get secrets,endpoints,services,jobs --output=json" command: "kubectl get secrets,endpoints,services,jobs --output=json"
changed_when: false changed_when: false
register: "heketi_storage_state" register: "heketi_storage_state"
@ -26,11 +23,11 @@
secret_query: "items[?metadata.name=='heketi-storage-secret' && kind=='Secret']" secret_query: "items[?metadata.name=='heketi-storage-secret' && kind=='Secret']"
endpoints_query: "items[?metadata.name=='heketi-storage-endpoints' && kind=='Endpoints']" endpoints_query: "items[?metadata.name=='heketi-storage-endpoints' && kind=='Endpoints']"
service_query: "items[?metadata.name=='heketi-storage-endpoints' && kind=='Service']" service_query: "items[?metadata.name=='heketi-storage-endpoints' && kind=='Service']"
job_query: "items[?metadata.name=='heketi-storage-copy-job' && kind=='Job' && status.conditions[?type=='Complete']]|[0].status.conditions|[0].status" job_query: "items[?metadata.name=='heketi-storage-copy-job' && kind=='Job']"
until: until:
- "heketi_storage_state.stdout|from_json|json_query(secret_query)|length == 1" - "heketi_storage_state.stdout|from_json|json_query(secret_query)|length == 1"
- "heketi_storage_state.stdout|from_json|json_query(endpoints_query)|length == 1" - "heketi_storage_state.stdout|from_json|json_query(endpoints_query)|length == 1"
- "heketi_storage_state.stdout|from_json|json_query(service_query)|length > 0" - "heketi_storage_state.stdout|from_json|json_query(service_query)|length > 0"
- "heketi_storage_state.stdout|from_json|json_query(job_query) == 'True'" - "heketi_storage_state.stdout|from_json|json_query(job_query)|length == 1"
retries: 10 retries: 10
delay: 10 delay: 10

22
contrib/network-storage/heketi/roles/provision/tasks/setup/volumes.yml
View file

@ -16,5 +16,23 @@
vars: { volume: "{{ volume_information.stdout|from_json }}" } vars: { volume: "{{ volume_information.stdout|from_json }}" }
when: "volume.name == 'heketidbstorage'" when: "volume.name == 'heketidbstorage'"
- name: "Provision database volume." - name: "Provision database volume."
command: "kubectl create -f {{ artifacts_dir }}/heketi-storage.json" command: "heketi-cli -s http://localhost:48080 setup-openshift-heketi-storage"
when: "heketi_database_volume_exists != true" when: "heketi_database_volume_exists is undefined"
- name: "Get heketi volume ids."
command: "heketi-cli -s http://localhost:48080 volume list --json"
changed_when: false
register: "heketi_volumes"
- name: "Get heketi volumes."
changed_when: false
command: "heketi-cli -s http://localhost:48080 volume info {{ volume_id }} --json"
with_items: "{{ heketi_volumes.stdout|from_json|json_query(\"volumes[*]\") }}"
loop_control: { loop_var: "volume_id" }
register: "volumes_information"
- name: "Test heketi database volume."
set_fact: { heketi_database_volume_created: true }
with_items: "{{ volumes_information.results }}"
loop_control: { loop_var: "volume_information" }
vars: { volume: "{{ volume_information.stdout|from_json }}" }
when: "volume.name == 'heketidbstorage'"
- name: "Ensure heketi database volume exists."
assert: { that: "heketi_database_volume_created is defined" , msg: "Heketi database volume does not exist." }