diff --git a/.ansible-lint b/.ansible-lint new file mode 120000 index 0000000..8d6489b --- /dev/null +++ b/.ansible-lint @@ -0,0 +1 @@ +ansible-pulp/.ansible-lint \ No newline at end of file diff --git a/.yamllint b/.yamllint new file mode 120000 index 0000000..abd5955 --- /dev/null +++ b/.yamllint @@ -0,0 +1 @@ +ansible-pulp/.yamllint \ No newline at end of file diff --git a/ansible-pulp b/ansible-pulp index 1a1617a..fb06c70 160000 --- a/ansible-pulp +++ b/ansible-pulp @@ -1 +1 @@ -Subproject commit 1a1617a825b43d11dd2c07130e92cdc17a1d4eea +Subproject commit fb06c7090f9dd802119cb277df8d86fbd94364df diff --git a/example.dev-config.yml b/example.dev-config.yml index 44e6e16..46e525f 100644 --- a/example.dev-config.yml +++ b/example.dev-config.yml @@ -30,5 +30,7 @@ developer_user: "vagrant" developer_user_home: "/home/vagrant" pulp_plugin_source_dir: "/home/vagrant/devel/pulpcore-plugin" pulp_source_dir: "/home/vagrant/devel/pulpcore" +# Uncomment if using pulp-rpm +#pulp_use_system_wide_pkgs: true pulp_settings: secret_key: "unsafe_default" diff --git a/example.user-config.yml b/example.user-config.yml index 61e1bf2..9e153be 100644 --- a/example.user-config.yml +++ b/example.user-config.yml @@ -11,5 +11,8 @@ pulp_install_plugins: # pulp-rpm: # prereq_role: "/home/vagrant/devel/pulp-rpm-prerequisites" pulp-file: {} + +# Uncomment if using pulp-rpm +#pulp_use_system_wide_pkgs: true pulp_settings: secret_key: "unsafe_default" diff --git a/forklift b/forklift index 428a1e4..27fb3fe 160000 --- a/forklift +++ b/forklift @@ -1 +1 @@ -Subproject commit 428a1e4c77a2de3956cf78ec7243b67f66806435 +Subproject commit 27fb3fe531860d9bf05e191df87d098ed0bd3fc9 diff --git a/playbooks/source-install.yml b/playbooks/source-install.yml index 3314f84..1f26148 100644 --- a/playbooks/source-install.yml +++ b/playbooks/source-install.yml @@ -9,6 +9,14 @@ with_first_found: "{{ paths_to_vars_files }}" - name: Set up Vagrant machine for source installs include: ../vagrant/vagrant-pretask.yml + + # The version string below is the highest of all those in roles' metadata: + # "min_ansible_version". It needs to be kept manually up-to-date. + - name: Verify Ansible meets min required version + assert: + that: "ansible_version.full is version_compare('2.8', '>=')" + msg: > + "You must update Ansible to at least 2.8 to use this version of Pulp 3 Installer." roles: - pulp-database - pulp-workers diff --git a/playbooks/user-sandbox.yml b/playbooks/user-sandbox.yml index cb7f833..e42a42f 100644 --- a/playbooks/user-sandbox.yml +++ b/playbooks/user-sandbox.yml @@ -8,6 +8,13 @@ - include_vars: "{{ item }}" with_first_found: "{{ paths_to_vars_files }}" + # The version string below is the highest of all those in roles' metadata: + # "min_ansible_version". It needs to be kept manually up-to-date. + - name: Verify Ansible meets min required version + assert: + that: "ansible_version.full is version_compare('2.8', '>=')" + msg: > + "You must update Ansible to at least 2.8 to use this version of Pulp 3 Installer." roles: - pulp-database - pulp-workers diff --git a/pulp-ci b/pulp-ci index 3eeffbf..46a4037 160000 --- a/pulp-ci +++ b/pulp-ci @@ -1 +1 @@ -Subproject commit 3eeffbfcae01cf91ba7b4f6ef99b93e64558d854 +Subproject commit 46a4037fe6583376572d0732931631c9e18f017b