From ae34281f89e1b62dc95ef33a30a20bbb7c70b077 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Thu, 5 May 2016 16:06:42 -0400 Subject: Remove vars_files on play includes for upgrade playbooks. --- .../openshift-cluster/upgrades/v3_1_to_v3_2/atomic-openshift-master.j2 | 1 + playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/docker | 1 + playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/docker-cluster | 1 + playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/native-cluster | 1 + 4 files changed, 4 insertions(+) create mode 120000 playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/atomic-openshift-master.j2 create mode 120000 playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/docker create mode 120000 playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/docker-cluster create mode 120000 playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/native-cluster (limited to 'playbooks/common/openshift-cluster/upgrades') diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/atomic-openshift-master.j2 b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/atomic-openshift-master.j2 new file mode 120000 index 000000000..cf20e8959 --- /dev/null +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/atomic-openshift-master.j2 @@ -0,0 +1 @@ +../../../../../roles/openshift_master/templates/atomic-openshift-master.j2 \ No newline at end of file diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/docker b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/docker new file mode 120000 index 000000000..5a3dd12b3 --- /dev/null +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/docker @@ -0,0 +1 @@ +../../../../../roles/openshift_master/templates/docker \ No newline at end of file diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/docker-cluster b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/docker-cluster new file mode 120000 index 000000000..3ee319365 --- /dev/null +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/docker-cluster @@ -0,0 +1 @@ +../../../../../roles/openshift_master/templates/docker-cluster \ No newline at end of file diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/native-cluster b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/native-cluster new file mode 120000 index 000000000..f44f8eb4f --- /dev/null +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/native-cluster @@ -0,0 +1 @@ +../../../../../roles/openshift_master/templates/native-cluster \ No newline at end of file -- cgit v1.2.3 From a79d25b64bca2b95fb5cb2c2420fd9d10bfd1337 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Thu, 12 May 2016 17:19:09 -0400 Subject: Block upgrading w/ ansible v2. --- playbooks/common/openshift-cluster/upgrades/v3_0_minor/upgrade.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'playbooks/common/openshift-cluster/upgrades') diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_minor/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_minor/upgrade.yml index 51b108f6a..5b2bf9f93 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_0_minor/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_0_minor/upgrade.yml @@ -36,7 +36,8 @@ - name: Ensure AOS 3.0.2 or Origin 1.0.6 hosts: oo_first_master tasks: - fail: This playbook requires Origin 1.0.6 or Atomic OpenShift 3.0.2 or later + - fail: + msg: "This playbook requires Origin 1.0.6 or Atomic OpenShift 3.0.2 or later" when: _new_version.stdout | version_compare('1.0.6','<') or ( _new_version.stdout | version_compare('3.0','>=' and _new_version.stdout | version_compare('3.0.2','<') ) - name: Update cluster policy -- cgit v1.2.3