Merge "Restrict cliff to <2.15.0"

playbooks/kayobe-overcloud-upgrade-base/pre.yml

@@ -7,21 +7,17 @@
         state: directory
 
     - name: Ensure previous kayobe repository is cloned
-      git:
-        repo: https://opendev.org/x/kayobe
-        dest: "{{ previous_kayobe_src_dir }}"
-        version: "stable/{{ previous_release | lower }}"
+      command: >-
+        git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }}
 
     - name: Ensure previous kayobe-config directory exists
       file:
         path: "{{ previous_kayobe_config_src_dir }}"
         state: directory
 
     - name: Ensure kayobe-config repository is cloned
-      git:
-        repo: https://opendev.org/x/kayobe-config-dev
-        dest: "{{ previous_kayobe_config_src_dir }}"
-        version: "stable/{{ previous_release | lower }}"
+      command: >-
+        git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }}
 
     # NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes
     # precedence over the standard config files.

playbooks/kayobe-seed-upgrade-base/pre.yml

@@ -7,21 +7,17 @@
         state: directory
 
     - name: Ensure previous kayobe repository is cloned
-      git:
-        repo: https://opendev.org/x/kayobe
-        dest: "{{ previous_kayobe_src_dir }}"
-        version: "stable/{{ previous_release | lower }}"
+      command: >-
+        git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }}
 
     - name: Ensure previous kayobe-config directory exists
       file:
         path: "{{ previous_kayobe_config_src_dir }}"
         state: directory
 
     - name: Ensure kayobe-config repository is cloned
-      git:
-        repo: https://opendev.org/x/kayobe-config-dev
-        dest: "{{ previous_kayobe_config_src_dir }}"
-        version: "stable/{{ previous_release | lower }}"
+      command: >-
+        git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }}
 
     # NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes
     # precedence over the standard config files.

requirements.txt

@@ -8,7 +8,7 @@ pbr>=2.0 # Apache-2.0
 # line and commenting the one after.
 # -e git+https://github.com/stackhpc/[email protected]#egg=ansible-issue-30350-2.3 # GPLv3
 ansible>=2.4.0,<2.7.0 # GPLv3
-cliff>=2.5.0 # Apache
+cliff>=2.5.0,<2.15.0 # Apache
 netaddr!=0.7.16,>=0.7.13 # BSD
 # paramiko 2.5.0 makes the kayobe-tox-molecule job fail.
 paramiko<2.5.0