From 48662856bab2b2a44f3c4b8af3250afa3b959ead Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Thu, 19 Oct 2017 10:59:50 +0200 Subject: [PATCH] Rename/Update coe_* variables --- README.md | 11 +++------- defaults/main.yml | 6 +++--- tasks/deprovision.yml | 48 +++++++++++++++++++++---------------------- tasks/provision.yml | 28 ++++++++++++------------- 4 files changed, 44 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index a5517cd..821f234 100644 --- a/README.md +++ b/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 diff --git a/defaults/main.yml b/defaults/main.yml index 56c1697..63f6e30 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: +coe_config_context: +coe_config_file: action: provision namespace: openstack diff --git a/tasks/deprovision.yml b/tasks/deprovision.yml index af89bc4..8874250 100644 --- a/tasks/deprovision.yml +++ b/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 diff --git a/tasks/provision.yml b/tasks/provision.yml index ddb18cf..04a6066 100644 --- a/tasks/provision.yml +++ b/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