summaryrefslogtreecommitdiffstats
path: root/roles/ands_kaas
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-04-14 02:09:54 +0200
committerSuren A. Chilingaryan <csa@suren.me>2018-04-14 02:09:54 +0200
commit110ae6da8d80b63a068f4537383e775d958cf9a9 (patch)
tree1e3e84f1245d48518e0147400c6a3c624db10ee5 /roles/ands_kaas
parent5b9f90a1b410a0464eaad713c00b287174da80d2 (diff)
downloadands-110ae6da8d80b63a068f4537383e775d958cf9a9.tar.gz
ands-110ae6da8d80b63a068f4537383e775d958cf9a9.tar.bz2
ands-110ae6da8d80b63a068f4537383e775d958cf9a9.tar.xz
ands-110ae6da8d80b63a068f4537383e775d958cf9a9.zip
Provide support for global OpenShift resources (ClusterRoles, etc.)
Diffstat (limited to 'roles/ands_kaas')
-rw-r--r--roles/ands_kaas/00-local-volumes.yml.j267
-rw-r--r--roles/ands_kaas/tasks/main.yml2
-rw-r--r--roles/ands_kaas/tasks/oc.yml2
-rw-r--r--roles/ands_kaas/tasks/template.yml2
4 files changed, 3 insertions, 70 deletions
diff --git a/roles/ands_kaas/00-local-volumes.yml.j2 b/roles/ands_kaas/00-local-volumes.yml.j2
deleted file mode 100644
index 8d1a1c8..0000000
--- a/roles/ands_kaas/00-local-volumes.yml.j2
+++ /dev/null
@@ -1,67 +0,0 @@
----
-apiVersion: v1
-kind: Template
-metadata:
- name: {{ kaas_project }}-local-volumes
- annotations:
- descriptions: "{{ kaas_project }} local volumes"
-objects:
-{% for name, vol in kaas_project_local_volumes.iteritems() %}
-{% set voltypes = kaas_storage_domains | json_query("[*].volumes." + vol.volume + ".type") %}
-{% set voltype = voltypes[0] | default('host') %}
-{% set mntpaths = kaas_storage_domains | json_query("[*].volumes." + vol.volume + ".mount") %}
-{% set mntpath = mntpaths[0] | default('') %}
-{% set oc_name = vol.name | default(name) | regex_replace('_','-') %}
-{% set cfgpath = vol.path | default("") %}
-{% set path = cfgpath if cfgpath[:1] == "/" else "/" + kaas_project + "/" + cfgpath %}
-{% if oc_name | regex_search("^" + kaas_project) %}
-{% set pvprefix = oc_name %}
-{% else %}
-{% set pvprefix = (kaas_project + "-" + oc_name) | regex_replace('_','-') %}
-{% endif %}
-{% set i = 0 %}
-{% for id in vol.nodes | default(hostvars[inventory_hostname]['ands_volume_' + vol.volume + '_server_ids']) %}
-{% set srvid = (id | string) %}
-{% set server_name = hostvars[inventory_hostname]['ands_host_' + srvid + '_public_hostname'] %}
-{% set openshift_name = hostvars[inventory_hostname]['ands_host_' + srvid + '_openshift_fqdn'] %}
-{% set pvname = pvprefix + '-' + server_name %}
-{% set pvcname = oc_name + '-' + (i|string) %}
- - apiVersion: v1
- kind: PersistentVolume
- metadata:
- name: {{ pvname }}
- annotations:
- "volume.alpha.kubernetes.io/node-affinity": '{
- "requiredDuringSchedulingIgnoredDuringExecution": {
- "nodeSelectorTerms": [
- { "matchExpressions": [ { "key": "kubernetes.io/hostname", "operator": "In", "values": ["{{ openshift_name }}"] } ]}
- ]
- }
- }'
- spec:
- storageClassName: kaas-local-storage
- persistentVolumeReclaimPolicy: Retain
- local:
- path: "{{ mntpath }}{{ path }}"
- readOnly: {{ not (vol.write | default(false)) }}
- accessModes:
- - ReadWriteOnce
- capacity:
- storage: {{ vol.capacity | default(kaas_default_volume_capacity) }}
- claimRef:
- name: {{ pvcname }}
- namespace: {{ kaas_project }}
- - apiVersion: v1
- kind: PersistentVolumeClaim
- metadata:
- name: {{ pvcname }}
- spec:
- volumeName: {{ pvname }}
- accessModes:
- - ReadWriteOnce
- resources:
- requests:
- storage: {{ vol.capacity | default(kaas_default_volume_capacity) }}
-{% set i = i + 1 %}
-{% endfor %}
-{% endfor %}
diff --git a/roles/ands_kaas/tasks/main.yml b/roles/ands_kaas/tasks/main.yml
index f1cff02..fed0525 100644
--- a/roles/ands_kaas/tasks/main.yml
+++ b/roles/ands_kaas/tasks/main.yml
@@ -7,6 +7,6 @@
loop_control:
loop_var: kaas_project
vars:
- do_subrole: "{{ subrole | default('project') }}"
+ do_subrole: "{{ kaas_subrole | default(subrole | default('project')) }}"
kaas_template_path: "{{ kaas_template_root }}/{{ kaas_project }}"
kaas_project_path: "{{playbook_dir}}/projects/{{ kaas_project }}"
diff --git a/roles/ands_kaas/tasks/oc.yml b/roles/ands_kaas/tasks/oc.yml
index d3504f8..9b17c3b 100644
--- a/roles/ands_kaas/tasks/oc.yml
+++ b/roles/ands_kaas/tasks/oc.yml
@@ -6,5 +6,5 @@
vars:
resource: "{{ ocitem.resource | default('') }}"
command: "{{ ocitem.oc }}"
- project: "{{ kaas_project }}"
+ project: "{{ kaas_namespace | default(kaas_project) }}"
recreate: "{{ ocitem.recreate | default(false) }}"
diff --git a/roles/ands_kaas/tasks/template.yml b/roles/ands_kaas/tasks/template.yml
index 841c80e..89c30e0 100644
--- a/roles/ands_kaas/tasks/template.yml
+++ b/roles/ands_kaas/tasks/template.yml
@@ -19,7 +19,7 @@
dest_name: "{{ (appname is defined) | ternary ( '90-' + (appname | default('')) + '.yml', default_name ) }}"
template: "{{ dest_name }}"
template_path: "{{ kaas_template_path }}"
- project: "{{ kaas_project }}"
+ project: "{{ kaas_namespace | default(kaas_project) }}"
recreate: "{{ result | changed | ternary (delete | default(true) | ternary(true, false), false) }}"
replace: "{{ result | changed | ternary (delete | default(true) | ternary(false, true), false) }}"