From e188113d964d1823dafe0be48cc3fba8b7d93932 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 30 Aug 2022 10:24:19 +0100 Subject: [PATCH 1/4] Update templates.yml --- examples/configs/templates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/configs/templates.yml b/examples/configs/templates.yml index d164909cc..4b8e76daa 100644 --- a/examples/configs/templates.yml +++ b/examples/configs/templates.yml @@ -25,7 +25,7 @@ controller_templates: credentials: Demo Credential verbosity: 0 inventory: localhost - execution_environment: "my custom execution environment" + execution_environment: "My EE" survey_spec: name: '' description: '' From 953acfd37108b88c7829a73655959d96ade6f3f5 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 30 Aug 2022 11:45:24 +0100 Subject: [PATCH 2/4] Update differential_items.yml --- examples/configs/differential_items.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/configs/differential_items.yml b/examples/configs/differential_items.yml index 28430692d..f672b4945 100644 --- a/examples/configs/differential_items.yml +++ b/examples/configs/differential_items.yml @@ -83,12 +83,12 @@ differential_items: differential_test_items: - name: RHVM-02 organization: Default - inventory: 12 + inventory: 3 state: absent expected_test_result: - name: RHVM-01-Default organization: Default - inventory: 12 + inventory: 3 state: absent - name: inventories with_present: false From bee9f59d974be06b3c53271e5dc9a875513392bb Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 30 Aug 2022 15:36:09 +0100 Subject: [PATCH 3/4] Update differential_items.yml Commented out IS diff test as broken and not easily fixable --- examples/configs/differential_items.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/configs/differential_items.yml b/examples/configs/differential_items.yml index f672b4945..b2ec9e2e3 100644 --- a/examples/configs/differential_items.yml +++ b/examples/configs/differential_items.yml @@ -78,18 +78,18 @@ differential_items: organization: Default credential_type: "Source Control" state: absent - - name: inventory_sources - with_present: false - differential_test_items: - - name: RHVM-02 - organization: Default - inventory: 3 - state: absent - expected_test_result: - - name: RHVM-01-Default - organization: Default - inventory: 3 - state: absent +# - name: inventory_sources +# with_present: false +# differential_test_items: +# - name: RHVM-02 +# organization: Default +# inventory: 3 +# state: absent +# expected_test_result: +# - name: RHVM-01-Default +# organization: Default +# inventory: 3 +# state: absent - name: inventories with_present: false differential_test_items: From a0d3c88deb6ccd0386027197ab79f702f4619c47 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 30 Aug 2022 16:17:32 +0100 Subject: [PATCH 4/4] Update inventory_sources_export.yml Remove option deprecated from awx.awx --- examples/configs_export_model/inventory_sources_export.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/configs_export_model/inventory_sources_export.yml b/examples/configs_export_model/inventory_sources_export.yml index 1ad4b68f6..88a9fd423 100644 --- a/examples/configs_export_model/inventory_sources_export.yml +++ b/examples/configs_export_model/inventory_sources_export.yml @@ -14,7 +14,6 @@ controller_inventory_sources: verbosity: 1 update_on_launch: false update_cache_timeout: 0 - update_on_project_update: false inventory: organization: name: Default