Merge pull request #985 from rutsky/check-mode-for-shell-commands

set "check_mode: on" for read-only "shell" steps that registers result
This commit is contained in:
Matthew Mosesohn 2017-02-15 17:53:41 +03:00 committed by GitHub
commit d92d955aeb
12 changed files with 20 additions and 0 deletions

View file

@ -18,6 +18,7 @@
register: need_pip register: need_pip
failed_when: false failed_when: false
changed_when: false changed_when: false
check_mode: no
when: (need_bootstrap | failed) when: (need_bootstrap | failed)
tags: facts tags: facts
@ -45,6 +46,7 @@
- name: Check configured hostname - name: Check configured hostname
shell: hostname shell: hostname
register: configured_hostname register: configured_hostname
check_mode: no
- name: Assign inventory name to unconfigured hostnames - name: Assign inventory name to unconfigured hostnames
shell: sh -c "echo \"{{inventory_hostname}}\" > /etc/hostname; hostname \"{{inventory_hostname}}\"" shell: sh -c "echo \"{{inventory_hostname}}\" > /etc/hostname; hostname \"{{inventory_hostname}}\""

View file

@ -32,11 +32,13 @@
shell: grep "^nameserver" /etc/resolv.conf | sed 's/^nameserver\s*//' shell: grep "^nameserver" /etc/resolv.conf | sed 's/^nameserver\s*//'
changed_when: False changed_when: False
register: system_nameservers register: system_nameservers
check_mode: no
- name: check system search domains - name: check system search domains
shell: grep "^search" /etc/resolv.conf | sed 's/^search\s*//' shell: grep "^search" /etc/resolv.conf | sed 's/^search\s*//'
changed_when: False changed_when: False
register: system_search_domains register: system_search_domains
check_mode: no
- name: add system nameservers to docker options - name: add system nameservers to docker options
set_fact: set_fact:

View file

@ -12,6 +12,7 @@
{{ docker_bin_dir }}/docker images -q | xargs {{ docker_bin_dir }}/docker inspect -f "{{ '{{' }} .RepoTags {{ '}}' }},{{ '{{' }} .RepoDigests {{ '}}' }}" {{ docker_bin_dir }}/docker images -q | xargs {{ docker_bin_dir }}/docker inspect -f "{{ '{{' }} .RepoTags {{ '}}' }},{{ '{{' }} .RepoDigests {{ '}}' }}"
register: docker_images_raw register: docker_images_raw
failed_when: false failed_when: false
check_mode: no
when: not download_always_pull|bool when: not download_always_pull|bool
- set_fact: docker_images="{{docker_images_raw.stdout|regex_replace('\[|\]|\\n]','')|regex_replace('\s',',')}}" - set_fact: docker_images="{{docker_images_raw.stdout|regex_replace('\[|\]|\\n]','')|regex_replace('\s',',')}}"

View file

@ -4,6 +4,7 @@
register: etcd_member_in_cluster register: etcd_member_in_cluster
failed_when: false failed_when: false
changed_when: false changed_when: false
check_mode: no
when: is_etcd_master when: is_etcd_master
tags: facts tags: facts

View file

@ -87,6 +87,7 @@
args: args:
executable: /bin/bash executable: /bin/bash
register: etcd_master_cert_data register: etcd_master_cert_data
check_mode: no
delegate_to: "{{groups['etcd'][0]}}" delegate_to: "{{groups['etcd'][0]}}"
when: inventory_hostname in groups['etcd'] and sync_certs|default(false) and when: inventory_hostname in groups['etcd'] and sync_certs|default(false) and
inventory_hostname != groups['etcd'][0] inventory_hostname != groups['etcd'][0]
@ -97,6 +98,7 @@
args: args:
executable: /bin/bash executable: /bin/bash
register: etcd_node_cert_data register: etcd_node_cert_data
check_mode: no
delegate_to: "{{groups['etcd'][0]}}" delegate_to: "{{groups['etcd'][0]}}"
when: (('calico-rr' in groups and inventory_hostname in groups['calico-rr']) or when: (('calico-rr' in groups and inventory_hostname in groups['calico-rr']) or
inventory_hostname in groups['k8s-cluster']) and inventory_hostname in groups['k8s-cluster']) and

View file

@ -4,5 +4,6 @@
register: etcd_cluster_is_healthy register: etcd_cluster_is_healthy
failed_when: false failed_when: false
changed_when: false changed_when: false
check_mode: no
when: is_etcd_master when: is_etcd_master
tags: facts tags: facts

View file

@ -108,6 +108,7 @@
shell: rpm -qa | grep epel-release || rpm -ivh {{ epel_rpm_download_url }} shell: rpm -qa | grep epel-release || rpm -ivh {{ epel_rpm_download_url }}
when: ansible_distribution in ["CentOS","RedHat"] when: ansible_distribution in ["CentOS","RedHat"]
changed_when: False changed_when: False
check_mode: no
tags: bootstrap-os tags: bootstrap-os
- name: Install packages requirements - name: Install packages requirements

View file

@ -4,6 +4,7 @@
register: resolvconf register: resolvconf
failed_when: false failed_when: false
changed_when: false changed_when: false
check_mode: no
- set_fact: - set_fact:
resolvconf: >- resolvconf: >-

View file

@ -81,6 +81,7 @@
args: args:
executable: /bin/bash executable: /bin/bash
register: master_cert_data register: master_cert_data
check_mode: no
delegate_to: "{{groups['kube-master'][0]}}" delegate_to: "{{groups['kube-master'][0]}}"
when: inventory_hostname in groups['kube-master'] and sync_certs|default(false) and when: inventory_hostname in groups['kube-master'] and sync_certs|default(false) and
inventory_hostname != groups['kube-master'][0] inventory_hostname != groups['kube-master'][0]
@ -90,6 +91,7 @@
args: args:
executable: /bin/bash executable: /bin/bash
register: node_cert_data register: node_cert_data
check_mode: no
delegate_to: "{{groups['kube-master'][0]}}" delegate_to: "{{groups['kube-master'][0]}}"
when: inventory_hostname in groups['kube-node'] and when: inventory_hostname in groups['kube-node'] and
sync_certs|default(false) and sync_certs|default(false) and
@ -115,6 +117,7 @@
- name: Gen_certs | Unpack certs on masters - name: Gen_certs | Unpack certs on masters
shell: "base64 -d < {{ cert_tempfile.stdout }} | tar xz -C {{ kube_cert_dir }}" shell: "base64 -d < {{ cert_tempfile.stdout }} | tar xz -C {{ kube_cert_dir }}"
changed_when: false changed_when: false
check_mode: no
when: inventory_hostname in groups['kube-master'] and sync_certs|default(false) and when: inventory_hostname in groups['kube-master'] and sync_certs|default(false) and
inventory_hostname != groups['kube-master'][0] inventory_hostname != groups['kube-master'][0]
notify: set secret_changed notify: set secret_changed
@ -131,6 +134,7 @@
args: args:
executable: /bin/bash executable: /bin/bash
changed_when: false changed_when: false
check_mode: no
when: inventory_hostname in groups['kube-node'] and when: inventory_hostname in groups['kube-node'] and
sync_certs|default(false) and sync_certs|default(false) and
inventory_hostname != groups['kube-master'][0] inventory_hostname != groups['kube-master'][0]

View file

@ -40,12 +40,14 @@
shell: "(find {{ kube_token_dir }} -maxdepth 1 -type f)" shell: "(find {{ kube_token_dir }} -maxdepth 1 -type f)"
register: tokens_list register: tokens_list
changed_when: false changed_when: false
check_mode: no
delegate_to: "{{groups['kube-master'][0]}}" delegate_to: "{{groups['kube-master'][0]}}"
when: sync_tokens|default(false) when: sync_tokens|default(false)
- name: Gen_tokens | Gather tokens - name: Gen_tokens | Gather tokens
shell: "tar cfz - {{ tokens_list.stdout_lines | join(' ') }} | base64 --wrap=0" shell: "tar cfz - {{ tokens_list.stdout_lines | join(' ') }} | base64 --wrap=0"
register: tokens_data register: tokens_data
check_mode: no
delegate_to: "{{groups['kube-master'][0]}}" delegate_to: "{{groups['kube-master'][0]}}"
run_once: true run_once: true
when: sync_tokens|default(false) when: sync_tokens|default(false)

View file

@ -42,6 +42,7 @@
shell: cat /run/flannel/subnet.env | awk -F'=' '$1 == "FLANNEL_SUBNET" {print $2}' shell: cat /run/flannel/subnet.env | awk -F'=' '$1 == "FLANNEL_SUBNET" {print $2}'
register: flannel_subnet_output register: flannel_subnet_output
changed_when: false changed_when: false
check_mode: no
- set_fact: - set_fact:
flannel_subnet: "{{ flannel_subnet_output.stdout }}" flannel_subnet: "{{ flannel_subnet_output.stdout }}"
@ -51,6 +52,7 @@
shell: cat /run/flannel/subnet.env | awk -F'=' '$1 == "FLANNEL_MTU" {print $2}' shell: cat /run/flannel/subnet.env | awk -F'=' '$1 == "FLANNEL_MTU" {print $2}'
register: flannel_mtu_output register: flannel_mtu_output
changed_when: false changed_when: false
check_mode: no
- set_fact: - set_fact:
flannel_mtu: "{{ flannel_mtu_output.stdout }}" flannel_mtu: "{{ flannel_mtu_output.stdout }}"

View file

@ -38,6 +38,7 @@
- name: reset | gather mounted kubelet dirs - name: reset | gather mounted kubelet dirs
shell: mount | grep /var/lib/kubelet | awk '{print $3}' | tac shell: mount | grep /var/lib/kubelet | awk '{print $3}' | tac
check_mode: no
register: mounted_dirs register: mounted_dirs
- name: reset | unmount kubelet dirs - name: reset | unmount kubelet dirs