From 29758df3a8c10da469b70f7b2d598af70eae68e1 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Thu, 13 Jul 2017 14:56:57 -0400 Subject: [PATCH 1/3] Flatten into single role --- README.rst => README.md | 0 .../defaults/main.yaml => defaults/main.yml/main.yml | 0 deprovision-keystone-apb/defaults/main.yaml | 3 --- .../tasks/main.yaml => tasks/deprovision.yml | 0 provision-keystone-apb/tasks/hiera.yaml => tasks/hiera.yml | 0 tasks/main.yml | 1 + provision-keystone-apb/tasks/main.yaml => tasks/provision.yml | 0 .../templates => templates}/httpd-keystone-admin.conf | 0 .../templates => templates}/httpd-keystone-main.conf | 0 {provision-keystone-apb/templates => templates}/httpd.conf | 0 .../templates => templates}/keystone-schema.yaml | 0 11 files changed, 1 insertion(+), 3 deletions(-) rename README.rst => README.md (100%) rename provision-keystone-apb/defaults/main.yaml => defaults/main.yml/main.yml (100%) delete mode 100644 deprovision-keystone-apb/defaults/main.yaml rename deprovision-keystone-apb/tasks/main.yaml => tasks/deprovision.yml (100%) rename provision-keystone-apb/tasks/hiera.yaml => tasks/hiera.yml (100%) create mode 100644 tasks/main.yml rename provision-keystone-apb/tasks/main.yaml => tasks/provision.yml (100%) rename {provision-keystone-apb/templates => templates}/httpd-keystone-admin.conf (100%) rename {provision-keystone-apb/templates => templates}/httpd-keystone-main.conf (100%) rename {provision-keystone-apb/templates => templates}/httpd.conf (100%) rename {provision-keystone-apb/templates => templates}/keystone-schema.yaml (100%) diff --git a/README.rst b/README.md similarity index 100% rename from README.rst rename to README.md diff --git a/provision-keystone-apb/defaults/main.yaml b/defaults/main.yml/main.yml similarity index 100% rename from provision-keystone-apb/defaults/main.yaml rename to defaults/main.yml/main.yml diff --git a/deprovision-keystone-apb/defaults/main.yaml b/deprovision-keystone-apb/defaults/main.yaml deleted file mode 100644 index 1c83bc1..0000000 --- a/deprovision-keystone-apb/defaults/main.yaml +++ /dev/null @@ -1,3 +0,0 @@ -coe_host: "https://rhev-i32c-03.mpc.lab.eng.bos.redhat.com:6443" -kube_context: "kubernetes-admin@kubernetes" -config_file: /root/.kube/config diff --git a/deprovision-keystone-apb/tasks/main.yaml b/tasks/deprovision.yml similarity index 100% rename from deprovision-keystone-apb/tasks/main.yaml rename to tasks/deprovision.yml diff --git a/provision-keystone-apb/tasks/hiera.yaml b/tasks/hiera.yml similarity index 100% rename from provision-keystone-apb/tasks/hiera.yaml rename to tasks/hiera.yml diff --git a/tasks/main.yml b/tasks/main.yml new file mode 100644 index 0000000..ef1ef4f --- /dev/null +++ b/tasks/main.yml @@ -0,0 +1 @@ +- include: "{{ action }}.yml" diff --git a/provision-keystone-apb/tasks/main.yaml b/tasks/provision.yml similarity index 100% rename from provision-keystone-apb/tasks/main.yaml rename to tasks/provision.yml diff --git a/provision-keystone-apb/templates/httpd-keystone-admin.conf b/templates/httpd-keystone-admin.conf similarity index 100% rename from provision-keystone-apb/templates/httpd-keystone-admin.conf rename to templates/httpd-keystone-admin.conf diff --git a/provision-keystone-apb/templates/httpd-keystone-main.conf b/templates/httpd-keystone-main.conf similarity index 100% rename from provision-keystone-apb/templates/httpd-keystone-main.conf rename to templates/httpd-keystone-main.conf diff --git a/provision-keystone-apb/templates/httpd.conf b/templates/httpd.conf similarity index 100% rename from provision-keystone-apb/templates/httpd.conf rename to templates/httpd.conf diff --git a/provision-keystone-apb/templates/keystone-schema.yaml b/templates/keystone-schema.yaml similarity index 100% rename from provision-keystone-apb/templates/keystone-schema.yaml rename to templates/keystone-schema.yaml From 12e8906509acccaf071d99eb937126284c5e4660 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Thu, 13 Jul 2017 17:07:15 -0400 Subject: [PATCH 2/3] Update README --- README.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/README.md b/README.md index e69de29..a5517cd 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,39 @@ +K8S Keystone +========= +[![Galaxy](https://img.shields.io/badge/galaxy-tripleo.k8s--keystone-blue.svg?style=flat)](https://galaxy.ansible.com/tripleo/k8s-keystone) +[![Build Status](https://travis-ci.org/tripleo/ansible-role-k8s-keystone.svg?branch=master)](https://travis-ci.org/tripleo/ansible-role-k8s-keystone) + +Install Keystone in a Kubernetes cluster. + +Requirements +------------ + +Access to Kubernetes cluster + +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` | | + + +Dependencies +------------ + +- `ansible.kubernetes-modules` + +Example Playbook +---------------- + + - hosts: all + roles: + - tripleo.k8s-keystone + +License +------- + +MIT From 1adc3dc413bfaa3b591bcb0fe16c49720333c6d8 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Fri, 21 Jul 2017 17:13:38 -0400 Subject: [PATCH 3/3] Incorporate files into flattened role Cleanup task syntax --- tasks/provision.yml | 15 ++++++++------- .../templates => templates}/base.conf.j2 | 0 2 files changed, 8 insertions(+), 7 deletions(-) rename {provision-keystone-apb/templates => templates}/base.conf.j2 (100%) diff --git a/tasks/provision.yml b/tasks/provision.yml index 173dfe2..de52aa5 100644 --- a/tasks/provision.yml +++ b/tasks/provision.yml @@ -9,10 +9,11 @@ register: create_project - name: Upload config files - template: src="{{item}}" - dest="/tmp/{{item}}" - backup=yes - mode=0644 + template: + src: "{{item}}" + dest: /tmp/{{item}} + backup: yes + mode: 0644 with_items: - httpd.conf - httpd-keystone-main.conf @@ -23,10 +24,10 @@ - name: Generate config files config_template: - src: 'templates/base.conf.j2' - dest: '/tmp/keystone.conf' + src: base.conf.j2 + dest: /tmp/keystone.conf config_overrides: '{{keystone_config}}' - config_type: 'ini' + config_type: ini - name: Read configs into memory slurp: diff --git a/provision-keystone-apb/templates/base.conf.j2 b/templates/base.conf.j2 similarity index 100% rename from provision-keystone-apb/templates/base.conf.j2 rename to templates/base.conf.j2