summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-12-06 21:21:24 -0500
committerGitHub <noreply@github.com>2016-12-06 21:21:24 -0500
commit308637af4daf979d864592fe05b05c8f3c29f3a3 (patch)
treec02f83a4737b6efb415e8dec61308c64c7f74099 /playbooks/common
parenta3ce4c106304773b6002458dfb113de9fd36efde (diff)
parented7b94c19eca79182f7743f2ecab64abf65e2167 (diff)
downloadopenshift-308637af4daf979d864592fe05b05c8f3c29f3a3.tar.gz
openshift-308637af4daf979d864592fe05b05c8f3c29f3a3.tar.bz2
openshift-308637af4daf979d864592fe05b05c8f3c29f3a3.tar.xz
openshift-308637af4daf979d864592fe05b05c8f3c29f3a3.zip
Merge pull request #2928 from sdodson/etcd3-v2
Fix etcd upgrades to etcd 3.x
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/etcd/backup.yml8
-rw-r--r--playbooks/common/openshift-cluster/upgrades/etcd/main.yml20
2 files changed, 15 insertions, 13 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml
index b7f0267c1..cfb273b82 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml
@@ -41,9 +41,11 @@
{{ avail_disk.stdout }} Kb available.
when: (embedded_etcd | bool) and (etcd_disk_usage.stdout|int > avail_disk.stdout|int)
- - name: Install etcd (for etcdctl)
- package: name=etcd state=present
- when: not openshift.common.is_atomic | bool
+ # for non containerized etcd is already installed, don't touch it, but for containerized
+ # but not atomic always get the latest
+ - name: Install latest text for containerized but not atomic
+ package: name=etcd state=latest
+ when: not openshift.common.is_atomic | bool and openshift.common.is_containerized
- name: Generate etcd backup
command: >
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml
index 192799376..bda0940ab 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/main.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/main.yml
@@ -38,12 +38,12 @@
tasks:
- name: Record RPM based etcd version
command: rpm -qa --qf '%{version}' etcd\*
- register: etcd_installed_version
+ register: etcd_rpm_version
failed_when: false
when: not openshift.common.is_containerized | bool
- name: Record containerized etcd version
command: docker exec etcd_container rpm -qa --qf '%{version}' etcd\*
- register: etcd_installed_version
+ register: etcd_container_version
failed_when: false
when: openshift.common.is_containerized | bool
@@ -56,7 +56,7 @@
upgrade_version: '2.1'
tasks:
- include: rhel_tasks.yml
- when: etcd_installed_version.stdout | default('99') | version_compare('2.1','<') and ansible_distribution == 'RedHat' and not openshift.common.is_containerized | bool
+ when: etcd_rpm_version.stdout | default('99') | version_compare('2.1','<') and ansible_distribution == 'RedHat' and not openshift.common.is_containerized | bool
- name: Upgrade RPM hosts to 2.2
hosts: etcd_hosts_to_upgrade
@@ -65,7 +65,7 @@
upgrade_version: '2.2'
tasks:
- include: rhel_tasks.yml
- when: etcd_installed_version.stdout | default('99') | version_compare('2.2','<') and ansible_distribution == 'RedHat' and not openshift.common.is_containerized | bool
+ when: etcd_rpm_version.stdout | default('99') | version_compare('2.2','<') and ansible_distribution == 'RedHat' and not openshift.common.is_containerized | bool
- name: Upgrade containerized hosts to 2.2.5
hosts: etcd_hosts_to_upgrade
@@ -74,7 +74,7 @@
upgrade_version: 2.2.5
tasks:
- include: containerized_tasks.yml
- when: etcd_installed_version.stdout | default('99') | version_compare('2.2','<') and openshift.common.is_containerized | bool
+ when: etcd_container_version.stdout | default('99') | version_compare('2.2','<') and openshift.common.is_containerized | bool
- name: Upgrade RPM hosts to 2.3
hosts: etcd_hosts_to_upgrade
@@ -83,7 +83,7 @@
upgrade_version: '2.3'
tasks:
- include: rhel_tasks.yml
- when: etcd_installed_version.stdout | default('99') | version_compare('2.3','<') and ansible_distribution == 'RedHat' and not openshift.common.is_containerized | bool
+ when: etcd_rpm_version.stdout | default('99') | version_compare('2.3','<') and ansible_distribution == 'RedHat' and not openshift.common.is_containerized | bool
- name: Upgrade containerized hosts to 2.3.7
hosts: etcd_hosts_to_upgrade
@@ -92,7 +92,7 @@
upgrade_version: 2.3.7
tasks:
- include: containerized_tasks.yml
- when: etcd_installed_version.stdout | default('99') | version_compare('2.3','<') and openshift.common.is_containerized | bool
+ when: etcd_container_version.stdout | default('99') | version_compare('2.3','<') and openshift.common.is_containerized | bool
- name: Upgrade RPM hosts to 3.0
hosts: etcd_hosts_to_upgrade
@@ -101,16 +101,16 @@
upgrade_version: '3.0'
tasks:
- include: rhel_tasks.yml
- when: etcd_installed_version.stdout | default('99') | version_compare('3.0','<') and ansible_distribution == 'RedHat' and not openshift.common.is_containerized | bool
+ when: etcd_rpm_version.stdout | default('99') | version_compare('3.0','<') and ansible_distribution == 'RedHat' and not openshift.common.is_containerized | bool
- name: Upgrade containerized hosts to etcd3 image
hosts: etcd_hosts_to_upgrade
serial: 1
vars:
- upgrade_version: 3.0.3
+ upgrade_version: 3.0.14
tasks:
- include: containerized_tasks.yml
- when: etcd_installed_version.stdout | default('99') | version_compare('3.0','<') and openshift.common.is_containerized | bool
+ when: etcd_container_version.stdout | default('99') | version_compare('3.0','<') and openshift.common.is_containerized | bool
- name: Upgrade fedora to latest
hosts: etcd_hosts_to_upgrade