|
88 | 88 | kayobe_galaxy_requirements_src_dir: "{{ kolla_ansible_src_dir }}"
|
89 | 89 | kayobe_galaxy_requirements_dest_path: "/tmp/kolla-ansible-requirements.yml"
|
90 | 90 |
|
| 91 | + - vars: |
| 92 | + branch_prefix: "{{ 'unmaintained' if previous_release | lower == '2023.1' else 'stable' }}" |
| 93 | + |
91 | 94 | # NOTE(wszumski): I explored running as an unprivileged user, but it looked like
|
92 | 95 | # a world of pain, so I've gone for this simpler approach (for now).
|
93 | 96 | - block:
|
|
139 | 142 |
|
140 | 143 | - name: Ensure previous kayobe repository is cloned
|
141 | 144 | command: >-
|
142 |
| - git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }} |
| 145 | + git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }} |
143 | 146 |
|
144 | 147 | - name: Ensure previous kayobe-config directory exists
|
145 | 148 | file:
|
|
148 | 151 |
|
149 | 152 | - name: Ensure kayobe-config repository is cloned
|
150 | 153 | command: >-
|
151 |
| - git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }} |
| 154 | + git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }} |
152 | 155 |
|
153 | 156 | - name: Ensure previous kolla-ansible directory exists
|
154 | 157 | file:
|
|
157 | 160 |
|
158 | 161 | - name: Ensure previous kolla-ansible repository is cloned
|
159 | 162 | command: >-
|
160 |
| - git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b stable/{{ previous_release | lower }} |
| 163 | + git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }} |
161 | 164 |
|
162 | 165 | - name: Ensure previous kayobe is executed in verbose mode
|
163 | 166 | lineinfile:
|
|
180 | 183 | name: kayobe-galaxy-requirements
|
181 | 184 | vars:
|
182 | 185 | kayobe_galaxy_requirements_src_dir: "{{ previous_kayobe_src_dir }}"
|
183 |
| - kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}" |
| 186 | + kayobe_galaxy_requirements_branch: "{{ branch_prefix }}/{{ previous_release | lower }}" |
184 | 187 |
|
185 | 188 | - name: Update kolla-ansible requirements.yml
|
186 | 189 | include_role:
|
187 | 190 | name: kayobe-galaxy-requirements
|
188 | 191 | vars:
|
189 | 192 | kayobe_galaxy_requirements_src_dir: "{{ previous_kolla_ansible_src_dir }}"
|
190 |
| - kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}" |
| 193 | + kayobe_galaxy_requirements_branch: "{{ branch_prefix }}/{{ previous_release | lower }}" |
191 | 194 | kayobe_galaxy_requirements_dest_path: "/tmp/previous-kolla-ansible-requirements.yml"
|
192 | 195 |
|
193 | 196 | when: is_upgrade
|
0 commit comments