From d15405eafe8f2184eb054d81a00a232e94b4826f Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Tue, 11 Jul 2023 16:22:16 -0400 Subject: [PATCH] Add peers_from for reverse peers M2M use devel receptor-collection --- awx/api/templates/instance_install_bundle/requirements.yml | 5 +++-- awx/main/migrations/0186_hop_nodes.py | 5 +++++ awx/settings/defaults.py | 3 +-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/awx/api/templates/instance_install_bundle/requirements.yml b/awx/api/templates/instance_install_bundle/requirements.yml index 3fed8496e0..75f4867a5e 100644 --- a/awx/api/templates/instance_install_bundle/requirements.yml +++ b/awx/api/templates/instance_install_bundle/requirements.yml @@ -1,4 +1,5 @@ --- collections: - - name: ansible.receptor - version: 1.1.0 + - name: https://github.com/ansible/receptor-collection.git + type: git + version: main diff --git a/awx/main/migrations/0186_hop_nodes.py b/awx/main/migrations/0186_hop_nodes.py index 4375c5cc6b..196f79f573 100644 --- a/awx/main/migrations/0186_hop_nodes.py +++ b/awx/main/migrations/0186_hop_nodes.py @@ -27,6 +27,11 @@ class Migration(migrations.Migration): name='peers_from_control_nodes', field=models.BooleanField(default=False, help_text='If True, control plane cluster nodes should automatically peer to it.'), ), + migrations.AlterField( + model_name='instance', + name='peers', + field=models.ManyToManyField(related_name='peers_from', through='main.InstanceLink', to='main.instance'), + ), migrations.AlterField( model_name='instancelink', name='link_state', diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 591af0e998..647c500b21 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -82,7 +82,6 @@ STATICFILES_DIRS = [ os.path.join(BASE_DIR, 'ui_next', 'build'), os.path.join(BASE_DIR, 'static'), ] -/awx_devel/awx/ui_next/build # Absolute filesystem path to the directory where static file are collected via # the collectstatic command. @@ -305,7 +304,7 @@ TEMPLATES = [ os.path.join(BASE_DIR, 'templates'), os.path.join(BASE_DIR, 'ui', 'build'), os.path.join(BASE_DIR, 'ui', 'public'), - os.path.join(BASE_DIR, '/awx/ui_next', 'build', 'awx'), + os.path.join(BASE_DIR, 'ui_next', 'build', 'awx'), ], }, ]