From 7a1691047883ad803809285e8217d3508c76e4de Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 26 2022 16:11:29 +0000 Subject: import ansible-collection-microsoft-sql-1.2.3-1.el8 --- diff --git a/.ansible-collection-microsoft-sql.metadata b/.ansible-collection-microsoft-sql.metadata index 072d3c6..713afc1 100644 --- a/.ansible-collection-microsoft-sql.metadata +++ b/.ansible-collection-microsoft-sql.metadata @@ -1,2 +1,2 @@ -8029565ef251244da3ab57291a9a886560c4c792 SOURCES/auto-maintenance-fe4fd028db23607414acce481388f23ac51cd944.tar.gz -2538b3a5050c7eb05a446db5790f89d323d112f3 SOURCES/mssql-4eb3dd55defd801a5032efa597983cbbec4bbeea.tar.gz +99df2e20aff7ec8c244218a45bbcd3d68b791311 SOURCES/auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz +efe869a482b93c0b0289621a82e1718ac55e4ed4 SOURCES/mssql-1.2.3.tar.gz diff --git a/.gitignore b/.gitignore index 287fbbb..eaf2e25 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/auto-maintenance-fe4fd028db23607414acce481388f23ac51cd944.tar.gz -SOURCES/mssql-4eb3dd55defd801a5032efa597983cbbec4bbeea.tar.gz +SOURCES/auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz +SOURCES/mssql-1.2.3.tar.gz diff --git a/SPECS/ansible-collection-microsoft-sql.spec b/SPECS/ansible-collection-microsoft-sql.spec index c08ad77..660334a 100644 --- a/SPECS/ansible-collection-microsoft-sql.spec +++ b/SPECS/ansible-collection-microsoft-sql.spec @@ -25,8 +25,8 @@ Name: ansible-collection-microsoft-sql Url: https://github.com/linux-system-roles/mssql Summary: The Ansible collection for Microsoft SQL Server management -Version: 1.2.0 -Release: 3%{?dist} +Version: 1.2.3 +Release: 1%{?dist} #Group: Development/Libraries License: MIT @@ -82,7 +82,7 @@ BuildRequires: %{ansible_build_dep} %define ansible_collection_build_install() ansible-galaxy collection build; ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz %endif -# For each role, call defcommit() and the point to it with SourceN: %{archiveurlN}. +# For each role, call defsource() and the point to it with SourceN: %{archiveurlN}. %global archiveext tar.gz # list of source role names %global rolenames %nil @@ -97,8 +97,8 @@ BuildRequires: %{ansible_build_dep} %global parenturl https://github.com/linux-system-roles -%define defcommit() %{expand:%%global ref%{1} %{2} -%%global shortcommit%{1} %%(c=%%{ref%{1}}; echo ${c:0:7}) +# You can feed either tag or commit to defsource +%define defsource() %{expand:%%global ref%{1} %{2} %%global extractdir%{1} %%{expand:%%getarchivedir %{1}} %%global archiveurl%{1} %%{parenturl}/%%{rolename%{1}}/archive/%%{ref%{1}}/%%{rolename%{1}}-%%{ref%{1}}.tar.gz %%global rolenames %%{?rolenames} %%{rolename%{1}} @@ -110,12 +110,12 @@ BuildRequires: %{ansible_build_dep} %%global collection_rolenames %%{?collection_rolenames} [%{rolename%{1}}]="%{collection_rolename%{1}}" } -%defcommit 1 4eb3dd55defd801a5032efa597983cbbec4bbeea +%defsource 1 1.2.3 %global rolename1 mssql %global target_rolename1 sql-server %global collection_rolename1 server -%global mainid fe4fd028db23607414acce481388f23ac51cd944 +%global mainid cdc706f14614ef5e80bbce8db10beb369e889df9 Source: %{parenturl}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz Source1: %{archiveurl1} @@ -221,7 +221,11 @@ declare -A COLLECTION_ROLENAMES=(%{collection_rolenames}) %if 0%{?rhel} for rolename in %{rolenames}; do sed -i 's/fedora\.linux_system_roles/redhat.rhel_system_roles/g' \ - $rolename/tasks/*.yml $rolename/tests/*.yml $rolename/meta/*.yml + $rolename/CHANGELOG.md \ + $rolename/README.md \ + $rolename/tasks/*.yml \ + $rolename/tests/*.yml \ + $rolename/meta/*.yml done %endif @@ -243,6 +247,13 @@ rm -r .collections/ansible_collections/%{collection_namespace}/%{collection_name # Copy galaxy.yml to the collection directory cp -p galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name} +# Update CHANGELOG.md with the current date and copy it to collection dir +curr_date=$(date +'%Y-%m-%d') +sed -i "s/^\([%{version}] - \).*/\1$curr_date/g" \ + .collections/ansible_collections/%{collection_namespace}/%{collection_name}/roles/%{collection_rolename1}/CHANGELOG.md +mv .collections/ansible_collections/%{collection_namespace}/%{collection_name}/roles/%{collection_rolename1}/CHANGELOG.md \ + .collections/ansible_collections/%{collection_namespace}/%{collection_name}/ + %install mkdir -p $RPM_BUILD_ROOT%{installbase} mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles @@ -432,6 +443,20 @@ fi %endif %changelog +* Thu Aug 25 2022 Sergei Petrosian - 1.2.3-1 +- Use firewall role to configure firewall for SQL Server + Resolves: rhbz#2120714 +- Add mssql_ha_virtual_ip + Replace mssql_ha_db_name with mssql_ha_db_names to let users replicate multiple DBs + Resolves: rhbz#2066338 +- Replace simple `mssql_input_sql_file` with `pre` and `post` variables + Resolves: rhbz#2120713 +- Add Requires: linux-system-roles or rhel-system-roles +- Replace fedora.linux_system_roles:redhat.rhel_system_roles on RHEL +- Add downstream values to galaxy.yml +- Change defcommit to defsource that takes both tags and commits +- Update CHANGELOG.md with the current date and copy it to collection dir + * Mon Jul 4 2022 Sergei Petrosian - 1.2.0-3 - Update mssql commit Resolves: rhbz#2066338