Code Review
/
ta
/
caas-danm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Configure `caas_oam` as flannel interface
[ta/caas-danm.git]
/
ansible
/
roles
/
flannel
/
tasks
/
main.yaml
diff --git
a/ansible/roles/flannel/tasks/main.yaml
b/ansible/roles/flannel/tasks/main.yaml
index
c97645b
..
03c5775
100644
(file)
--- a/
ansible/roles/flannel/tasks/main.yaml
+++ b/
ansible/roles/flannel/tasks/main.yaml
@@
-13,6
+13,10
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
+- name: collect flannel interfaces
+ set_fact:
+ flannel_interfaces: "{{ hostvars.values() | json_query(interface_query) | unique | list }}"
+
- name: template Flannel DaemonSet file
template:
src: flannel-ds.yaml
- name: template Flannel DaemonSet file
template:
src: flannel-ds.yaml
@@
-33,12
+37,12
@@
manifest: "{{ caas.manifests_directory }}/flannel-ds.yaml"
state: present
manifest: "{{ caas.manifests_directory }}/flannel-ds.yaml"
state: present
-- name: template default
Tenant
Network for kube-system namespace
+- name: template default
Cluster
Network for kube-system namespace
template:
template:
- src: flannel_
t
net.yaml.j2
- dest: "{{ caas.manifests_directory }}/flannel-
tnet_kube_system_ns
.yaml"
+ src: flannel_
c
net.yaml.j2
+ dest: "{{ caas.manifests_directory }}/flannel-
cnet
.yaml"
-- name: create
Tenant
Network within kube-system namespace
+- name: create
Cluster
Network within kube-system namespace
kubectl:
kubectl:
- manifest: "{{ caas.manifests_directory }}/flannel-
tnet_kube_system_ns
.yaml"
+ manifest: "{{ caas.manifests_directory }}/flannel-
cnet
.yaml"
state: present
state: present