From dd2d97041b5343b0b1c91ebb87efc9fab644ed46 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Thu, 19 Oct 2017 11:04:24 +0200 Subject: [PATCH] Rename/Update coe_* variables --- README.md | 11 +++-------- defaults/main.yml | 6 +++--- tasks/deprovision.yml | 10 +++++----- tasks/provision.yml | 16 ++++++++-------- 4 files changed, 19 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index eef47b0..7b7d5dd 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-glance - -License -------- - -Apache License v2 diff --git a/defaults/main.yml b/defaults/main.yml index 82f9fa8..6b2497a 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 service_name: glance diff --git a/tasks/deprovision.yml b/tasks/deprovision.yml index 24b4cc2..abf4984 100644 --- a/tasks/deprovision.yml +++ b/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}}" - kubeconfig: "{{config_file}}" + context: "{{coe_config_context}}" + kubeconfig: "{{coe_config_file}}" name: glance namespace: "{{namespace}}" state: absent diff --git a/tasks/provision.yml b/tasks/provision.yml index 131b4f1..48741de 100644 --- a/tasks/provision.yml +++ b/tasks/provision.yml @@ -36,8 +36,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: glance namespace: "{{namespace}}" state: present @@ -87,8 +87,8 @@ - name: Create glance db-sync job k8s_v1_job: host: "{{coe_host}}" - context: "{{kube_context}}" - kubeconfig: "{{config_file}}" + context: "{{coe_config_context}}" + 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}}" - kubeconfig: "{{config_file}}" + context: "{{coe_config_context}}" + 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}}" - kubeconfig: "{{config_file}}" + context: "{{coe_config_context}}" + kubeconfig: "{{coe_config_file}}" name: glance-api namespace: "{{namespace}}" replicas: 1