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` |  |
-| `kube_context` | `kubernetes-admin@kubernetes` |  |
-| `config_file` | `/root/.kube/config` |  |
+| `coe_host` | |  |
+| `coe_config_context` | |  |
+| `coe_config_file` | |  |
 
 
 Dependencies
@@ -32,8 +32,3 @@ Example Playbook
     - hosts: all
       roles:
          - tripleo.k8s-keystone
-
-License
--------
-
-MIT

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:
+coe_config_context:
+coe_config_file:
 action: provision
 namespace: openstack
 

tasks/deprovision.yml

@@ -1,46 +1,46 @@
 - name: Delete keystone fernet job
   k8s_v1_job:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
+    context: "{{coe_config_context}}"
+    kubeconfig: "{{coe_config_file}}"
     name: keystone-fernet
-    namespace: "{{namespace}}" 
-    state: absent 
+    namespace: "{{namespace}}"
+    state: absent
 
-- name: Delete keystone db-sync job 
+- name: Delete keystone db-sync job
   k8s_v1_job:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
+    context: "{{coe_config_context}}"
+    kubeconfig: "{{coe_config_file}}"
     name: keystone-db-sync
-    namespace: "{{namespace}}" 
-    state: absent 
+    namespace: "{{namespace}}"
+    state: absent
 
-- name: Delete keystone deployment 
+- name: Delete keystone deployment
   k8s_v1beta1_deployment:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
+    context: "{{coe_config_context}}"
+    kubeconfig: "{{coe_config_file}}"
     name: keystone-api
-    namespace: "{{namespace}}" 
-    state: absent 
+    namespace: "{{namespace}}"
+    state: absent
 
-- name: Delete keystone service 
+- name: Delete keystone service
   k8s_v1_service:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
+    context: "{{coe_config_context}}"
+    kubeconfig: "{{coe_config_file}}"
     name: keystone
-    namespace: "{{namespace}}" 
-    state: absent 
+    namespace: "{{namespace}}"
+    state: absent
 
-- name: Delete keystone configmaps 
+- name: Delete keystone configmaps
   ignore_errors: yes
   k8s_v1_config_map:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
+    context: "{{coe_config_context}}"
+    kubeconfig: "{{coe_config_file}}"
     name: keystone
-    namespace: "{{namespace}}" 
-    state: absent 
+    namespace: "{{namespace}}"
+    state: absent
     debug: yes

tasks/provision.yml

@@ -43,8 +43,8 @@
   ignore_errors: yes
   k8s_v1_config_map:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
+    context: "{{coe_config_context}}"
+    kubeconfig: "{{coe_config_file}}"
     name: keystone
     namespace: "{{namespace}}"
     state: present
@@ -102,8 +102,8 @@
 - name: Create keystone job
   k8s_v1_job:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
+    context: "{{coe_config_context}}"
+    kubeconfig: "{{coe_config_file}}"
     name: keystone-db-sync
     namespace: "{{namespace}}"
     state: present
@@ -134,8 +134,8 @@
 - name: Keystone fernet bootstrap
   k8s_v1_job:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
+    context: "{{coe_config_context}}"
+    kubeconfig: "{{coe_config_file}}"
     name: keystone-fernet
     namespace: "{{namespace}}"
     state: present
@@ -165,8 +165,8 @@
 - name: Keystone bootstrap
   k8s_v1_job:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
+    context: "{{coe_config_context}}"
+    kubeconfig: "{{coe_config_file}}"
     name: keystone-bootstrap
     namespace: "{{namespace}}"
     state: present
@@ -222,8 +222,8 @@
 - name: Create keystone service
   k8s_v1_service:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
+    context: "{{coe_config_context}}"
+    kubeconfig: "{{coe_config_file}}"
     name: keystone
     namespace: "{{namespace}}"
     state: present
@@ -239,8 +239,8 @@
 - name: Create keystone deployment
   k8s_v1beta1_deployment:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
+    context: "{{coe_config_context}}"
+    kubeconfig: "{{coe_config_file}}"
     name: keystone-api
     namespace: "{{namespace}}"
     replicas: 1
@@ -294,8 +294,8 @@
 - name: Create keystone secrets
   k8s_v1_secret:
     host: "{{coe_host}}"
-    context: "{{kube_context}}"
-    kubeconfig: "{{config_file}}"
+    context: "{{coe_config_context}}"
+    kubeconfig: "{{coe_config_file}}"
     name: '{{clouds_config}}'
     namespace: "{{namespace}}"
     state: present