diff --git a/README.md b/README.md index 8daedee..6bb3438 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The `ovirt-cluster-upgrade` role iterates through all the hosts in a cluster and Requirements ------------ - * Ansible version 2.3 or higher + * Ansible version 2.4 or higher * Python SDK version 4 or higher Role Variables diff --git a/automation.yaml b/automation.yaml index 012da60..655ecbd 100644 --- a/automation.yaml +++ b/automation.yaml @@ -4,4 +4,3 @@ distros: - el7 release_branches: master: ovirt-master - ovirt-ansible-1.0: ovirt-4.1 diff --git a/build.sh b/build.sh index e851b00..81aea8d 100755 --- a/build.sh +++ b/build.sh @@ -39,15 +39,14 @@ install() { echo "Installing data..." mkdir -p $PKG_DATA_DIR mkdir -p $PKG_DOC_DIR + + # Create a symlink, so legacy role name does work: ln -f -s $PKG_DATA_DIR_ORIG $ROLENAME_LEGACY cp -pR defaults/ $PKG_DATA_DIR cp -pR library/ $PKG_DATA_DIR cp -pR tasks/ $PKG_DATA_DIR - - cp -pR examples/ $PKG_DOC_DIR - cp -p LICENSE $PKG_DOC_DIR - cp -p README.md $PKG_DOC_DIR + echo "Installation done." } diff --git a/meta/main.yml b/meta/main.yml index 668e258..8948e7f 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -5,16 +5,15 @@ galaxy_info: license: Apache License 2.0 - min_ansible_version: 2.2 + min_ansible_version: 2.4 platforms: - name: EL versions: - - 7 + - all - name: Fedora versions: - - 24 - - 25 + - all galaxy_tags: [ovirt, rhv, rhev, virtualization] diff --git a/ovirt-ansible-cluster-upgrade.spec.in b/ovirt-ansible-cluster-upgrade.spec.in index 0fd14ec..ecd1ed9 100644 --- a/ovirt-ansible-cluster-upgrade.spec.in +++ b/ovirt-ansible-cluster-upgrade.spec.in @@ -35,10 +35,10 @@ sh build.sh install %{_datadir}/%{ansible_roles_dir}/%{roleprefix}%{rolename} %{_datadir}/%{ansible_roles_dir}/%{roleprefix_legacy}%{rolename} -%doc %{_pkgdocdir}/README.md -%doc %{_pkgdocdir}/examples/*yml +%doc README.md +%doc examples/ -%license %{_pkgdocdir}/LICENSE +%license LICENSE %changelog * Thu Nov 16 2017 Ondra Machacek - 1.0.0-0 diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 80c4282..0000000 --- a/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -ansible -yamllint -jmespath diff --git a/version.mak b/version.mak deleted file mode 100644 index dd32eca..0000000 --- a/version.mak +++ /dev/null @@ -1,35 +0,0 @@ -# Version Information - -VERSION_MAJOR=1 -VERSION_MINOR=0 -VERSION_PATCH_LEVEL=0 -VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH_LEVEL) - -# Milestone is manually specified, -# example for ordering: -# - master -# - alpha -# - master -# - beta -# - master -# - beta2 -# - master -# - rc -# - master -# - rc2 -# - master -# - -# -MILESTONE= - -# RPM release is manually specified, -# For pre-release: -# RPM_RELEASE=0.N.$(MILESTONE).$(shell date -u +%Y%m%d%H%M%S) -# While N is incremented when milestone is changed. -# -# For release: -# RPM_RELEASE=N -# while N is incremented each re-release -# Use only for spec file changes -# -RPM_RELEASE=1