Rename/Update coe_* variables

README.md

@@ -16,9 +16,9 @@ Role Variables
 | Name              | Default Value       | Description          |
 |-------------------|---------------------|----------------------|
 | `action` | `provision` | List of tasks to run. |
-| `core_host` | `https://rhev-i32c-03.mpc.lab.eng.bos.redhat.com:6443` |  |
+| `coe_host` | |  |
-| `kube_context` | `kubernetes-admin@kubernetes` |  |
+| `coe_config_context` | |  |
-| `config_file` | `/root/.kube/config` |  |
+| `coe_config_file` | |  |
 
 
 Dependencies
@@ -32,8 +32,3 @@ Example Playbook
     - hosts: all
       roles:
          - tripleo.k8s-glance
-
-License
--------
-
-Apache License v2

defaults/main.yml

@@ -1,6 +1,6 @@
-coe_host: "https://127.0.0.1:8443"
+coe_host:
-kube_context: "kubernetes-admin@kubernetes"
+coe_config_context:
-config_file: "~/.kube/config"
+coe_config_file:
 action: provision
 
 service_name: glance

tasks/deprovision.yml

@@ -1,7 +1,7 @@
 - name: Delete glance db-sync job
   k8s_v1_job:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
+    context: "{{coe_config_context}}"
     kubeconfig: "{{config_file}}"
     name: glance-db-sync
     namespace: "{{namespace}}"
@@ -10,7 +10,7 @@
 - name: Delete glance deployment
   k8s_v1beta1_deployment:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
+    context: "{{coe_config_context}}"
     kubeconfig: "{{config_file}}"
     name: glance-api
     namespace: "{{namespace}}"
@@ -19,7 +19,7 @@
 - name: Delete glance service
   k8s_v1_service:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
+    context: "{{coe_config_context}}"
     kubeconfig: "{{config_file}}"
     name: glance
     namespace: "{{namespace}}"
@@ -29,8 +29,8 @@
   ignore_errors: yes
   k8s_v1_config_map:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
+    context: "{{coe_config_context}}"
-    kubeconfig: "{{config_file}}"
+    kubeconfig: "{{coe_config_file}}"
     name: glance
     namespace: "{{namespace}}"
     state: absent

tasks/provision.yml

@@ -36,8 +36,8 @@
   ignore_errors: yes
   k8s_v1_config_map:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
+    context: "{{coe_config_context}}"
-    kubeconfig: "{{config_file}}"
+    kubeconfig: "{{coe_config_file}}"
     name: glance
     namespace: "{{namespace}}"
     state: present
@@ -87,8 +87,8 @@
 - name: Create glance db-sync job
   k8s_v1_job:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
+    context: "{{coe_config_context}}"
-    kubeconfig: "{{config_file}}"
+    kubeconfig: "{{coe_config_file}}"
     name: glance-db-sync
     namespace: "{{namespace}}"
     state: present
@@ -113,8 +113,8 @@
 - name: Create glance service
   k8s_v1_service:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
+    context: "{{coe_config_context}}"
-    kubeconfig: "{{config_file}}"
+    kubeconfig: "{{coe_config_file}}"
     name: glance
     namespace: "{{namespace}}"
     state: present
@@ -127,8 +127,8 @@
 - name: Create glance deployment
   k8s_v1beta1_deployment:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
+    context: "{{coe_config_context}}"
-    kubeconfig: "{{config_file}}"
+    kubeconfig: "{{coe_config_file}}"
     name: glance-api
     namespace: "{{namespace}}"
     replicas: 1