From f6399c19f81aaa3492328f7074950a925f81d5f8 Mon Sep 17 00:00:00 2001
From: Kiran Thyagaraja <kthyagaraja@gmail.com>
Date: Thu, 19 Oct 2017 03:16:11 +0000
Subject: [PATCH] Purged of all k8s context stuff

---
 defaults/main.yml          |  6 +++---
 tasks/backends/iscsi.yml   |  4 ++--
 tasks/backends/rbd.yml     |  2 +-
 tasks/backends/xtremio.yml |  2 +-
 tasks/cinder-api.yml       |  6 ------
 tasks/deprovision.yml      | 30 ------------------------------
 6 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 24a189e..682299a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
-coe_host: "https://127.0.0.1:8443"
-kube_context: "kubernetes-admin@kubernetes"
-config_file: "~/.kube/config"
+#coe_host: "https://127.0.0.1:8443"
+#kube_context: "kubernetes-admin@kubernetes"
+#config_file: "~/.kube/config"
 action: provision
 namespace: openstack
 service_account: openstack
diff --git a/tasks/backends/iscsi.yml b/tasks/backends/iscsi.yml
index dca8b04..1086c6a 100644
--- a/tasks/backends/iscsi.yml
+++ b/tasks/backends/iscsi.yml
@@ -88,7 +88,7 @@
 
 
 - name: Create Cinder Volume Deployment
-  k8s_v1beta1_deployment:
+  k8s_apps_v1beta1_deployment:
     name: cinder-volume-iscsi
     namespace: "{{ namespace }}"
     service_account_name: '{{ privileged_service_account }}'
@@ -147,7 +147,7 @@
           name: cinder-volume-iscsi
 
 - name: Create Iscsid Deployment
-  k8s_v1beta1_deployment:
+  k8s_apps_v1beta1_deployment:
     name: iscsid
     namespace: '{{ namespace }}'
     service_account_name: '{{ privileged_service_account }}'
diff --git a/tasks/backends/rbd.yml b/tasks/backends/rbd.yml
index 55948f1..fad4d8a 100644
--- a/tasks/backends/rbd.yml
+++ b/tasks/backends/rbd.yml
@@ -55,7 +55,7 @@
         {{ceph_client_keyring['content'] | b64decode}}
 
 - name: Create Cinder Volume Deployment
-  k8s_v1beta1_deployment:
+  k8s_apps_v1beta1_deployment:
     name: cinder-volume-rbd
     namespace: "{{ namespace }}"
     service_account_name: "{{ service_account }}"
diff --git a/tasks/backends/xtremio.yml b/tasks/backends/xtremio.yml
index ddb91a9..0efa674 100644
--- a/tasks/backends/xtremio.yml
+++ b/tasks/backends/xtremio.yml
@@ -37,7 +37,7 @@
         {{cinder_conf['content'] | b64decode}}
 
 - name: Create Cinder Volume Deployment
-  k8s_v1beta1_deployment:
+  k8s_apps_v1beta1_deployment:
     name: cinder-volume-xtremio
     namespace: "{{ namespace }}"
     service_account_name: "{{ service_account }}"
diff --git a/tasks/cinder-api.yml b/tasks/cinder-api.yml
index ff07fd4..4a71082 100644
--- a/tasks/cinder-api.yml
+++ b/tasks/cinder-api.yml
@@ -63,9 +63,6 @@
 - name: create cinder-api service
   k8s_v1_service:
     name: cinder
-    host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
     namespace: "{{ namespace }}"
     labels:
       app: cinder-api
@@ -81,9 +78,6 @@
 - name: Create Cinder-api Deployment
   k8s_apps_v1beta1_deployment:
     name: cinder-api
-    host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
     namespace: "{{ namespace }}"
     service_account_name: "{{ service_account }}"
     labels:
diff --git a/tasks/deprovision.yml b/tasks/deprovision.yml
index 3bbdeb8..5eb1f72 100644
--- a/tasks/deprovision.yml
+++ b/tasks/deprovision.yml
@@ -1,62 +1,41 @@
 - name: Delete cinder-create-db job
   k8s_v1_job:
-    host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
     name: cinder-create-db
     namespace: "{{ namespace }}"
     state: absent
 
 - name: Delete cinder db-sync job
   k8s_v1_job:
-    host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
     name: cinder-create-tables
     namespace: "{{ namespace }}"
     state: absent
 
 - name: Delete cinder db-sync job
   k8s_v1_job:
-    host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
     name: cinder-create-user
     namespace: "{{ namespace }}"
     state: absent
 
 - name: Delete cinder-api deployment
   k8s_apps_v1beta1_deployment:
-    host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
     name: cinder-api
     namespace: openstack
     state: absent
 
 - name: Delete cinder-scheduler deployment
   k8s_apps_v1beta1_deployment:
-    host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
     name: cinder-scheduler
     namespace: openstack
     state: absent
 
 - name: Delete cinder-volume deployment
   k8s_apps_v1beta1_deployment:
-    host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
     name: cinder-volume
     namespace: openstack
     state: absent
 
 - name: Delete cinder service
   k8s_v1_service:
-    host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
     name: cinder
     namespace: openstack
     state: absent
@@ -64,27 +43,18 @@
 - name: Delete cinder configmaps
   ignore_errors: yes
   k8s_v1_config_map:
-    host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
     name: cinder-volume
     namespace: openstack
     state: absent
 - name: Delete cinder configmaps
   ignore_errors: yes
   k8s_v1_config_map:
-    host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
     name: cinder-scheduler
     namespace: openstack
     state: absent
 - name: Delete cinder configmaps
   ignore_errors: yes
   k8s_v1_config_map:
-    host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
     name: cinder-api
     namespace: openstack
     state: absent