Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding back the dataplane services #171

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Adding back the dataplane services #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/openstack/edpm_adoption.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@ done
- ctlplane
preProvisioned: true
services:
- download-cache
- configure-network
- validate-network
- download-cache
- install-os
- configure-os
- run-os
Expand Down
14 changes: 13 additions & 1 deletion tests/roles/dataplane_adoption/tasks/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
- name: force latest ansible-runner image
no_log: "{{ use_no_log }}"
ansible.builtin.shell: |
{{ shell_header }}
{{ oc_header }}
{{ oc_login_command }}
oc get csv openstack-ansibleee-operator.v0.0.1 -o yaml -n openstack-operators | sed "s/RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT/AEE_IMAGE/" | oc apply -f -
Copy link
Contributor Author

@fao89 fao89 Oct 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hack for using the latest ansible-runner image


- name: ensure oc login
no_log: "{{ use_no_log }}"
ansible.builtin.shell: |
Expand Down Expand Up @@ -83,7 +91,7 @@
register: edpm_privatekey
when: edpm_encoded_privatekey is undefined

- name: create dataplane-adoption-secret.yaml

Check warning on line 94 in tests/roles/dataplane_adoption/tasks/main.yaml

View workflow job for this annotation

GitHub Actions / Ansible Lint

jinja[spacing] 

Jinja2 spacing could be improved: {{ shell_header }}
no_log: "{{ use_no_log }}"
ansible.builtin.shell: |
{{ shell_header }}
Expand Down Expand Up @@ -152,7 +160,7 @@
$CONTROLLER3_SSH sudo systemctl stop $service
done

- name: deploy dataplane

Check warning on line 163 in tests/roles/dataplane_adoption/tasks/main.yaml

View workflow job for this annotation

GitHub Actions / Ansible Lint

jinja[spacing] 

Jinja2 spacing could be improved: {{ shell_header }}
ansible.builtin.shell: |
{{ shell_header }}
{{ oc_header }}
Expand All @@ -166,9 +174,13 @@
- ctlplane
preProvisioned: true
services:
- download-cache
- configure-network
- validate-network
- install-os
- configure-os
- run-os
- ovn
env:
- name: ANSIBLE_CALLBACKS_ENABLED
value: "profile_tasks"
Expand Down Expand Up @@ -300,6 +312,6 @@
ansible.builtin.shell: |
{{ shell_header }}
{{ oc_header }}
oc wait --for condition=Ready osdpns/openstack --timeout=30m
oc wait --for condition=Ready osdpns/openstack --timeout=40m
# TODO: work on network configuration for making possible to run this task on other IP ranges
when: "edpm_node_ip.startswith('192.168.122')"
Loading