diff options
| author | Giuseppe Scrivano <gscrivano@gnu.org> | 2017-02-10 16:01:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-10 16:01:46 +0100 |
| commit | e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f (patch) | |
| tree | 8cabded134f0423b6d61cf95f00a574539d00db7 /playbooks/common | |
| parent | 07ca54fe406a533e70350aa9273d5a3df297f156 (diff) | |
| parent | b84a2cdcbdcbceed8da09485a9e9015378b5818f (diff) | |
| download | openshift-e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f.tar.gz openshift-e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f.tar.bz2 openshift-e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f.tar.xz openshift-e1e69ad8346a6938e1d58a852dbf2f8ad28eff6f.zip | |
Merge pull request #3109 from giuseppe/system-containers
System containers
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/etcd/backup.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml index d0eadf1fc..45aabf3e4 100644 --- a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml +++ b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml @@ -4,7 +4,7 @@ vars: embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}" timestamp: "{{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}" - etcdctl_command: "{{ 'etcdctl' if not openshift.common.is_containerized or embedded_etcd else 'docker exec etcd_container etcdctl' }}" + etcdctl_command: "{{ 'etcdctl' if not openshift.common.is_containerized or embedded_etcd else 'docker exec etcd_container etcdctl' if not openshift.common.is_etcd_system_container else 'runc exec etcd etcdctl' }}" roles: - openshift_facts tasks: diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml index 0f8d94737..690858c53 100644 --- a/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/etcd/upgrade.yml @@ -14,6 +14,16 @@ register: etcd_container_version failed_when: false when: openshift.common.is_containerized | bool + - name: Record containerized etcd version + command: docker exec etcd_container rpm -qa --qf '%{version}' etcd\* + register: etcd_container_version + failed_when: false + when: openshift.common.is_containerized | bool and not openshift.common.is_etcd_system_container | bool + - name: Record containerized etcd version + command: runc exec etcd_container rpm -qa --qf '%{version}' etcd\* + register: etcd_container_version + failed_when: false + when: openshift.common.is_containerized | bool and openshift.common.is_etcd_system_container | bool # I really dislike this copy/pasta but I wasn't able to find a way to get it to loop # through hosts, then loop through tasks only when appropriate |