From 7197aba51d24ab2cf6cde77efa853903d7ddd5ba Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Wed, 28 Oct 2015 12:12:39 -0300
Subject: Block upgrade if targetting enterprise deployment type.

enterprise is being phased out in favor of openshift-enterprise, you need to
specify where you wish to go.
---
 playbooks/adhoc/upgrades/upgrade.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index 56a1df860..e8d6a335d 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -1,4 +1,12 @@
 ---
+- name: Verify deployment type
+  hosts: masters
+  tasks:
+  # Checking the global deployment type rather than host facts, this is about
+  # what the user is requesting.
+    - fail: msg="Deployment type enterprise not supported for upgrade"
+      when: deployment_type == "enterprise"
+
 - name: Re-Run cluster configuration to apply latest configuration changes
   include: ../../common/openshift-cluster/config.yml
   vars:
-- 
cgit v1.2.3


From 3d7c5c6fd545112d87fa09e4a8c3f3cbc1cda1ee Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Wed, 28 Oct 2015 15:29:52 -0300
Subject: First cut at checking available disk space for etcd backup.

---
 playbooks/adhoc/upgrades/upgrade.yml | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index e8d6a335d..c2c1d57e8 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -1,5 +1,5 @@
 ---
-- name: Verify deployment type
+- name: Verify upgrade can proceed
   hosts: masters
   tasks:
   # Checking the global deployment type rather than host facts, this is about
@@ -7,6 +7,31 @@
     - fail: msg="Deployment type enterprise not supported for upgrade"
       when: deployment_type == "enterprise"
 
+- name: Backup etcd
+  hosts: masters
+  vars:
+    embedded_etcd: "{{ openshift.master.embedded_etcd }}"
+  roles:
+  - openshift_facts
+  tasks:
+  - name: display all variables set for the current host
+    debug:
+      var: hostvars[inventory_hostname]
+  - debug: var=embedded_etcd
+  - name: Check available data dir disk space
+    shell: >
+      df --output=avail -k {{ openshift.common.data_dir }} | tail -n 1
+    register: avail_disk
+    when: embedded_etcd | bool
+  - debug: var=avail_disk.stdout
+  - name: Check current etcd disk usage
+    shell: >
+      df --output=avail -k /var/lib/openshift/openshift.local.etcd/ | tail -n 1
+    register: etc_disk_usage
+    when: embedded_etcd | bool
+  - debug: var=etc_disk_usage.stdout
+  - fail: msg="All done for now."
+
 - name: Re-Run cluster configuration to apply latest configuration changes
   include: ../../common/openshift-cluster/config.yml
   vars:
-- 
cgit v1.2.3


From 18df191a381ced63613dea302c5bf2e172d3c803 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Thu, 29 Oct 2015 15:07:42 -0300
Subject: Functional disk space checking for etcd backup.

---
 playbooks/adhoc/upgrades/upgrade.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index c2c1d57e8..ec0eca66c 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -26,10 +26,13 @@
   - debug: var=avail_disk.stdout
   - name: Check current etcd disk usage
     shell: >
-      df --output=avail -k /var/lib/openshift/openshift.local.etcd/ | tail -n 1
+      du -k {{ openshift.common.data_dir }}/openshift.local.etcd | tail -n 1 | cut -f1
     register: etc_disk_usage
     when: embedded_etcd | bool
   - debug: var=etc_disk_usage.stdout
+  - name: Abort if insufficient disk space for etcd backup
+    fail: msg="{{ etc_disk_usage.stdout }} Kb disk space required for etcd backup, {{ avail_disk.stdout }} Kb available."
+    when: (embedded_etcd | bool) and (etc_disk_usage.stdout|int > avail_disk.stdout|int)
   - fail: msg="All done for now."
 
 - name: Re-Run cluster configuration to apply latest configuration changes
-- 
cgit v1.2.3


From ef2e4fc1fa247ba51394766f9cf9279f0beaf0b0 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Fri, 30 Oct 2015 09:02:26 -0300
Subject: Add etcd_data_dir fact.

---
 playbooks/adhoc/upgrades/upgrade.yml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index ec0eca66c..948a320a2 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -14,25 +14,26 @@
   roles:
   - openshift_facts
   tasks:
-  - name: display all variables set for the current host
-    debug:
-      var: hostvars[inventory_hostname]
-  - debug: var=embedded_etcd
-  - name: Check available data dir disk space
+  - debug: var=etcd_data_dir
+  - name: Check available disk space for etcd backup
+    # We assume to be using the data dir for all backups.
     shell: >
       df --output=avail -k {{ openshift.common.data_dir }} | tail -n 1
     register: avail_disk
-    when: embedded_etcd | bool
-  - debug: var=avail_disk.stdout
-  - name: Check current etcd disk usage
+
+  - name: Check current embedded etcd disk usage
     shell: >
-      du -k {{ openshift.common.data_dir }}/openshift.local.etcd | tail -n 1 | cut -f1
-    register: etc_disk_usage
+      du -k {{ openshift.master.etcd_data_dir }} | tail -n 1 | cut -f1
+    register: etcd_disk_usage
     when: embedded_etcd | bool
-  - debug: var=etc_disk_usage.stdout
+
   - name: Abort if insufficient disk space for etcd backup
-    fail: msg="{{ etc_disk_usage.stdout }} Kb disk space required for etcd backup, {{ avail_disk.stdout }} Kb available."
-    when: (embedded_etcd | bool) and (etc_disk_usage.stdout|int > avail_disk.stdout|int)
+    fail: msg="{{ etcd_disk_usage.stdout }} Kb disk space required for etcd backup, {{ avail_disk.stdout }} Kb available."
+    when: (embedded_etcd | bool) and (etcd_disk_usage.stdout|int > avail_disk.stdout|int)
+  - name: Install etcd (for etcdctl)
+    yum: pkg=etcd state=latest
+  - name: Generate etcd backup
+    command: etcdctl backup
   - fail: msg="All done for now."
 
 - name: Re-Run cluster configuration to apply latest configuration changes
-- 
cgit v1.2.3


From 561c347d54c3a124f64b54eedbf6d2d56fb07c34 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Fri, 30 Oct 2015 09:41:12 -0300
Subject: Generate timestamped etcd backups.

---
 playbooks/adhoc/upgrades/upgrade.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index 948a320a2..11d89a3da 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -11,10 +11,10 @@
   hosts: masters
   vars:
     embedded_etcd: "{{ openshift.master.embedded_etcd }}"
+    timestamp: "{{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}"
   roles:
   - openshift_facts
   tasks:
-  - debug: var=etcd_data_dir
   - name: Check available disk space for etcd backup
     # We assume to be using the data dir for all backups.
     shell: >
@@ -33,7 +33,7 @@
   - name: Install etcd (for etcdctl)
     yum: pkg=etcd state=latest
   - name: Generate etcd backup
-    command: etcdctl backup
+    command: etcdctl backup --data-dir={{ openshift.master.etcd_data_dir }} --backup-dir={{ openshift.common.data_dir }}/etcd-backup-{{ timestamp }}
   - fail: msg="All done for now."
 
 - name: Re-Run cluster configuration to apply latest configuration changes
-- 
cgit v1.2.3


From 83e20a43c7b7e6876a7828d02b7fc96b8c8bbf38 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Fri, 30 Oct 2015 11:20:44 -0300
Subject: Remove devel fail and let upgrade proceed.

---
 playbooks/adhoc/upgrades/upgrade.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index 11d89a3da..30896dc8e 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -34,7 +34,6 @@
     yum: pkg=etcd state=latest
   - name: Generate etcd backup
     command: etcdctl backup --data-dir={{ openshift.master.etcd_data_dir }} --backup-dir={{ openshift.common.data_dir }}/etcd-backup-{{ timestamp }}
-  - fail: msg="All done for now."
 
 - name: Re-Run cluster configuration to apply latest configuration changes
   include: ../../common/openshift-cluster/config.yml
@@ -50,6 +49,8 @@
   vars:
     openshift_version: "{{ openshift_pkg_version | default('') }}"
   tasks:
+    - name: Upgrade to latest available kernel
+      yum: pkg=kernel state=latest
     - name: Upgrade master packages
       yum: pkg={{ openshift.common.service_type }}-master{{ openshift_version }} state=latest
     - name: Restart master services
-- 
cgit v1.2.3


From 866dcbe962464a571f24e1e4ae5a9e928f7bbc47 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Mon, 2 Nov 2015 13:14:26 -0400
Subject: Fix etcd backup bug with not-yet-created /var/lib/origin symlink

---
 playbooks/adhoc/upgrades/upgrade.yml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index 30896dc8e..c543a4416 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -15,6 +15,11 @@
   roles:
   - openshift_facts
   tasks:
+  - stat: path=/var/lib/openshift
+    register: var_lib_openshift
+  - name: Create origin symlink if necessary
+    file: src=/var/lib/openshift/ dest=/var/lib/origin state=link
+    when: var_lib_openshift.stat.exists == True
   - name: Check available disk space for etcd backup
     # We assume to be using the data dir for all backups.
     shell: >
-- 
cgit v1.2.3


From 078a44715b1190f4a7e0b098b0dc87446d88ac8c Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Mon, 2 Nov 2015 17:09:54 -0500
Subject: initial module framework

---
 .../upgrades/library/openshift_upgrade_config.py   | 62 ++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100755 playbooks/adhoc/upgrades/library/openshift_upgrade_config.py

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
new file mode 100755
index 000000000..157fbc5c2
--- /dev/null
+++ b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
@@ -0,0 +1,62 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# vim: expandtab:tabstop=4:shiftwidth=4
+
+"""Ansible module for modifying OpenShift configs during an upgrade"""
+
+DOCUMENTATION = '''
+---
+module: openshift_upgrade_config
+short_description: OpenShift Upgrade Config
+author: Jason DeTiberus
+requirements: [ ]
+'''
+EXAMPLES = '''
+'''
+
+def upgrade_master_3_0_to_3_1(backup):
+    pass
+
+
+def upgrade_master(from_version, to_version, backup):
+    if from_version == '3.0':
+        if to_version == '3.1':
+            upgrade_master_3_0_to_3_1(backup)
+
+
+def main():
+    """ main """
+    # disabling pylint errors for global-variable-undefined and invalid-name
+    # for 'global module' usage, since it is required to use ansible_facts
+    # pylint: disable=global-variable-undefined, invalid-name
+    global module
+
+    module = AnsibleModule(
+        argument_spec=dict(
+            from_version=dict(required=True, choices=['3.0']),
+            to_version=dict(required=True, choices=['3.1']),
+            role=dict(required=True, choices=['master']),
+            backup=dict(required=False, default=True, type='bool')
+        ),
+        supports_check_mode=True,
+    )
+
+    changed = False
+
+    from_version = module.params['from_version']
+    to_version = module.params['to_version']
+    role = module.params['role']
+    backup = module.params['backup']
+
+    if role == 'master':
+        upgrade_master(from_version, to_version, backup)
+
+    return module.exit_json(changed=changed)
+
+# ignore pylint errors related to the module_utils import
+# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import
+# import module snippets
+from ansible.module_utils.basic import *
+
+if __name__ == '__main__':
+    main()
-- 
cgit v1.2.3


From cbf98f53b0975a829a5720c33149c7014d5bd7cd Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Tue, 3 Nov 2015 09:27:13 -0400
Subject: Implement master-config.yaml upgrade for v1beta3 apiLevel removal.

---
 .../upgrades/library/openshift_upgrade_config.py   | 53 ++++++++++++++++++++--
 playbooks/adhoc/upgrades/upgrade.yml               | 25 ++++++----
 2 files changed, 66 insertions(+), 12 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
index 157fbc5c2..f41c6fb59 100755
--- a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
+++ b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
@@ -2,6 +2,12 @@
 # -*- coding: utf-8 -*-
 # vim: expandtab:tabstop=4:shiftwidth=4
 
+import os
+import shutil
+import yaml
+
+from datetime import datetime
+
 """Ansible module for modifying OpenShift configs during an upgrade"""
 
 DOCUMENTATION = '''
@@ -14,14 +20,53 @@ requirements: [ ]
 EXAMPLES = '''
 '''
 
+def get_cfg_dir():
+    cfg_path = '/etc/origin/'
+    if not os.path.exists(cfg_path):
+        cfg_path = '/etc/openshift/'
+    return cfg_path
+
 def upgrade_master_3_0_to_3_1(backup):
-    pass
+    changed = False
+
+    # Facts do not get transferred to the hosts where custom modules run,
+    # need to make some assumptions here.
+    master_config = os.path.join(get_cfg_dir(), 'master/master-config.yaml')
+
+    f = open(master_config, 'r')
+    config = yaml.safe_load(f.read())
+    f.close()
+
+    # Remove v1beta3 from apiLevels:
+    if 'apiLevels' in config and \
+        'v1beta3' in config['apiLevels']:
+            config['apiLevels'].remove('v1beta3')
+            changed = True
+    if 'kubernetesMasterConfig' in config and \
+        'apiLevels' in config['kubernetesMasterConfig'] and \
+        'v1beta3' in config['kubernetesMasterConfig']['apiLevels']:
+            config['kubernetesMasterConfig']['apiLevels'].remove('v1beta3')
+            changed = True
+
+    if changed:
+        if backup:
+            timestamp = datetime.now().strftime('%Y%m%d%H%M%S')
+            basedir = os.path.split(master_config)[0]
+            backup_file = os.path.join(basedir, 'master-config.yaml.bak-%s'
+                % timestamp)
+            shutil.copyfile(master_config, backup_file)
+        # Write the modified config:
+        out_file = open(master_config, 'w')
+        out_file.write(yaml.safe_dump(config, default_flow_style=False))
+        out_file.close()
+
+    return changed
 
 
 def upgrade_master(from_version, to_version, backup):
     if from_version == '3.0':
         if to_version == '3.1':
-            upgrade_master_3_0_to_3_1(backup)
+            return upgrade_master_3_0_to_3_1(backup)
 
 
 def main():
@@ -41,15 +86,15 @@ def main():
         supports_check_mode=True,
     )
 
-    changed = False
 
     from_version = module.params['from_version']
     to_version = module.params['to_version']
     role = module.params['role']
     backup = module.params['backup']
 
+    changed = False
     if role == 'master':
-        upgrade_master(from_version, to_version, backup)
+        changed = upgrade_master(from_version, to_version, backup)
 
     return module.exit_json(changed=changed)
 
diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index e55f1536f..6cb6803a9 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -40,6 +40,15 @@
   - name: Generate etcd backup
     command: etcdctl backup --data-dir={{ openshift.master.etcd_data_dir }} --backup-dir={{ openshift.common.data_dir }}/etcd-backup-{{ timestamp }}
 
+- name: Update 3.0 configuration to 3.1
+  hosts: masters
+  tasks:
+  tasks:
+    - debug: var=openshift_master_config_dir
+    - name: Upgrade configuration.
+      openshift_upgrade_config: from_version=3.0 to_version=3.1 role=master
+    - fail: All done for now.
+
 - name: Upgrade base package on masters
   hosts: masters
   roles:
@@ -50,14 +59,14 @@
     - name: Upgrade base package
       yum: pkg={{ openshift.common.service_type }}{{ openshift_version  }} state=latest
 
-- name: Re-Run cluster configuration to apply latest configuration changes
-  include: ../../common/openshift-cluster/config.yml
-  vars:
-    g_etcd_group: "{{ 'etcd' }}"
-    g_masters_group: "{{ 'masters' }}"
-    g_nodes_group: "{{ 'nodes' }}"
-    openshift_cluster_id: "{{ cluster_id | default('default') }}"
-    openshift_deployment_type: "{{ deployment_type }}"
+      #- name: Re-Run cluster configuration to apply latest configuration changes
+      #  include: ../../common/openshift-cluster/config.yml
+      #  vars:
+      #    g_etcd_group: "{{ 'etcd' }}"
+      #    g_masters_group: "{{ 'masters' }}"
+      #    g_nodes_group: "{{ 'nodes' }}"
+      #    openshift_cluster_id: "{{ cluster_id | default('default') }}"
+      #    openshift_deployment_type: "{{ deployment_type }}"
 
 - name: Upgrade masters
   hosts: masters
-- 
cgit v1.2.3


From 6b03fcb185c7f37e258dd34ca8b70d5c124cabba Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Tue, 3 Nov 2015 11:48:27 -0400
Subject: Add in proxyClientInfo if missing during config upgrade.

---
 playbooks/adhoc/upgrades/library/openshift_upgrade_config.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
index f41c6fb59..95c7b1664 100755
--- a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
+++ b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
@@ -26,6 +26,7 @@ def get_cfg_dir():
         cfg_path = '/etc/openshift/'
     return cfg_path
 
+
 def upgrade_master_3_0_to_3_1(backup):
     changed = False
 
@@ -42,12 +43,18 @@ def upgrade_master_3_0_to_3_1(backup):
         'v1beta3' in config['apiLevels']:
             config['apiLevels'].remove('v1beta3')
             changed = True
-    if 'kubernetesMasterConfig' in config and \
-        'apiLevels' in config['kubernetesMasterConfig'] and \
+    if 'apiLevels' in config['kubernetesMasterConfig'] and \
         'v1beta3' in config['kubernetesMasterConfig']['apiLevels']:
             config['kubernetesMasterConfig']['apiLevels'].remove('v1beta3')
             changed = True
 
+    # Add the new master proxy client certs:
+    if 'proxyClientInfo' not in config['kubernetesMasterConfig']:
+        config['kubernetesMasterConfig']['proxyClientInfo'] = {
+            'certFile': 'master.proxy-client.crt',
+            'keyFile': 'master.proxy-client.key'
+        }
+
     if changed:
         if backup:
             timestamp = datetime.now().strftime('%Y%m%d%H%M%S')
@@ -86,7 +93,6 @@ def main():
         supports_check_mode=True,
     )
 
-
     from_version = module.params['from_version']
     to_version = module.params['to_version']
     role = module.params['role']
-- 
cgit v1.2.3


From 74420660b1b12a00392a6d88a257e0cfe1b0a08e Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Tue, 3 Nov 2015 12:34:05 -0400
Subject: Move config upgrade to correct place, fix node facts.

---
 playbooks/adhoc/upgrades/upgrade.yml          | 29 ++++++++++++++++++---------
 playbooks/common/openshift-cluster/config.yml |  6 +++---
 2 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index 6cb6803a9..6e7292da1 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -40,15 +40,6 @@
   - name: Generate etcd backup
     command: etcdctl backup --data-dir={{ openshift.master.etcd_data_dir }} --backup-dir={{ openshift.common.data_dir }}/etcd-backup-{{ timestamp }}
 
-- name: Update 3.0 configuration to 3.1
-  hosts: masters
-  tasks:
-  tasks:
-    - debug: var=openshift_master_config_dir
-    - name: Upgrade configuration.
-      openshift_upgrade_config: from_version=3.0 to_version=3.1 role=master
-    - fail: All done for now.
-
 - name: Upgrade base package on masters
   hosts: masters
   roles:
@@ -77,6 +68,8 @@
       yum: pkg=kernel state=latest
     - name: Upgrade master packages
       yum: pkg={{ openshift.common.service_type }}-master{{ openshift_version }} state=latest
+    - name: Upgrade master configuration.
+      openshift_upgrade_config: from_version=3.0 to_version=3.1 role=master
     - name: Restart master services
       service: name="{{ openshift.common.service_type}}-master" state=restarted
 
@@ -84,12 +77,30 @@
   hosts: nodes
   vars:
     openshift_version: "{{ openshift_pkg_version | default('') }}"
+  roles:
+  - openshift_facts
   tasks:
     - name: Upgrade node packages
       yum: pkg={{ openshift.common.service_type }}-node{{ openshift_version }} state=latest
     - name: Restart node services
       service: name="{{ openshift.common.service_type }}-node" state=restarted
 
+- name: Evaluate oo_first_master
+  hosts: localhost
+  vars:
+    g_masters_group: "{{ 'masters' }}"
+  tasks:
+    - name: display all variables set for the current host
+      debug:
+        var: hostvars[inventory_hostname]
+    - name: Evaluate oo_first_master
+      add_host:
+        name: "{{ groups[g_masters_group][0] }}"
+        groups: oo_first_master
+        ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
+        ansible_sudo: "{{ g_sudo | default(omit) }}"
+      when: g_masters_group in groups and (groups[g_masters_group] | length) > 0
+
 - name: Determine new master version
   hosts: oo_first_master
   tasks:
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 4c74f96db..e6bf41ae4 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -4,15 +4,15 @@
   gather_facts: no
   tasks:
   - fail:
-      msg: This playbook rquires g_etcd_group to be set
+      msg: This playbook requires g_etcd_group to be set
     when: g_etcd_group is not defined
 
   - fail:
-      msg: This playbook rquires g_masters_group to be set
+      msg: This playbook requires g_masters_group to be set
     when: g_masters_group is not defined
 
   - fail:
-      msg: This playbook rquires g_nodes_group to be set
+      msg: This playbook requires g_nodes_group to be set
     when: g_nodes_group is not defined
 
   - name: Evaluate oo_etcd_to_config
-- 
cgit v1.2.3


From 867a372321270311946375d71f7d08aab2b56d67 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Tue, 3 Nov 2015 14:57:06 -0400
Subject: Add debug output for location of etcd backup.

---
 playbooks/adhoc/upgrades/upgrade.yml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index e55f1536f..539710469 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -39,6 +39,9 @@
     yum: pkg=etcd state=latest
   - name: Generate etcd backup
     command: etcdctl backup --data-dir={{ openshift.master.etcd_data_dir }} --backup-dir={{ openshift.common.data_dir }}/etcd-backup-{{ timestamp }}
+  - name: Display location of etcd backup
+    debug: msg="Etcd backup created in {{ openshift.common.data_dir }}/etcd-backup-{{ timestamp }}"
+
 
 - name: Upgrade base package on masters
   hosts: masters
-- 
cgit v1.2.3


From 4a4ecb7e4517dddf989441f0e7d99617917f942d Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Wed, 4 Nov 2015 08:14:46 -0400
Subject: Skip fail if enterprise deployment type depending on version.

---
 playbooks/adhoc/upgrades/upgrade.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index 539710469..ffcd2757b 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -98,6 +98,14 @@
     fail: 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: Verify upgrade can proceed
+  hosts: masters
+  tasks:
+  # Checking the global deployment type rather than host facts, this is about
+  # what the user is requesting.
+  - fail: msg="Deployment type 'enterprise' must be updated to 'openshift-enterprise' for upgrade to proceed"
+    when: deployment_type == "enterprise" and (_new_version.stdout | version_compare('1.0.7', '>=') or _new_version.stdout | version_compare('3.1', '>='))
+
 - name: Update cluster policy
   hosts: oo_first_master
   tasks:
-- 
cgit v1.2.3


From 8ca4308854c44649d2dcfd94f441790c2e5c5d2b Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Wed, 4 Nov 2015 08:27:21 -0400
Subject: Use the base package upgrade version so we can check things earlier.

---
 playbooks/adhoc/upgrades/upgrade.yml | 64 +++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 23 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index ffcd2757b..a959aa881 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -42,7 +42,6 @@
   - name: Display location of etcd backup
     debug: msg="Etcd backup created in {{ openshift.common.data_dir }}/etcd-backup-{{ timestamp }}"
 
-
 - name: Upgrade base package on masters
   hosts: masters
   roles:
@@ -53,6 +52,47 @@
     - name: Upgrade base package
       yum: pkg={{ openshift.common.service_type }}{{ openshift_version  }} state=latest
 
+- name: Evaluate oo_first_master
+  hosts: localhost
+  vars:
+    g_masters_group: "{{ 'masters' }}"
+  tasks:
+    - name: display all variables set for the current host
+      debug:
+        var: hostvars[inventory_hostname]
+    - name: Evaluate oo_first_master
+      add_host:
+        name: "{{ groups[g_masters_group][0] }}"
+        groups: oo_first_master
+        ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
+        ansible_sudo: "{{ g_sudo | default(omit) }}"
+      when: g_masters_group in groups and (groups[g_masters_group] | length) > 0
+
+# TODO: ideally we would check the new version, without installing it. (some
+# kind of yum repoquery? would need to handle openshift -> atomic-openshift
+# package rename)
+- name: Perform upgrade version checking
+  hosts: oo_first_master
+  tasks:
+    - name: Determine new version
+      command: >
+        rpm -q --queryformat '%{version}' {{ openshift.common.service_type }}
+      register: _new_version
+
+- 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
+    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: Verify upgrade can proceed
+  hosts: oo_first_master
+  tasks:
+  # Checking the global deployment type rather than host facts, this is about
+  # what the user is requesting.
+  - fail: msg="Deployment type 'enterprise' must be updated to 'openshift-enterprise' for upgrade to proceed"
+    when: deployment_type == "enterprise" and (_new_version.stdout | version_compare('1.0.7', '>=') or _new_version.stdout | version_compare('3.1', '>='))
+
 - name: Re-Run cluster configuration to apply latest configuration changes
   include: ../../common/openshift-cluster/config.yml
   vars:
@@ -84,28 +124,6 @@
     - name: Restart node services
       service: name="{{ openshift.common.service_type }}-node" state=restarted
 
-- name: Determine new master version
-  hosts: oo_first_master
-  tasks:
-    - name: Determine new version
-      command: >
-        rpm -q --queryformat '%{version}' {{ openshift.common.service_type }}-master
-      register: _new_version
-
-- 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
-    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: Verify upgrade can proceed
-  hosts: masters
-  tasks:
-  # Checking the global deployment type rather than host facts, this is about
-  # what the user is requesting.
-  - fail: msg="Deployment type 'enterprise' must be updated to 'openshift-enterprise' for upgrade to proceed"
-    when: deployment_type == "enterprise" and (_new_version.stdout | version_compare('1.0.7', '>=') or _new_version.stdout | version_compare('3.1', '>='))
-
 - name: Update cluster policy
   hosts: oo_first_master
   tasks:
-- 
cgit v1.2.3


From 215a7aacc2fc3df19a64a2a57910516533665423 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Wed, 4 Nov 2015 10:41:39 -0400
Subject: Fix bug with not upgrading openshift-master to
 atomic-openshift-master.

Removing the full call to config resulted in rpms not getting upgraded. Config
was doing a yum update of everything, which picks up the
atomic-openshift-master obsoleting openshift-master. The actual yum call
changed here would not. Instead we switch to a direct call to yum which
correctly picks up the obsoletes and updates to atomic-openshift packages.
---
 playbooks/adhoc/upgrades/upgrade.yml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index 8c1138797..0f505bf7d 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -57,9 +57,6 @@
   vars:
     g_masters_group: "{{ 'masters' }}"
   tasks:
-    - name: display all variables set for the current host
-      debug:
-        var: hostvars[inventory_hostname]
     - name: Evaluate oo_first_master
       add_host:
         name: "{{ groups[g_masters_group][0] }}"
@@ -93,15 +90,6 @@
   - fail: msg="Deployment type 'enterprise' must be updated to 'openshift-enterprise' for upgrade to proceed"
     when: deployment_type == "enterprise" and (_new_version.stdout | version_compare('1.0.7', '>=') or _new_version.stdout | version_compare('3.1', '>='))
 
-      #- name: Re-Run cluster configuration to apply latest configuration changes
-      #  include: ../../common/openshift-cluster/config.yml
-      #  vars:
-      #    g_etcd_group: "{{ 'etcd' }}"
-      #    g_masters_group: "{{ 'masters' }}"
-      #    g_nodes_group: "{{ 'nodes' }}"
-      #    openshift_cluster_id: "{{ cluster_id | default('default') }}"
-      #    openshift_deployment_type: "{{ deployment_type }}"
-
 - name: Upgrade masters
   hosts: masters
   vars:
@@ -109,8 +97,11 @@
   tasks:
     - name: Upgrade to latest available kernel
       yum: pkg=kernel state=latest
+    - name: display just the deployment_type variable for the current host
+      debug:
+        var: hostvars[inventory_hostname]
     - name: Upgrade master packages
-      yum: pkg={{ openshift.common.service_type }}-master{{ openshift_version }} state=latest
+      command: yum update -y {{ openshift.common.service_type }}-master{{ openshift_version }}
     - name: Upgrade master configuration.
       openshift_upgrade_config: from_version=3.0 to_version=3.1 role=master
     - name: Restart master services
@@ -124,7 +115,7 @@
   - openshift_facts
   tasks:
     - name: Upgrade node packages
-      yum: pkg={{ openshift.common.service_type }}-node{{ openshift_version }} state=latest
+      command: yum update -y {{ openshift.common.service_type }}-node{{ openshift_version }}
     - name: Restart node services
       service: name="{{ openshift.common.service_type }}-node" state=restarted
 
-- 
cgit v1.2.3


From abab19316ff270d090e27a1fb576b78889e5563c Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Wed, 4 Nov 2015 15:49:57 -0400
Subject: Disable proxy cert config upgrade until certs being generated.

---
 playbooks/adhoc/upgrades/library/openshift_upgrade_config.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
index 95c7b1664..357f244e0 100755
--- a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
+++ b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
@@ -49,11 +49,12 @@ def upgrade_master_3_0_to_3_1(backup):
             changed = True
 
     # Add the new master proxy client certs:
-    if 'proxyClientInfo' not in config['kubernetesMasterConfig']:
-        config['kubernetesMasterConfig']['proxyClientInfo'] = {
-            'certFile': 'master.proxy-client.crt',
-            'keyFile': 'master.proxy-client.key'
-        }
+    # TODO: re-enable this once these certs are generated during upgrade:
+#    if 'proxyClientInfo' not in config['kubernetesMasterConfig']:
+#        config['kubernetesMasterConfig']['proxyClientInfo'] = {
+#            'certFile': 'master.proxy-client.crt',
+#            'keyFile': 'master.proxy-client.key'
+#       }
 
     if changed:
         if backup:
-- 
cgit v1.2.3


From 922cc828e959eb9bc0438890a876e7830cd73717 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Wed, 4 Nov 2015 16:07:58 -0400
Subject: Pylint fixes for config upgrade module.

---
 .../upgrades/library/openshift_upgrade_config.py   | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
index 357f244e0..60f4fd8b8 100755
--- a/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
+++ b/playbooks/adhoc/upgrades/library/openshift_upgrade_config.py
@@ -2,14 +2,14 @@
 # -*- coding: utf-8 -*-
 # vim: expandtab:tabstop=4:shiftwidth=4
 
+"""Ansible module for modifying OpenShift configs during an upgrade"""
+
 import os
 import shutil
 import yaml
 
 from datetime import datetime
 
-"""Ansible module for modifying OpenShift configs during an upgrade"""
-
 DOCUMENTATION = '''
 ---
 module: openshift_upgrade_config
@@ -21,6 +21,7 @@ EXAMPLES = '''
 '''
 
 def get_cfg_dir():
+    """Return the correct config directory to use."""
     cfg_path = '/etc/origin/'
     if not os.path.exists(cfg_path):
         cfg_path = '/etc/openshift/'
@@ -28,25 +29,26 @@ def get_cfg_dir():
 
 
 def upgrade_master_3_0_to_3_1(backup):
+    """Main upgrade method for 3.0 to 3.1."""
     changed = False
 
     # Facts do not get transferred to the hosts where custom modules run,
     # need to make some assumptions here.
     master_config = os.path.join(get_cfg_dir(), 'master/master-config.yaml')
 
-    f = open(master_config, 'r')
-    config = yaml.safe_load(f.read())
-    f.close()
+    master_cfg_file = open(master_config, 'r')
+    config = yaml.safe_load(master_cfg_file.read())
+    master_cfg_file.close()
 
     # Remove v1beta3 from apiLevels:
     if 'apiLevels' in config and \
         'v1beta3' in config['apiLevels']:
-            config['apiLevels'].remove('v1beta3')
-            changed = True
+        config['apiLevels'].remove('v1beta3')
+        changed = True
     if 'apiLevels' in config['kubernetesMasterConfig'] and \
         'v1beta3' in config['kubernetesMasterConfig']['apiLevels']:
-            config['kubernetesMasterConfig']['apiLevels'].remove('v1beta3')
-            changed = True
+        config['kubernetesMasterConfig']['apiLevels'].remove('v1beta3')
+        changed = True
 
     # Add the new master proxy client certs:
     # TODO: re-enable this once these certs are generated during upgrade:
@@ -61,7 +63,7 @@ def upgrade_master_3_0_to_3_1(backup):
             timestamp = datetime.now().strftime('%Y%m%d%H%M%S')
             basedir = os.path.split(master_config)[0]
             backup_file = os.path.join(basedir, 'master-config.yaml.bak-%s'
-                % timestamp)
+                                       % timestamp)
             shutil.copyfile(master_config, backup_file)
         # Write the modified config:
         out_file = open(master_config, 'w')
@@ -72,6 +74,7 @@ def upgrade_master_3_0_to_3_1(backup):
 
 
 def upgrade_master(from_version, to_version, backup):
+    """Upgrade entry point."""
     if from_version == '3.0':
         if to_version == '3.1':
             return upgrade_master_3_0_to_3_1(backup)
-- 
cgit v1.2.3


From 75d357c9bba120221a5f996660aa4fdbb87f1fa8 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Wed, 4 Nov 2015 16:10:07 -0400
Subject: Override hosts deployment_type fact for version we're upgrading to.

---
 playbooks/adhoc/upgrades/upgrade.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'playbooks')

diff --git a/playbooks/adhoc/upgrades/upgrade.yml b/playbooks/adhoc/upgrades/upgrade.yml
index 0f505bf7d..09f991b1d 100644
--- a/playbooks/adhoc/upgrades/upgrade.yml
+++ b/playbooks/adhoc/upgrades/upgrade.yml
@@ -1,4 +1,14 @@
 ---
+- name: Update deployment type
+  hosts: OSEv3
+  roles:
+  - openshift_facts
+  post_tasks: # technically tasks are run after roles, but post_tasks is a bit more explicit.
+  - openshift_facts:
+      role: common
+      local_facts:
+        deployment_type: "{{ deployment_type }}"
+
 - name: Verify upgrade can proceed
   hosts: masters
   tasks:
-- 
cgit v1.2.3