ocp4-workload-ceph : New configuration options (#534)

Pranav Gaikwad

2019-08-01 c1e2d677f393189001dc71a7a5151f19910e33fb

ocp4-workload-ceph : New configuration options (#534)

* added configuration variables for csi images

* ignoring a failure when trying to delete the EBS volumes

* fixed typo in registrar image

* fixed typo in registrar image

 ansible/roles/ocp4-workload-ceph/defaults/main.yml

@@ -1,9 +1,14 @@
ceph_image: ceph/ceph:v14.2.2-20190722
ceph_rook_operator_image: rook/ceph:v1.0.0-306.g81dde4b
ceph_rook_toolbox_image: rook/ceph:master
ceph_image: "ceph/ceph:v14.2.2-20190722"
ceph_rook_operator_image: "rook/ceph:v1.0.0-306.g81dde4b"
ceph_rook_toolbox_image: "rook/ceph:master"
ceph_csi_image: "quay.io/cephcsi/cephcsi:canary"
ceph_csi_provisioner_image: "quay.io/k8scsi/csi-provisioner:v1.2.0"
ceph_csi_registrar_image: "quay.io/k8scsi/csi-node-driver-registrar:v1.1.0"
ceph_csi_snapshotter_image: "quay.io/k8scsi/csi-snapshotter:v1.1.0"
ceph_csi_attacher_image: "quay.io/k8scsi/csi-attacher:v1.1.1"
ceph_mahineset_namespace: openshift-machine-api

# workload vars
ceph_workload_destroy: "{{ False if (ACTION == 'create' or ACTION == 'provision') else True }}"
ceph_workload_title: "{{ 'Creating' if not ceph_workload_destroy else 'Removing' }}"
ceph_workload_state: "{{ 'present' if not ceph_workload_destroy else 'absent' }}"     # state of k8s resources 
ceph_workload_state: "{{ 'present' if not ceph_workload_destroy else 'absent' }}"     # state of k8s resources 

 ansible/roles/ocp4-workload-ceph/tasks/post_workload.yml

@@ -67,4 +67,4 @@
- name: Deleting templates
  file:
    path: /tmp/ceph-templates
    state: absent 
    state: absent

 ansible/roles/ocp4-workload-ceph/tasks/pre_workload.yml

@@ -33,7 +33,8 @@
    aws_secret_key: "{{ aws_secret_access_key }}"
    region: "{{ aws_region }}"
    instance: "{{ item.name }}"
    volume_size: 100
    volume_type: "gp2"
    volume_size: "100"
    name: "ceph-vol-{{ item.name }}-{{ item.aZone }}"
    tags:
      ceph-cluster-id: "{{ ceph_cluster_id }}"
@@ -69,4 +70,5 @@
      id: "{{ item.id }}"
      state: absent
    loop: "{{ ceph_discovered_vols.volumes }}"
  when: ceph_workload_destroy
  when: ceph_workload_destroy
  ignore_errors: true

 ansible/roles/ocp4-workload-ceph/templates/operator-openshift-with-csi.yaml.j2

@@ -123,17 +123,17 @@
        - name: ROOK_CSI_ENABLE_CEPHFS
          value: "true"
        - name: ROOK_CSI_CEPH_IMAGE
          value: "quay.io/cephcsi/cephcsi:canary"
          value: "{{ ceph_csi_image }}"
        - name: ROOK_CSI_ENABLE_RBD
          value: "true"
        - name: ROOK_CSI_REGISTRAR_IMAGE
          value: "quay.io/k8scsi/csi-node-driver-registrar:v1.1.0"
          value: "{{ ceph_csi_registrar_image }}"
        - name: ROOK_CSI_PROVISIONER_IMAGE
          value: "quay.io/k8scsi/csi-provisioner:v1.2.0"
          value: "{{ ceph_csi_provisioner_image }}"
        - name: ROOK_CSI_SNAPSHOTTER_IMAGE
          value: "quay.io/k8scsi/csi-snapshotter:v1.1.0"
          value: "{{ ceph_csi_snapshotter_image }}"
        - name: ROOK_CSI_ATTACHER_IMAGE
          value: "quay.io/k8scsi/csi-attacher:v1.1.1"
          value: "{{ ceph_csi_attacher_image }}"
        - name: ROOK_HOSTPATH_REQUIRES_PRIVILEGED
          value: "true"
        - name: FLEXVOLUME_DIR_PATH