External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-18 03:30:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

Add peers_from for reverse peers M2M

Browse Source 
use devel receptor-collection
This commit is contained in:
Seth Foster
2023-07-11 16:22:16 -04:00
committed by Seth Foster
parent 6c3bbfc3be
commit d15405eafe
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/api/templates/instance_install_bundle/requirements.yml
View File

@@ -1,4 +1,5 @@
--- ---
collections: collections:
- name: ansible.receptor - name: https://github.com/ansible/receptor-collection.git
version: 1.1.0 type: git
version: main

5
awx/main/migrations/0186_hop_nodes.py
View File

@@ -27,6 +27,11 @@ class Migration(migrations.Migration):
name='peers_from_control_nodes', name='peers_from_control_nodes',
field=models.BooleanField(default=False, help_text='If True, control plane cluster nodes should automatically peer to it.'), 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( migrations.AlterField(
model_name='instancelink', model_name='instancelink',
name='link_state', name='link_state',

3
awx/settings/defaults.py
View File

@@ -82,7 +82,6 @@ STATICFILES_DIRS = [
os.path.join(BASE_DIR, 'ui_next', 'build'), os.path.join(BASE_DIR, 'ui_next', 'build'),
os.path.join(BASE_DIR, 'static'), os.path.join(BASE_DIR, 'static'),
] ]
/awx_devel/awx/ui_next/build
# Absolute filesystem path to the directory where static file are collected via # Absolute filesystem path to the directory where static file are collected via
# the collectstatic command. # the collectstatic command.
@@ -305,7 +304,7 @@ TEMPLATES = [
os.path.join(BASE_DIR, 'templates'), os.path.join(BASE_DIR, 'templates'),
os.path.join(BASE_DIR, 'ui', 'build'), os.path.join(BASE_DIR, 'ui', 'build'),
os.path.join(BASE_DIR, 'ui', 'public'), 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'),
], ],
}, },
] ]