Skip to content

Commit 5f5a521

Browse files
mnasiadkaAlex-Welsh
authored andcommitted
CI: rework upgrade.sh to Ansible role
Change-Id: I73ca974aa6eef071e53dcbb9b66af2713ac655a8 Signed-off-by: Michal Nasiadka <[email protected]>
1 parent 189b8cd commit 5f5a521

File tree

4 files changed

+68
-41
lines changed

4 files changed

+68
-41
lines changed

roles/kolla-ansible-deploy/tasks/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
-vvv
3636
>/tmp/logs/ansible/post-deploy 2>&1
3737
38-
- name: Run kolla-ansible validate-config on upgrades
38+
- name: Run kolla-ansible validate-config
3939
ansible.builtin.shell:
4040
cmd: >
4141
. {{ kolla_ansible_venv_path }}/bin/activate &&
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
---
2+
- name: Generate self-signed certificates for the optional internal TLS tests
3+
ansible.builtin.shell:
4+
cmd: >
5+
. {{ kolla_ansible_venv_path }}/bin/activate &&
6+
kolla-ansible certificates
7+
-i /etc/kolla/inventory
8+
-vvv
9+
>/tmp/logs/ansible/upgrade-certificates 2>&1
10+
11+
# NOTE(mnasiadka): Need to run bootstrap before upgrade
12+
- name: Run kolla-ansible bootstrap-servers
13+
ansible.builtin.shell:
14+
cmd: >
15+
. {{ kolla_ansible_venv_path }}/bin/activate &&
16+
kolla-ansible bootstrap-servers
17+
-i /etc/kolla/inventory
18+
-vvv
19+
>/tmp/logs/ansible/upgrade-bootstrap 2>&1
20+
21+
- name: Run kolla-ansible prechecks
22+
ansible.builtin.shell:
23+
cmd: >
24+
. {{ kolla_ansible_venv_path }}/bin/activate &&
25+
kolla-ansible prechecks
26+
-i /etc/kolla/inventory
27+
-vvv
28+
>/tmp/logs/ansible/upgrade-prechecks 2>&1
29+
30+
- name: Run kolla-ansible pull
31+
ansible.builtin.shell:
32+
cmd: >
33+
. {{ kolla_ansible_venv_path }}/bin/activate &&
34+
kolla-ansible pull
35+
-i /etc/kolla/inventory
36+
-vvv
37+
>/tmp/logs/ansible/upgrade-pull 2>&1
38+
39+
- name: Run kolla-ansible deploy
40+
ansible.builtin.shell:
41+
cmd: >
42+
. {{ kolla_ansible_venv_path }}/bin/activate &&
43+
kolla-ansible upgrade
44+
-i /etc/kolla/inventory
45+
-vvv
46+
>/tmp/logs/ansible/upgrade 2>&1
47+
48+
- name: Run kolla-ansible post-deploy
49+
ansible.builtin.shell:
50+
cmd: >
51+
. {{ kolla_ansible_venv_path }}/bin/activate &&
52+
kolla-ansible post-deploy
53+
-i /etc/kolla/inventory
54+
-vvv
55+
>/tmp/logs/ansible/upgrade-post-deploy 2>&1
56+
57+
- name: Run kolla-ansible validate-config on upgrades
58+
ansible.builtin.shell:
59+
cmd: >
60+
. {{ kolla_ansible_venv_path }}/bin/activate &&
61+
kolla-ansible validate-config
62+
-i /etc/kolla/inventory
63+
-vvv
64+
>/tmp/logs/ansible/upgrade-validate-config 2>&1
65+

tests/run.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -725,14 +725,8 @@
725725
--final /etc/kolla/passwords.yml
726726
727727
# Perform an upgrade to the in-development code.
728-
- name: Run upgrade.sh script
729-
shell:
730-
cmd: tests/upgrade.sh
731-
executable: /bin/bash
732-
chdir: "{{ kolla_ansible_src_dir }}"
733-
environment:
734-
KOLLA_ANSIBLE_VENV_PATH: "{{ kolla_ansible_venv_path }}"
735-
SCENARIO: "{{ scenario }}"
728+
- import_role:
729+
name: kolla-ansible-upgrade
736730

737731
- import_role:
738732
name: kolla-ansible-test-dashboard

tests/upgrade.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)