From 9b141686083bb992cf6bcdd8ad1032a93431f3d3 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Mon, 1 Jul 2024 21:53:33 +0530 Subject: [PATCH 1/8] centos repo update --- .../templates/CentOS-AppStream.repo.j2 | 2 +- .../cloudstack-manager/templates/CentOS-Base.repo.j2 | 10 +++++----- Ansible/templates/CentOS-AppStream.repo.j2 | 2 +- Ansible/templates/CentOS-Base.repo.j2 | 4 ++-- Ansible/templates/CentOS8-Base.repo.j2 | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Ansible/roles/cloudstack-manager/templates/CentOS-AppStream.repo.j2 b/Ansible/roles/cloudstack-manager/templates/CentOS-AppStream.repo.j2 index abaeb607f4c..0fa727a0f40 100644 --- a/Ansible/roles/cloudstack-manager/templates/CentOS-AppStream.repo.j2 +++ b/Ansible/roles/cloudstack-manager/templates/CentOS-AppStream.repo.j2 @@ -12,7 +12,7 @@ [AppStream] name=CentOS-$releasever - AppStream -#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra +#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra baseurl=http://{{ os_repo }}/centos/$releasever/AppStream/$basearch/os/ gpgcheck=0 enabled=1 diff --git a/Ansible/roles/cloudstack-manager/templates/CentOS-Base.repo.j2 b/Ansible/roles/cloudstack-manager/templates/CentOS-Base.repo.j2 index 6ffbc93b88b..6b520dca530 100644 --- a/Ansible/roles/cloudstack-manager/templates/CentOS-Base.repo.j2 +++ b/Ansible/roles/cloudstack-manager/templates/CentOS-Base.repo.j2 @@ -12,7 +12,7 @@ [base] name=CentOS-$releasever - Base -#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os +#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=os baseurl=http://{{ os_repo }}/centos/$releasever/os/$basearch/ gpgcheck=0 enabled = {{ base_repo_enabled }} @@ -20,7 +20,7 @@ enabled = {{ base_repo_enabled }} #released updates [updates] name=CentOS-$releasever - Updates -#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates +#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=updates baseurl=http://{{ os_repo }}/centos/$releasever/updates/$basearch/ gpgcheck=0 enabled = {{ update_repo_enabled }} @@ -28,7 +28,7 @@ enabled = {{ update_repo_enabled }} #additional packages that may be useful [extras] name=CentOS-$releasever - Extras -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras +mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=extras #baseurl=http://mirror.centos.org/centos/$releasever/extras/$basearch/ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 @@ -37,7 +37,7 @@ enabled = 0 #additional packages that extend functionality of existing packages [centosplus] name=CentOS-$releasever - Plus -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus +mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=centosplus #baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/ gpgcheck=1 enabled=0 @@ -46,7 +46,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 #contrib - packages by Centos Users [contrib] name=CentOS-$releasever - Contrib -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib +mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=contrib #baseurl=http://mirror.centos.org/centos/$releasever/contrib/$basearch/ gpgcheck=1 enabled=0 diff --git a/Ansible/templates/CentOS-AppStream.repo.j2 b/Ansible/templates/CentOS-AppStream.repo.j2 index d5ed3167f7a..b273bd2362a 100644 --- a/Ansible/templates/CentOS-AppStream.repo.j2 +++ b/Ansible/templates/CentOS-AppStream.repo.j2 @@ -12,7 +12,7 @@ [AppStream] name=CentOS-$releasever - AppStream -#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra +#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra baseurl={{ os_repo }}/centos/$releasever/AppStream/$basearch/os/ gpgcheck=0 enabled=1 diff --git a/Ansible/templates/CentOS-Base.repo.j2 b/Ansible/templates/CentOS-Base.repo.j2 index 204e1566d23..4930959d66d 100644 --- a/Ansible/templates/CentOS-Base.repo.j2 +++ b/Ansible/templates/CentOS-Base.repo.j2 @@ -12,7 +12,7 @@ [base] name=CentOS-$releasever - Base -#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os +#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=os baseurl={{ os_repo }}/centos/$releasever/os/$basearch/ gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever @@ -21,7 +21,7 @@ enabled = {{ base_repo_enabled | default(1) }} #released updates [updates] name=CentOS-$releasever - Updates -#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates +#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=updates baseurl={{ os_repo }}/centos/$releasever/updates/$basearch/ gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever diff --git a/Ansible/templates/CentOS8-Base.repo.j2 b/Ansible/templates/CentOS8-Base.repo.j2 index 1df1629dea3..3b8ce228efb 100644 --- a/Ansible/templates/CentOS8-Base.repo.j2 +++ b/Ansible/templates/CentOS8-Base.repo.j2 @@ -12,7 +12,7 @@ [base] name=CentOS-$releasever - Base -#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os +#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=os baseurl={{ os_repo }}/centos/$releasever/os/$basearch/ gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever From 4819cead7549e510e4fdd122f1e6d2d844cc2314 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Tue, 2 Jul 2024 13:33:29 +0530 Subject: [PATCH 2/8] Revert "centos repo update" This reverts commit 9b141686083bb992cf6bcdd8ad1032a93431f3d3. --- .../templates/CentOS-AppStream.repo.j2 | 2 +- .../cloudstack-manager/templates/CentOS-Base.repo.j2 | 10 +++++----- Ansible/templates/CentOS-AppStream.repo.j2 | 2 +- Ansible/templates/CentOS-Base.repo.j2 | 4 ++-- Ansible/templates/CentOS8-Base.repo.j2 | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Ansible/roles/cloudstack-manager/templates/CentOS-AppStream.repo.j2 b/Ansible/roles/cloudstack-manager/templates/CentOS-AppStream.repo.j2 index 0fa727a0f40..abaeb607f4c 100644 --- a/Ansible/roles/cloudstack-manager/templates/CentOS-AppStream.repo.j2 +++ b/Ansible/roles/cloudstack-manager/templates/CentOS-AppStream.repo.j2 @@ -12,7 +12,7 @@ [AppStream] name=CentOS-$releasever - AppStream -#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra baseurl=http://{{ os_repo }}/centos/$releasever/AppStream/$basearch/os/ gpgcheck=0 enabled=1 diff --git a/Ansible/roles/cloudstack-manager/templates/CentOS-Base.repo.j2 b/Ansible/roles/cloudstack-manager/templates/CentOS-Base.repo.j2 index 6b520dca530..6ffbc93b88b 100644 --- a/Ansible/roles/cloudstack-manager/templates/CentOS-Base.repo.j2 +++ b/Ansible/roles/cloudstack-manager/templates/CentOS-Base.repo.j2 @@ -12,7 +12,7 @@ [base] name=CentOS-$releasever - Base -#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=os +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os baseurl=http://{{ os_repo }}/centos/$releasever/os/$basearch/ gpgcheck=0 enabled = {{ base_repo_enabled }} @@ -20,7 +20,7 @@ enabled = {{ base_repo_enabled }} #released updates [updates] name=CentOS-$releasever - Updates -#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=updates +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates baseurl=http://{{ os_repo }}/centos/$releasever/updates/$basearch/ gpgcheck=0 enabled = {{ update_repo_enabled }} @@ -28,7 +28,7 @@ enabled = {{ update_repo_enabled }} #additional packages that may be useful [extras] name=CentOS-$releasever - Extras -mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=extras +mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras #baseurl=http://mirror.centos.org/centos/$releasever/extras/$basearch/ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 @@ -37,7 +37,7 @@ enabled = 0 #additional packages that extend functionality of existing packages [centosplus] name=CentOS-$releasever - Plus -mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=centosplus +mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus #baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/ gpgcheck=1 enabled=0 @@ -46,7 +46,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 #contrib - packages by Centos Users [contrib] name=CentOS-$releasever - Contrib -mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=contrib +mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=contrib #baseurl=http://mirror.centos.org/centos/$releasever/contrib/$basearch/ gpgcheck=1 enabled=0 diff --git a/Ansible/templates/CentOS-AppStream.repo.j2 b/Ansible/templates/CentOS-AppStream.repo.j2 index b273bd2362a..d5ed3167f7a 100644 --- a/Ansible/templates/CentOS-AppStream.repo.j2 +++ b/Ansible/templates/CentOS-AppStream.repo.j2 @@ -12,7 +12,7 @@ [AppStream] name=CentOS-$releasever - AppStream -#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra baseurl={{ os_repo }}/centos/$releasever/AppStream/$basearch/os/ gpgcheck=0 enabled=1 diff --git a/Ansible/templates/CentOS-Base.repo.j2 b/Ansible/templates/CentOS-Base.repo.j2 index 4930959d66d..204e1566d23 100644 --- a/Ansible/templates/CentOS-Base.repo.j2 +++ b/Ansible/templates/CentOS-Base.repo.j2 @@ -12,7 +12,7 @@ [base] name=CentOS-$releasever - Base -#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=os +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os baseurl={{ os_repo }}/centos/$releasever/os/$basearch/ gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever @@ -21,7 +21,7 @@ enabled = {{ base_repo_enabled | default(1) }} #released updates [updates] name=CentOS-$releasever - Updates -#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=updates +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates baseurl={{ os_repo }}/centos/$releasever/updates/$basearch/ gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever diff --git a/Ansible/templates/CentOS8-Base.repo.j2 b/Ansible/templates/CentOS8-Base.repo.j2 index 3b8ce228efb..1df1629dea3 100644 --- a/Ansible/templates/CentOS8-Base.repo.j2 +++ b/Ansible/templates/CentOS8-Base.repo.j2 @@ -12,7 +12,7 @@ [base] name=CentOS-$releasever - Base -#mirrorlist=http://vault.centos.org/?release=$releasever&arch=$basearch&repo=os +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os baseurl={{ os_repo }}/centos/$releasever/os/$basearch/ gpgcheck=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever From 964609bdd01823bc41f38aa8e067243675793e27 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Tue, 2 Jul 2024 13:42:51 +0530 Subject: [PATCH 3/8] added repo files to marvin templates --- .../marvin/templates/CentOS-Base.repo.j2 | 19 +++++++++++++++++++ Ansible/roles/marvin/templates/epel.repo.j2 | 8 ++++++++ 2 files changed, 27 insertions(+) create mode 100644 Ansible/roles/marvin/templates/CentOS-Base.repo.j2 create mode 100644 Ansible/roles/marvin/templates/epel.repo.j2 diff --git a/Ansible/roles/marvin/templates/CentOS-Base.repo.j2 b/Ansible/roles/marvin/templates/CentOS-Base.repo.j2 new file mode 100644 index 00000000000..19b4c0eaf23 --- /dev/null +++ b/Ansible/roles/marvin/templates/CentOS-Base.repo.j2 @@ -0,0 +1,19 @@ +# CentOS-Base.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# If the mirrorlist= does not work for you, as a fall back you can try the +# remarked out baseurl= line instead. +# +# + +[base] +name=CentOS-$releasever - Base +mirrorlist=https://vault.centos.org/7.9.2009/os/x86_64/ +#baseurl={{ os_repo }}/centos/$releasever/os/$basearch/ +gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 +enabled = 1 diff --git a/Ansible/roles/marvin/templates/epel.repo.j2 b/Ansible/roles/marvin/templates/epel.repo.j2 new file mode 100644 index 00000000000..847ddc9bd97 --- /dev/null +++ b/Ansible/roles/marvin/templates/epel.repo.j2 @@ -0,0 +1,8 @@ +[epel] +name=Extra Packages for Enterprise Linux 6 - $basearch +baseurl={{ os_repo }}/epel/$releasever/$basearch +#mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch +failovermethod=priority +enabled=1 +gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever From e5eae1d04e4994512c47df83f2812f10b3a27dd0 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Tue, 2 Jul 2024 13:51:59 +0530 Subject: [PATCH 4/8] Revert "added repo files to marvin templates" This reverts commit 964609bdd01823bc41f38aa8e067243675793e27. --- .../marvin/templates/CentOS-Base.repo.j2 | 19 ------------------- Ansible/roles/marvin/templates/epel.repo.j2 | 8 -------- 2 files changed, 27 deletions(-) delete mode 100644 Ansible/roles/marvin/templates/CentOS-Base.repo.j2 delete mode 100644 Ansible/roles/marvin/templates/epel.repo.j2 diff --git a/Ansible/roles/marvin/templates/CentOS-Base.repo.j2 b/Ansible/roles/marvin/templates/CentOS-Base.repo.j2 deleted file mode 100644 index 19b4c0eaf23..00000000000 --- a/Ansible/roles/marvin/templates/CentOS-Base.repo.j2 +++ /dev/null @@ -1,19 +0,0 @@ -# CentOS-Base.repo -# -# The mirror system uses the connecting IP address of the client and the -# update status of each mirror to pick mirrors that are updated to and -# geographically close to the client. You should use this for CentOS updates -# unless you are manually picking other mirrors. -# -# If the mirrorlist= does not work for you, as a fall back you can try the -# remarked out baseurl= line instead. -# -# - -[base] -name=CentOS-$releasever - Base -mirrorlist=https://vault.centos.org/7.9.2009/os/x86_64/ -#baseurl={{ os_repo }}/centos/$releasever/os/$basearch/ -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 -enabled = 1 diff --git a/Ansible/roles/marvin/templates/epel.repo.j2 b/Ansible/roles/marvin/templates/epel.repo.j2 deleted file mode 100644 index 847ddc9bd97..00000000000 --- a/Ansible/roles/marvin/templates/epel.repo.j2 +++ /dev/null @@ -1,8 +0,0 @@ -[epel] -name=Extra Packages for Enterprise Linux 6 - $basearch -baseurl={{ os_repo }}/epel/$releasever/$basearch -#mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch -failovermethod=priority -enabled=1 -gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever From a6c91cf14630330822dcb6f7c906355b421dce2c Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Tue, 2 Jul 2024 13:54:50 +0530 Subject: [PATCH 5/8] set repos to local before installing dev tools --- .../roles/marvin/tasks/install_marvin_prereqs.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml index f10106161fc..9d76f81f3bd 100644 --- a/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml +++ b/Ansible/roles/marvin/tasks/install_marvin_prereqs.yml @@ -28,13 +28,6 @@ - marvin_cfg - marvin_install -- name: Install Dev Tools Group - yum: name="@Development tools" state=installed update_cache=yes - tags: - - marvin - - marvin_cfg - - marvin_install - - name: set yum repo to local template: src="{{ inventory_dir }}/templates/{{ item }}.j2" dest="/etc/yum.repos.d/{{item}}" with_items: @@ -44,6 +37,13 @@ - marvin - marvin_install +- name: Install Dev Tools Group + yum: name="@Development tools" state=installed update_cache=yes + tags: + - marvin + - marvin_cfg + - marvin_install + - name: Install other dependancies yum: name={{ item }} state=installed update_cache=yes with_items: From 1274cb285aadd8d64e665f848e934e02779baeb0 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Tue, 2 Jul 2024 14:15:33 +0530 Subject: [PATCH 6/8] set local repo before chrony install --- Ansible/roles/timezone/tasks/centos7.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Ansible/roles/timezone/tasks/centos7.yml b/Ansible/roles/timezone/tasks/centos7.yml index 0a7718155c8..56af005373d 100644 --- a/Ansible/roles/timezone/tasks/centos7.yml +++ b/Ansible/roles/timezone/tasks/centos7.yml @@ -3,6 +3,12 @@ - name: "set Timezone to {{ env_timezone }}" command: "timedatectl set-timezone {{ env_timezone }}" +- name: set yum repo to local + template: src="{{ inventory_dir }}/templates/{{ item }}.j2" dest="/etc/yum.repos.d/{{item}}" + with_items: + - "epel.repo" + - "CentOS-Base.repo" + - name: Install chrony yum: name: chrony From 5bc166d8f3dabcdef29ff5ff245262fb27f167a5 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Tue, 2 Jul 2024 16:10:47 +0200 Subject: [PATCH 7/8] set order of local repos --- Ansible/roles/timezone/tasks/centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ansible/roles/timezone/tasks/centos7.yml b/Ansible/roles/timezone/tasks/centos7.yml index 56af005373d..f7d2701b749 100644 --- a/Ansible/roles/timezone/tasks/centos7.yml +++ b/Ansible/roles/timezone/tasks/centos7.yml @@ -6,8 +6,8 @@ - name: set yum repo to local template: src="{{ inventory_dir }}/templates/{{ item }}.j2" dest="/etc/yum.repos.d/{{item}}" with_items: - - "epel.repo" - "CentOS-Base.repo" + - "epel.repo" - name: Install chrony yum: From 45eb65d5672f665f0bb793bb6a9521b8d57c041a Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Tue, 2 Jul 2024 16:38:40 +0200 Subject: [PATCH 8/8] selinux-python --- Ansible/roles/timezone/tasks/centos7.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Ansible/roles/timezone/tasks/centos7.yml b/Ansible/roles/timezone/tasks/centos7.yml index f7d2701b749..e4bf6c6022c 100644 --- a/Ansible/roles/timezone/tasks/centos7.yml +++ b/Ansible/roles/timezone/tasks/centos7.yml @@ -9,6 +9,12 @@ - "CentOS-Base.repo" - "epel.repo" + +- name: Ensure prerequisite libselinux-python installed + yum: + name: libselinux-python + state: installed + - name: Install chrony yum: name: chrony