From e554963e072acbba13011bdf9aca9cc48716fb71 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 08 2022 06:46:27 +0000 Subject: import ansible-collection-microsoft-sql-1.2.4-1.el8 --- diff --git a/.ansible-collection-microsoft-sql.metadata b/.ansible-collection-microsoft-sql.metadata index 86b0247..494ee3b 100644 --- a/.ansible-collection-microsoft-sql.metadata +++ b/.ansible-collection-microsoft-sql.metadata @@ -1,2 +1,2 @@ 99df2e20aff7ec8c244218a45bbcd3d68b791311 SOURCES/auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz -b4828ecf3eeaaf10e84998f35a63b29e66611a08 SOURCES/mssql-02d2edb8ac7815cc5789a56414c09bfd0700cbb1.tar.gz +7a6dfa4cb1a14deacfff752bc7cd452b500771d7 SOURCES/mssql-1.2.4.tar.gz diff --git a/.gitignore b/.gitignore index 6841366..5fc4dfb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz -SOURCES/mssql-02d2edb8ac7815cc5789a56414c09bfd0700cbb1.tar.gz +SOURCES/mssql-1.2.4.tar.gz diff --git a/SPECS/ansible-collection-microsoft-sql.spec b/SPECS/ansible-collection-microsoft-sql.spec index fdaea6b..bff2010 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.1.1 -Release: 3%{?dist} +Version: 1.2.4 +Release: 1%{?dist} #Group: Development/Libraries License: MIT @@ -63,6 +63,13 @@ License: MIT %if 0%{?rhel} >= 8 Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0) %endif + +%if 0%{?fedora} +Requires: linux-system-roles +%else +Requires: rhel-system-roles +%endif + %if %{with ansible} BuildRequires: %{ansible_build_dep} %endif @@ -75,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 @@ -90,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}} @@ -103,7 +110,7 @@ BuildRequires: %{ansible_build_dep} %%global collection_rolenames %%{?collection_rolenames} [%{rolename%{1}}]="%{collection_rolename%{1}}" } -%defcommit 1 02d2edb8ac7815cc5789a56414c09bfd0700cbb1 +%defsource 1 1.2.4 %global rolename1 mssql %global target_rolename1 sql-server %global collection_rolename1 server @@ -190,13 +197,38 @@ mkdir .collections cp %{rolename1}/.collection/README.md lsr_role2collection/collection_readme.md # Copy galaxy.yml for the collection build cp %{rolename1}/.collection/galaxy.yml ./ + # Ensure the correct entries in galaxy.yml -./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" "Ansible collection for Microsoft SQL Server management" > galaxy.yml.tmp +%if 0%{?rhel} +./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \ + "Ansible collection for Microsoft SQL Server management" \ + "https://github.com/linux-system-roles/mssql" \ + "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/administration_and_configuration_tasks_using_system_roles_in_rhel/assembly_configuring-microsoft-sql-server-using-microsoft-sql-server-ansible-role_assembly_updating-packages-to-enable-automation-for-the-rhel-system-roles" \ + "https://github.com/linux-system-roles/mssql/blob/master/README.md" \ + "https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%208&component=ansible-collection-microsoft-sql" \ + > galaxy.yml.tmp +%else +./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \ + "Ansible collection for Microsoft SQL Server management" \ + > galaxy.yml.tmp +%endif mv galaxy.yml.tmp galaxy.yml # Declare the array containing collection rolenames to convert roles to declare -A COLLECTION_ROLENAMES=(%{collection_rolenames}) +# Replace fedora.linux_system_roles with redhat.rhel_system_roles +%if 0%{?rhel} +for rolename in %{rolenames}; do + sed -i 's/fedora\.linux_system_roles/redhat.rhel_system_roles/g' \ + $rolename/CHANGELOG.md \ + $rolename/README.md \ + $rolename/tasks/*.yml \ + $rolename/tests/*.yml \ + $rolename/meta/*.yml +done +%endif + # Convert roles to the collection format for rolename in %{rolenames}; do python3 lsr_role2collection.py --role "$rolename" \ @@ -215,6 +247,10 @@ 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} +# Copy CHANGELOG.md from mssql to collection dir +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 @@ -404,19 +440,63 @@ fi %endif %changelog +* Thu Sep 1 2022 Sergei Petrosian - 1.2.4-1 +- Replicate all provided databases + - This change fixes the bug where only the first database provided with +mssql_ha_db_names got replicated + - Clarify that the role does not remove not listed databases + Resolves: rhbz#2066338 +- Input multiple sql scripts + - Allow _input_sql_file vars to accept list of files + - Flush handlers prior to inputting post sql script + Resolves: rhbz#2120713 +- Note that ha_cluster is not idempotent +- SPEC: Do not update dates in CHANGELOG.md + +* 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 +- Add condition for upstream spec build for galaxy_transform +- Replace extra-mapping with replacing in the legacy format with sed + +* Fri Jun 17 2022 Sergei Petrosian - 1.2.0-2 + Return mistakenly deleted galaxy.yml string and bump release + +* Fri Jun 17 2022 Sergei Petrosian - 1.2.0-1 +- Add MVP HA functionality to the server role + Resolves: rhbz#2066338 +- Add mssql_tls_remote_src to the server role + Resolves: rhbz#2039990 +- Add Requires: linux-system-roles or rhel-system-roles +- Add downstream values to galaxy.yml + * Mon Mar 21 2022 Sergei Petrosian - 1.1.1-3 - Fix inserting ansible_managed - Resolves: rhbz#2057651 (EL8) + Resolves: rhbz#2065206 - Users now can provide a custom URLs to pull packages and RPM key from - Resolves: rhbz#2038256 (EL8) + Resolves: rhbz#2067175 * Fri Mar 18 2022 Sergei Petrosian - 1.1.1-2 - RHEL8.6, 9 - add "Requires: ansible-core or ansible" - Resolves: rhbz#2065664 (EL8) + Resolves: rhbz#2067172 * Thu Mar 17 2022 Sergei Petrosian - 1.1.1-1 - Insert the "Ansible managed" comment to the /var/opt/mssql/mssql.conf file - Resolves rhbz#2057651 (EL8) + Resolves rhbz#2065206 * Wed Jan 19 2022 Fedora Release Engineering - 1.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild