diff --git a/README.md b/README.md index 78b41ad..197d55a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,21 @@ # Deploy Weave stack in kubernetes cluster with ansible -This repo is deploy weave scope with ansible. +This repo deploy weave net and weave scope with ansible. + +## tags in role + +- weave ( Deploy Net and Scope ) + +- weave-scope ( Deploy Scope ) + +- weave-net ( Deploy Net ) + +- k8s-network ( Deploy Net ) + + +## Links source scope: https://github.com/weaveworks/scope/tree/master/examples/k8s + source net: https://github.com/weaveworks/weave/tree/master/prog/weave-kube \ No newline at end of file diff --git a/defaults/main.yml b/defaults/main.yml index 7a3734c..aa0c472 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,6 +6,7 @@ ingress_domain: "local.cluster" # - 192.168.140.0/24 basic_auth: false #traefik_version: "2.0" -traefik_namespace: tools +#traefik_namespace: traefik +weave_net_password: "SuperMotDePasseDeLaMortQuiTue4012!" scope_version: 1.13.0 diff --git a/tasks/main.yml b/tasks/main.yml index 057e4c5..4cebee5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,6 +1,8 @@ --- - name: Weave Net setup block: + - name: Include Weave Net vars + include_vars: net-files.yaml - name: Weave Net files k8s: state: present @@ -9,8 +11,6 @@ resource_definition: "{{ lookup('file', item) | from_yaml }}" with_items: - "{{ weave_net_files }}" - when: - - kubernetes_network == "weave-net" - name: Weave Net password k8s: state: present @@ -19,12 +19,17 @@ resource_definition: "{{ lookup('template', item) | from_yaml }}" with_items: - weave-net-secret.yml.j2 - when: - - kubernetes_network == "weave-net" - tags: weave + when: + - kubernetes_network == "weave-net" + tags: + - weave + - weave-net + - k8s-network - name: Weave Scope setup block: + - name: Include Weave Scope vars + include_vars: scope-files.yaml - name: namespace k8s: context: "{{ my_context }}" @@ -88,5 +93,8 @@ resource_definition: "{{ lookup('file', item) | from_yaml }}" with_items: - "{{ weave_scope_files }}" - tags: weave - + when: + - weave_scope|bool + tags: + - weave + - weave-scope diff --git a/templates/weave-net-secret.yml.j2 b/templates/weave-net-secret.yml.j2 index cf56313..7629b2c 100644 --- a/templates/weave-net-secret.yml.j2 +++ b/templates/weave-net-secret.yml.j2 @@ -5,4 +5,4 @@ metadata: namespace: kube-system type: Opaque data: - weave-passwd: {{ data | base64 }} + weave-passwd: {{ weave_net_password | b64encode }} diff --git a/vars/main.yml b/vars/main.yml index aabd18d..ba6f665 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1 +1,2 @@ user: "{{ ansible_user_id }}" +weave_scope: false \ No newline at end of file