From 5e0ee8d90a063f3c6b447decc466754bd7cdef26 Mon Sep 17 00:00:00 2001 From: resoluteCoder Date: Mon, 31 Jul 2023 13:52:42 -0500 Subject: [PATCH 1/7] moved defaults example vars to playbook --- playbooks/osbuild_builder.yml | 77 ++++++++++++++++++++++++++++ roles/populate_aap/README.md | 21 ++++++++ roles/populate_aap/defaults/main.yml | 75 --------------------------- 3 files changed, 98 insertions(+), 75 deletions(-) diff --git a/playbooks/osbuild_builder.yml b/playbooks/osbuild_builder.yml index 5643e02f..efd7b393 100644 --- a/playbooks/osbuild_builder.yml +++ b/playbooks/osbuild_builder.yml @@ -6,3 +6,80 @@ - name: Run the role ansible.builtin.import_role: name: infra.osbuild.builder + vars: + controller_hostname: https://0.0.0.0 + controller_username: admin + controller_password: test + populate_aap_organization_name: Osbuild_org + populate_aap_execution_environment_name: osbuild_ee + populate_aap_inventory_name: osbuild_inventory + populate_aap_project_name: osbuild_project + populate_aap_credential_name: osbuild_credential + populate_aap_default_host_user: user + populate_aap_default_host_ip: 0.0.0.0 + populate_aap_organizations: + - name: "{{ populate_aap_organization_name }}" + populate_aap_execution_environments: + - name: "{{ populate_aap_execution_environment_name }}" + image: quay.io/repository/osbuildee/osbuildee + pull: always + organization: "{{ populate_aap_organization_name }}" + populate_aap_inventories: + - name: "{{ populate_aap_inventory_name }}" + organization: "{{ populate_aap_organization_name }}" + populate_aap_hosts: + - name: osbuild_remote_system + inventory: "{{ populate_aap_inventory_name }}" + variables: + ansible_host: "{{ populate_aap_default_host_ip }}" + ansible_user: "{{ populate_aap_default_host_user }}" + populate_aap_projects: + - name: "{{ populate_aap_project_name }}" + organization: "{{ populate_aap_organization_name }}" + default_environment: "{{ populate_aap_execution_environment_name }}" + scm_type: git + scm_url: https://github.com/redhat-cop/infra.osbuild + populate_aap_credentials: + - name: "{{ populate_aap_credential_name }}" + organization: "{{ populate_aap_organization_name }}" + credential_type: Machine + inputs: + username: "{{ populate_aap_default_host_user }}" + ssh_key_data: "{{ lookup('file', populate_aap_ssh_key_path) if populate_aap_ssh_key_path is defined else '' }}" + populate_aap_job_templates: + - name: osbuild_setup_server + job_type: run + inventory: "{{ populate_aap_inventory_name }}" + project: "{{ populate_aap_project_name }}" + playbook: playbooks/osbuild_setup_server.yml + credentials: + - "{{ populate_aap_credential_name }}" + + - name: osbuild_builder + job_type: run + inventory: "{{ populate_aap_inventory_name }}" + project: "{{ populate_aap_project_name }}" + playbook: playbooks/osbuild_builder.yml + survey_enabled: true + survey: "{{ lookup('template', 'template_surveys/builder_survey.yml') | from_yaml }}" + ask_variables_on_launch: true + extra_vars: + _docs: 'REPLACE WITH VARS FROM DOCS: https://github.com/redhat-cop/infra.osbuild/blob/main/roles/builder/APP_EXTRA_VARS.md' # yamllint disable-line rule:line-length + credentials: + - "{{ populate_aap_credential_name }}" + + - name: osbuild_system_info + job_type: run + inventory: "{{ populate_aap_inventory_name }}" + project: "{{ populate_aap_project_name }}" + playbook: playbooks/osbuild_system_info.yml + credentials: + - "{{ populate_aap_credential_name }}" + + - name: osbuild_update_system + job_type: run + inventory: "{{ populate_aap_inventory_name }}" + project: "{{ populate_aap_project_name }}" + playbook: playbooks/osbuild_update_system.yml + credentials: + - "{{ populate_aap_credential_name }}" \ No newline at end of file diff --git a/roles/populate_aap/README.md b/roles/populate_aap/README.md index 8e2d719a..c15f719b 100644 --- a/roles/populate_aap/README.md +++ b/roles/populate_aap/README.md @@ -25,6 +25,27 @@ None |`populate_aap_credentials`|None|no|list|Use to populate AAP with credentials. More information can be found in [Configuration Collection credentials role README](https://github.com/redhat-cop/controller_configuration/tree/devel/roles/credentials)|
populate_aap_credentials:
- name: osbuild_credential
organization: Osbuild_test
credentail_type: Machine
inputs:
username: user
ssh_key_data: "{{ lookup('file', '~/.ssh/id_rsa_aap', errors='warn') }}"
| |`populate_aap_job_templates`|None|no|list|Use to populate AAP with job templates. More information can be found in [Configuration Collection job templates role README](https://github.com/redhat-cop/controller_configuration/tree/devel/roles/job_templates)|
populate_aap_job_templates:
- name: osbuild_setup_server
job_type: run
inventory: osbuild_inventory
project: osbuild_project
playbook: playbooks/
osbuild_setup_server.yml
credentials:
- osbuild_credential
| +### populate_aap_default_host_user + +Type: string +Required: false + +Default host user for the remote system. + +### populate_aap_default_host_ip + +Type: string +Required: false + +Default ip for the remote system. + +### populate_aap_ssh_key_path + +Type: string +Required: false + +Path to the private ssh key that will be used for communication remote systems. + ## Variables Exported by the Role None. diff --git a/roles/populate_aap/defaults/main.yml b/roles/populate_aap/defaults/main.yml index d0493a61..a0137d64 100644 --- a/roles/populate_aap/defaults/main.yml +++ b/roles/populate_aap/defaults/main.yml @@ -1,78 +1,3 @@ --- -controller_hostname: https://0.0.0.0 -controller_username: admin -controller_password: test controller_validate_certs: false controller_configuration_async_retries: 30 -populate_aap_organization_name: Osbuild_org -populate_aap_execution_environment_name: osbuild_ee -populate_aap_inventory_name: osbuild_inventory -populate_aap_project_name: osbuild_project -populate_aap_credential_name: osbuild_credential -populate_aap_organizations: - - name: "{{ populate_aap_organization_name }}" -populate_aap_execution_environments: - - name: "{{ populate_aap_execution_environment_name }}" - image: quay.io/repository/osbuildee/osbuildee - pull: always - organization: "{{ populate_aap_organization_name }}" -populate_aap_inventories: - - name: "{{ populate_aap_inventory_name }}" - organization: "{{ populate_aap_organization_name }}" -populate_aap_hosts: - - name: osbuild_remote_system - inventory: "{{ populate_aap_inventory_name }}" - variables: - ansible_host: 0.0.0.0 - ansible_user: user -populate_aap_projects: - - name: "{{ populate_aap_project_name }}" - organization: "{{ populate_aap_organization_name }}" - default_environment: "{{ populate_aap_execution_environment_name }}" - scm_type: git - scm_url: https://github.com/redhat-cop/infra.osbuild -populate_aap_credentials: - - name: "{{ populate_aap_credential_name }}" - organization: "{{ populate_aap_organization_name }}" - credential_type: Machine - inputs: - username: user - ssh_key_data: "{{ lookup('file', '/home/user/.ssh/id_rsa') }}" -populate_aap_job_templates: - - name: osbuild_setup_server - job_type: run - inventory: "{{ populate_aap_inventory_name }}" - project: "{{ populate_aap_project_name }}" - playbook: playbooks/osbuild_setup_server.yml - credentials: - - "{{ populate_aap_credential_name }}" - - - name: osbuild_builder - job_type: run - inventory: "{{ populate_aap_inventory_name }}" - project: "{{ populate_aap_project_name }}" - playbook: playbooks/osbuild_builder.yml - survey_enabled: true - survey: "{{ lookup('template', 'template_surveys/builder_survey.yml') | from_yaml }}" - ask_variables_on_launch: true - extra_vars: - _docs: 'REPLACE WITH VARS FROM DOCS: https://github.com/redhat-cop/infra.osbuild/blob/main/roles/builder/APP_EXTRA_VARS.md' # yamllint disable-line rule:line-length - - credentials: - - "{{ populate_aap_credential_name }}" - - - name: osbuild_system_info - job_type: run - inventory: "{{ populate_aap_inventory_name }}" - project: "{{ populate_aap_project_name }}" - playbook: playbooks/osbuild_system_info.yml - credentials: - - "{{ populate_aap_credential_name }}" - - - name: osbuild_update_system - job_type: run - inventory: "{{ populate_aap_inventory_name }}" - project: "{{ populate_aap_project_name }}" - playbook: playbooks/osbuild_update_system.yml - credentials: - - "{{ populate_aap_credential_name }}" From c6babc2bf4df2b3a940403cb9d2e6c18bfd17c1f Mon Sep 17 00:00:00 2001 From: resoluteCoder Date: Mon, 31 Jul 2023 14:18:25 -0500 Subject: [PATCH 2/7] updated the wrong playbook, it should populate playbook --- playbooks/osbuild_builder.yml | 79 +----------------------------- playbooks/osbuild_populate_aap.yml | 77 +++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 78 deletions(-) diff --git a/playbooks/osbuild_builder.yml b/playbooks/osbuild_builder.yml index efd7b393..b798649d 100644 --- a/playbooks/osbuild_builder.yml +++ b/playbooks/osbuild_builder.yml @@ -5,81 +5,4 @@ tasks: - name: Run the role ansible.builtin.import_role: - name: infra.osbuild.builder - vars: - controller_hostname: https://0.0.0.0 - controller_username: admin - controller_password: test - populate_aap_organization_name: Osbuild_org - populate_aap_execution_environment_name: osbuild_ee - populate_aap_inventory_name: osbuild_inventory - populate_aap_project_name: osbuild_project - populate_aap_credential_name: osbuild_credential - populate_aap_default_host_user: user - populate_aap_default_host_ip: 0.0.0.0 - populate_aap_organizations: - - name: "{{ populate_aap_organization_name }}" - populate_aap_execution_environments: - - name: "{{ populate_aap_execution_environment_name }}" - image: quay.io/repository/osbuildee/osbuildee - pull: always - organization: "{{ populate_aap_organization_name }}" - populate_aap_inventories: - - name: "{{ populate_aap_inventory_name }}" - organization: "{{ populate_aap_organization_name }}" - populate_aap_hosts: - - name: osbuild_remote_system - inventory: "{{ populate_aap_inventory_name }}" - variables: - ansible_host: "{{ populate_aap_default_host_ip }}" - ansible_user: "{{ populate_aap_default_host_user }}" - populate_aap_projects: - - name: "{{ populate_aap_project_name }}" - organization: "{{ populate_aap_organization_name }}" - default_environment: "{{ populate_aap_execution_environment_name }}" - scm_type: git - scm_url: https://github.com/redhat-cop/infra.osbuild - populate_aap_credentials: - - name: "{{ populate_aap_credential_name }}" - organization: "{{ populate_aap_organization_name }}" - credential_type: Machine - inputs: - username: "{{ populate_aap_default_host_user }}" - ssh_key_data: "{{ lookup('file', populate_aap_ssh_key_path) if populate_aap_ssh_key_path is defined else '' }}" - populate_aap_job_templates: - - name: osbuild_setup_server - job_type: run - inventory: "{{ populate_aap_inventory_name }}" - project: "{{ populate_aap_project_name }}" - playbook: playbooks/osbuild_setup_server.yml - credentials: - - "{{ populate_aap_credential_name }}" - - - name: osbuild_builder - job_type: run - inventory: "{{ populate_aap_inventory_name }}" - project: "{{ populate_aap_project_name }}" - playbook: playbooks/osbuild_builder.yml - survey_enabled: true - survey: "{{ lookup('template', 'template_surveys/builder_survey.yml') | from_yaml }}" - ask_variables_on_launch: true - extra_vars: - _docs: 'REPLACE WITH VARS FROM DOCS: https://github.com/redhat-cop/infra.osbuild/blob/main/roles/builder/APP_EXTRA_VARS.md' # yamllint disable-line rule:line-length - credentials: - - "{{ populate_aap_credential_name }}" - - - name: osbuild_system_info - job_type: run - inventory: "{{ populate_aap_inventory_name }}" - project: "{{ populate_aap_project_name }}" - playbook: playbooks/osbuild_system_info.yml - credentials: - - "{{ populate_aap_credential_name }}" - - - name: osbuild_update_system - job_type: run - inventory: "{{ populate_aap_inventory_name }}" - project: "{{ populate_aap_project_name }}" - playbook: playbooks/osbuild_update_system.yml - credentials: - - "{{ populate_aap_credential_name }}" \ No newline at end of file + name: infra.osbuild.builder \ No newline at end of file diff --git a/playbooks/osbuild_populate_aap.yml b/playbooks/osbuild_populate_aap.yml index 61fc9d30..f6a91e74 100644 --- a/playbooks/osbuild_populate_aap.yml +++ b/playbooks/osbuild_populate_aap.yml @@ -7,3 +7,80 @@ - name: Run the role ansible.builtin.import_role: name: infra.osbuild.populate_aap + vars: + controller_hostname: https://0.0.0.0 + controller_username: admin + controller_password: test + populate_aap_organization_name: Osbuild_org + populate_aap_execution_environment_name: osbuild_ee + populate_aap_inventory_name: osbuild_inventory + populate_aap_project_name: osbuild_project + populate_aap_credential_name: osbuild_credential + populate_aap_default_host_user: user + populate_aap_default_host_ip: 0.0.0.0 + populate_aap_organizations: + - name: "{{ populate_aap_organization_name }}" + populate_aap_execution_environments: + - name: "{{ populate_aap_execution_environment_name }}" + image: quay.io/repository/osbuildee/osbuildee + pull: always + organization: "{{ populate_aap_organization_name }}" + populate_aap_inventories: + - name: "{{ populate_aap_inventory_name }}" + organization: "{{ populate_aap_organization_name }}" + populate_aap_hosts: + - name: osbuild_remote_system + inventory: "{{ populate_aap_inventory_name }}" + variables: + ansible_host: "{{ populate_aap_default_host_ip }}" + ansible_user: "{{ populate_aap_default_host_user }}" + populate_aap_projects: + - name: "{{ populate_aap_project_name }}" + organization: "{{ populate_aap_organization_name }}" + default_environment: "{{ populate_aap_execution_environment_name }}" + scm_type: git + scm_url: https://github.com/redhat-cop/infra.osbuild + populate_aap_credentials: + - name: "{{ populate_aap_credential_name }}" + organization: "{{ populate_aap_organization_name }}" + credential_type: Machine + inputs: + username: "{{ populate_aap_default_host_user }}" + ssh_key_data: "{{ lookup('file', populate_aap_ssh_key_path) if populate_aap_ssh_key_path is defined else '' }}" + populate_aap_job_templates: + - name: osbuild_setup_server + job_type: run + inventory: "{{ populate_aap_inventory_name }}" + project: "{{ populate_aap_project_name }}" + playbook: playbooks/osbuild_setup_server.yml + credentials: + - "{{ populate_aap_credential_name }}" + + - name: osbuild_builder + job_type: run + inventory: "{{ populate_aap_inventory_name }}" + project: "{{ populate_aap_project_name }}" + playbook: playbooks/osbuild_builder.yml + survey_enabled: true + survey: "{{ lookup('template', 'template_surveys/builder_survey.yml') | from_yaml }}" + ask_variables_on_launch: true + extra_vars: + _docs: 'REPLACE WITH VARS FROM DOCS: https://github.com/redhat-cop/infra.osbuild/blob/main/roles/builder/APP_EXTRA_VARS.md' # yamllint disable-line rule:line-length + credentials: + - "{{ populate_aap_credential_name }}" + + - name: osbuild_system_info + job_type: run + inventory: "{{ populate_aap_inventory_name }}" + project: "{{ populate_aap_project_name }}" + playbook: playbooks/osbuild_system_info.yml + credentials: + - "{{ populate_aap_credential_name }}" + + - name: osbuild_update_system + job_type: run + inventory: "{{ populate_aap_inventory_name }}" + project: "{{ populate_aap_project_name }}" + playbook: playbooks/osbuild_update_system.yml + credentials: + - "{{ populate_aap_credential_name }}" From 9b950c16bab507d475313a30f0a5b67bec404a06 Mon Sep 17 00:00:00 2001 From: resoluteCoder Date: Mon, 31 Jul 2023 18:17:13 -0500 Subject: [PATCH 3/7] changed stuff --- playbooks/osbuild_populate_aap.yml | 5 ----- roles/populate_aap/defaults/main.yml | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/playbooks/osbuild_populate_aap.yml b/playbooks/osbuild_populate_aap.yml index f6a91e74..45ffe0d0 100644 --- a/playbooks/osbuild_populate_aap.yml +++ b/playbooks/osbuild_populate_aap.yml @@ -11,11 +11,6 @@ controller_hostname: https://0.0.0.0 controller_username: admin controller_password: test - populate_aap_organization_name: Osbuild_org - populate_aap_execution_environment_name: osbuild_ee - populate_aap_inventory_name: osbuild_inventory - populate_aap_project_name: osbuild_project - populate_aap_credential_name: osbuild_credential populate_aap_default_host_user: user populate_aap_default_host_ip: 0.0.0.0 populate_aap_organizations: diff --git a/roles/populate_aap/defaults/main.yml b/roles/populate_aap/defaults/main.yml index a0137d64..ecd8498a 100644 --- a/roles/populate_aap/defaults/main.yml +++ b/roles/populate_aap/defaults/main.yml @@ -1,3 +1,8 @@ --- controller_validate_certs: false controller_configuration_async_retries: 30 +populate_aap_organization_name: osbuild_org +populate_aap_execution_environment_name: osbuild_ee +populate_aap_inventory_name: osbuild_inventory +populate_aap_project_name: osbuild_project +populate_aap_credential_name: osbuild_credential From 1ddeeba15d800812468056c82d4e93aff40a7aba Mon Sep 17 00:00:00 2001 From: resoluteCoder Date: Mon, 31 Jul 2023 18:50:43 -0500 Subject: [PATCH 4/7] another one --- playbooks/osbuild_populate_aap.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/osbuild_populate_aap.yml b/playbooks/osbuild_populate_aap.yml index 45ffe0d0..3ae572e7 100644 --- a/playbooks/osbuild_populate_aap.yml +++ b/playbooks/osbuild_populate_aap.yml @@ -8,9 +8,9 @@ ansible.builtin.import_role: name: infra.osbuild.populate_aap vars: - controller_hostname: https://0.0.0.0 - controller_username: admin - controller_password: test + controller_hostname: https://0.0.0.0 # noqa var-naming[no-role-prefix] + controller_username: admin # noqa var-naming[no-role-prefix] + controller_password: test # noqa var-naming[no-role-prefix] populate_aap_default_host_user: user populate_aap_default_host_ip: 0.0.0.0 populate_aap_organizations: From 2af90b4a206c1e44b73a19577381fafc56870718 Mon Sep 17 00:00:00 2001 From: resoluteCoder Date: Mon, 31 Jul 2023 18:52:21 -0500 Subject: [PATCH 5/7] blargh --- playbooks/osbuild_builder.yml | 2 +- playbooks/osbuild_populate_aap.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/osbuild_builder.yml b/playbooks/osbuild_builder.yml index b798649d..5643e02f 100644 --- a/playbooks/osbuild_builder.yml +++ b/playbooks/osbuild_builder.yml @@ -5,4 +5,4 @@ tasks: - name: Run the role ansible.builtin.import_role: - name: infra.osbuild.builder \ No newline at end of file + name: infra.osbuild.builder diff --git a/playbooks/osbuild_populate_aap.yml b/playbooks/osbuild_populate_aap.yml index 3ae572e7..677c495f 100644 --- a/playbooks/osbuild_populate_aap.yml +++ b/playbooks/osbuild_populate_aap.yml @@ -8,9 +8,9 @@ ansible.builtin.import_role: name: infra.osbuild.populate_aap vars: - controller_hostname: https://0.0.0.0 # noqa var-naming[no-role-prefix] - controller_username: admin # noqa var-naming[no-role-prefix] - controller_password: test # noqa var-naming[no-role-prefix] + controller_hostname: https://0.0.0.0 # noqa var-naming[no-role-prefix] + controller_username: admin # noqa var-naming[no-role-prefix] + controller_password: test # noqa var-naming[no-role-prefix] populate_aap_default_host_user: user populate_aap_default_host_ip: 0.0.0.0 populate_aap_organizations: From 6839ca3761d8dd2119f9406ad389ac53baa40cbb Mon Sep 17 00:00:00 2001 From: resoluteCoder Date: Mon, 31 Jul 2023 18:58:56 -0500 Subject: [PATCH 6/7] updated populate app readme, added fragment --- .../265-move-defaults-to-playbook.yml | 3 + roles/populate_aap/README.md | 77 ++++++++++++++++++- 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/265-move-defaults-to-playbook.yml diff --git a/changelogs/fragments/265-move-defaults-to-playbook.yml b/changelogs/fragments/265-move-defaults-to-playbook.yml new file mode 100644 index 00000000..31b51c27 --- /dev/null +++ b/changelogs/fragments/265-move-defaults-to-playbook.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - Moved default vars to populate aap playbook for better availability. \ No newline at end of file diff --git a/roles/populate_aap/README.md b/roles/populate_aap/README.md index c15f719b..502e6572 100644 --- a/roles/populate_aap/README.md +++ b/roles/populate_aap/README.md @@ -59,12 +59,85 @@ None. ```yaml --- - name: Run populate_aap role to populate AAP with infra.osbuild content - become: true - hosts: all + hosts: localhost + connection: local + gather_facts: false tasks: - name: Run the role ansible.builtin.import_role: name: infra.osbuild.populate_aap + vars: + controller_hostname: https://0.0.0.0 # noqa var-naming[no-role-prefix] + controller_username: admin # noqa var-naming[no-role-prefix] + controller_password: test # noqa var-naming[no-role-prefix] + populate_aap_default_host_user: user + populate_aap_default_host_ip: 0.0.0.0 + populate_aap_organizations: + - name: "{{ populate_aap_organization_name }}" + populate_aap_execution_environments: + - name: "{{ populate_aap_execution_environment_name }}" + image: quay.io/repository/osbuildee/osbuildee + pull: always + organization: "{{ populate_aap_organization_name }}" + populate_aap_inventories: + - name: "{{ populate_aap_inventory_name }}" + organization: "{{ populate_aap_organization_name }}" + populate_aap_hosts: + - name: osbuild_remote_system + inventory: "{{ populate_aap_inventory_name }}" + variables: + ansible_host: "{{ populate_aap_default_host_ip }}" + ansible_user: "{{ populate_aap_default_host_user }}" + populate_aap_projects: + - name: "{{ populate_aap_project_name }}" + organization: "{{ populate_aap_organization_name }}" + default_environment: "{{ populate_aap_execution_environment_name }}" + scm_type: git + scm_url: https://github.com/redhat-cop/infra.osbuild + populate_aap_credentials: + - name: "{{ populate_aap_credential_name }}" + organization: "{{ populate_aap_organization_name }}" + credential_type: Machine + inputs: + username: "{{ populate_aap_default_host_user }}" + ssh_key_data: "{{ lookup('file', populate_aap_ssh_key_path) if populate_aap_ssh_key_path is defined else '' }}" + populate_aap_job_templates: + - name: osbuild_setup_server + job_type: run + inventory: "{{ populate_aap_inventory_name }}" + project: "{{ populate_aap_project_name }}" + playbook: playbooks/osbuild_setup_server.yml + credentials: + - "{{ populate_aap_credential_name }}" + + - name: osbuild_builder + job_type: run + inventory: "{{ populate_aap_inventory_name }}" + project: "{{ populate_aap_project_name }}" + playbook: playbooks/osbuild_builder.yml + survey_enabled: true + survey: "{{ lookup('template', 'template_surveys/builder_survey.yml') | from_yaml }}" + ask_variables_on_launch: true + extra_vars: + _docs: 'REPLACE WITH VARS FROM DOCS: https://github.com/redhat-cop/infra.osbuild/blob/main/roles/builder/APP_EXTRA_VARS.md' # yamllint disable-line rule:line-length + credentials: + - "{{ populate_aap_credential_name }}" + + - name: osbuild_system_info + job_type: run + inventory: "{{ populate_aap_inventory_name }}" + project: "{{ populate_aap_project_name }}" + playbook: playbooks/osbuild_system_info.yml + credentials: + - "{{ populate_aap_credential_name }}" + + - name: osbuild_update_system + job_type: run + inventory: "{{ populate_aap_inventory_name }}" + project: "{{ populate_aap_project_name }}" + playbook: playbooks/osbuild_update_system.yml + credentials: + - "{{ populate_aap_credential_name }}" ``` ## License From 5ae86fd64e612e4d552263bc42702b036e2cb15b Mon Sep 17 00:00:00 2001 From: resoluteCoder Date: Mon, 31 Jul 2023 18:59:59 -0500 Subject: [PATCH 7/7] a --- changelogs/fragments/265-move-defaults-to-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/fragments/265-move-defaults-to-playbook.yml b/changelogs/fragments/265-move-defaults-to-playbook.yml index 31b51c27..1c3f5ca0 100644 --- a/changelogs/fragments/265-move-defaults-to-playbook.yml +++ b/changelogs/fragments/265-move-defaults-to-playbook.yml @@ -1,3 +1,3 @@ --- minor_changes: - - Moved default vars to populate aap playbook for better availability. \ No newline at end of file + - Moved default vars to populate aap playbook for better availability.