diff --git a/README.adoc b/README.adoc index a9354f8ad..a8aeccbdd 100644 --- a/README.adoc +++ b/README.adoc @@ -27,6 +27,6 @@ Read link:doc/featurelist.adoc[here] for a detailed list of features of `ansible ## Pre-requisites -* Ansible Version >= 2.9. (Version 2.12 or newer of Ansible is recommended) -* Oracle Linux (or any RHEL-based Linux System) >= 7 +* Ansible Version >= 2.14. +* Oracle Linux (or any RHEL-based Linux System) >= 8 * Oracle Database/Grid Infrastructure 21.3.0.0, 19.3.0.0 diff --git a/README.md b/README.md index f4674910c..55b0bf075 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,5 @@ # ansible-oracle - -_IMPORTANT_ - -*This an a beta release of `ansible-oracle`.* Use Version 3.x for production instead of this version. - - * Automated installation of * Oracle RAC databases * RAC One Node database and @@ -15,15 +9,18 @@ _IMPORTANT_ # Documentation ## Features + 1. Full list of features of ansible-oracle 1. More details ## Getting Started + 1. Vagrant setup on Windows 1. Beginner ### Next Steps + 1. Read the full documentation 1. How to develop in ansible-oracle 1. List of roles in ansible-oracle @@ -34,5 +31,5 @@ _IMPORTANT_ * Ansible Version >= 2.14 Version 2.14 or newer of Ansible is recommended -* Oracle Linux (or any RHEL-based Linux System) >= 7 +* Oracle Linux (or any RHEL-based Linux System) >= 8 * Oracle Database/Grid Infrastructure 21.3.0.0, 19.3.0.0 diff --git a/changelogs/fragments/rhel_ol7.yaml b/changelogs/fragments/rhel_ol7.yaml new file mode 100644 index 000000000..272c0279e --- /dev/null +++ b/changelogs/fragments/rhel_ol7.yaml @@ -0,0 +1,3 @@ +--- +deprecated_features: + - "End of Life for Oracle Linux 7 and RHEL7 ()" diff --git a/doc/featurelist.adoc b/doc/featurelist.adoc index e6abbe9f2..d167468e1 100644 --- a/doc/featurelist.adoc +++ b/doc/featurelist.adoc @@ -33,7 +33,7 @@ See documentation from Oracle for differences between Enterprise and Standard Ed |OracleLinux + Redhat Enterprise Linux |6 <> + -7 + +7 <> + 8 + 9 (experimental!) <> diff --git a/example/beginner/vagrant/Vagrantfile b/example/beginner/vagrant/Vagrantfile index a5b406d46..205d9e531 100644 --- a/example/beginner/vagrant/Vagrantfile +++ b/example/beginner/vagrant/Vagrantfile @@ -29,7 +29,7 @@ Vagrant.configure("2") do |config| config.vm.disk :disk, size: "150GB", name: "#{vm_name}_oracle" - config.vm.box = "Rendanic/oraclelinux-7.x" + config.vm.box = "Rendanic/oraclelinux-8.x" config.vm.box_check_update = false config.vm.network :private_network, ip: lanip diff --git a/example/rac/vagrant/Vagrantfile b/example/rac/vagrant/Vagrantfile index 2a125b8e2..140f43d1d 100644 --- a/example/rac/vagrant/Vagrantfile +++ b/example/rac/vagrant/Vagrantfile @@ -46,7 +46,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Every Vagrant virtual environment requires a box to build off of. config.ssh.insert_key = false - config.vm.box = "Rendanic/oraclelinux-7.x" + config.vm.box = "Rendanic/oraclelinux-8.x" (1..num_DB_INSTANCES).each do |i| # this is to start machines higher to lower diff --git a/extensions/molecule/default/molecule.yml b/extensions/molecule/default/molecule.yml index 50a710fcc..dae7d1389 100644 --- a/extensions/molecule/default/molecule.yml +++ b/extensions/molecule/default/molecule.yml @@ -6,15 +6,6 @@ dependency: driver: name: docker platforms: - - name: ol7 - image: "quay.io/rendanic/docker-ol7-ansible:latest" - pre_build_image: true - # The following 4 lines are needed only for making systemd work - command: ${MOLECULE_DOCKER_COMMAND:-""} - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - cgroupns_mode: host - privileged: true - name: ol8 image: "quay.io/rendanic/docker-ol8-ansible:latest" pre_build_image: true diff --git a/roles/common/README.md b/roles/common/README.md index 54721b43f..d83a1f597 100644 --- a/roles/common/README.md +++ b/roles/common/README.md @@ -338,7 +338,8 @@ Url for epel-release-latest-7.noarch.rpm #### Default value ```YAML -epel7_rpm: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +epel7_rpm: + https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm ``` ### epel8_rpm diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml index 1142da731..edf7c631f 100644 --- a/roles/common/defaults/main.yml +++ b/roles/common/defaults/main.yml @@ -8,7 +8,7 @@ epel9_rpm: oracle-epel-release-el9 epel8_rpm: https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm # @var epel7_rpm:description: Url for epel-release-latest-7.noarch.rpm -epel7_rpm: https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +epel7_rpm: https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm # @var epel6_rpm:description: Url for epel-release-latest-6.noarch.rpm epel6_rpm: https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm