Skip to content

Commit b8cd3db

Browse files
Merge pull request openstack-k8s-operators#1252 from eduolivares/default-prelaunch_octavia_workload
Move prelaunch_octavia_workload default definition to common_defaults
2 parents 01f3d36 + 2f4322b commit b8cd3db

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

tests/roles/common_defaults/defaults/main.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,10 @@ pull_openstack_configuration_ssh_shell_vars: |
224224
enable_octavia: true
225225
octavia_adoption: true
226226

227+
# Whether to create Octavia workload before adoption - defined in common_defaults because it is used in two roles:
228+
# dataplane_adoption and development_environment
229+
prelaunch_octavia_workload: false
230+
227231
# MariaDB client connection timeout in seconds
228232
# Related to OSPRH-18618
229233
mariadb_client_timeout: 0

tests/roles/dataplane_adoption/defaults/main.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ skip_patching_ansibleee_csv: false
232232
os_diff_dir: tmp/os-diff
233233
os_diff_data_dir: tmp/os-diff
234234
prelaunch_test_instance: true
235-
prelaunch_octavia_workload: false
236235
telemetry_adoption: true
237236

238237
# nodes data will be templated in as a separate

0 commit comments

Comments
 (0)