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

Adds os_cloud_name variable for development_environment role #397

Merged
merged 1 commit into from
Apr 26, 2024
Merged

Adds os_cloud_name variable for development_environment role #397

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 tests/roles/dataplane_adoption/tasks/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
oc get -n openstack-operators pod -l app.kubernetes.io/name=openstack-ansibleee-operator -o name
register: old_ansibleee_operator_pod

- name: use ansible-runner image built from source or latest if none is defined

Check warning on line 17 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 @@ -228,7 +228,7 @@
playbook: osp.edpm.nova
EOF

- name: Create OpenStackDataPlaneNodeSet

Check warning on line 231 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 Down Expand Up @@ -332,7 +332,7 @@
- openvswitch3.1

# ovn-controller settings
edpm_ovn_bridge_mappings: ['datacentre:br-ctlplane']
edpm_ovn_bridge_mappings: ["datacentre:{{ neutron_physical_bridge_name }}"]
edpm_ovn_bridge: br-int
edpm_ovn_encap_type: geneve
ovn_match_northd_version: false
Expand Down
1 change: 1 addition & 0 deletions tests/roles/development_environment/defaults/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ prelaunch_test_instance: true
prelaunch_test_instance_script: pre_launch.bash
edpm_privatekey_path: ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa
run_pre_adoption_validation: true
os_cloud_name: standalone
2 changes: 1 addition & 1 deletion tests/roles/development_environment/files/pre_launch.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set -e

alias openstack="ssh -i ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa root@192.168.122.100 OS_CLOUD=standalone openstack"
alias openstack="ssh -i ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa root@${OS_CLOUD_IP} OS_CLOUD=${OS_CLOUD_NAME} openstack"

function wait_for_status() {
local time=0
Expand Down
4 changes: 3 additions & 1 deletion tests/roles/development_environment/tasks/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
environment:
INSTALL_YAMLS_PATH: "{{ install_yamls_path }}"
EDPM_PRIVATEKEY_PATH: "{{ edpm_privatekey_path }}"
OS_CLOUD_IP: "{{ standalone_ip | default(edpm_node_ip) }}"
OS_CLOUD_NAME: "{{ os_cloud_name }}"
ansible.builtin.shell:
cmd: |
{{ shell_header }}
alias openstack="ssh -i {{ edpm_privatekey_path }} root@{{ edpm_node_ip }} OS_CLOUD=standalone openstack"
alias openstack="ssh -i {{ edpm_privatekey_path }} root@${OS_CLOUD_IP} OS_CLOUD=${OS_CLOUD_NAME} openstack"
{{ lookup('ansible.builtin.file', prelaunch_test_instance_script) }}
Loading