-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #63 from Fdall/bug_22183/ansible_collection_should…
…_support_the_renaming_of_the_server_packages_starting_7_2 Fixes #22183: Ansible collection should support the renaming of the server packages starting 7.2+
- Loading branch information
Showing
38 changed files
with
213 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
policy_server: rudder.server | ||
server_version: 7.0 | ||
relay_version: 7.2 | ||
rudder_repository_username: "" | ||
rudder_repository_password: "" | ||
rudder_repository: repository.rudder.io | ||
rudder_repository_url: "" | ||
update_cache: yes | ||
apt_key_url: "https://repository.rudder.io/apt/rudder_apt_key.pub" | ||
rpm_key_url: "https://repository.rudder.io/rpm/rudder_rpm_key.pub" | ||
rpm_key_url: "https://repository.rudder.io/rpm/rudder_rpm_key.pub" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
- name: Install Rudder Relay | ||
apt: | ||
name: rudder-relay | ||
state: present | ||
register: relay_installed | ||
failed_when: (relay_installed is changed) or (relay_installed is failed) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,16 @@ | ||
--- | ||
dependency: | ||
name: galaxy | ||
driver: | ||
name: docker | ||
platforms: | ||
- name: centos8 | ||
image: geerlingguy/docker-centos8-ansible:latest | ||
|
||
- name: instance | ||
image: quay.io/centos/centos:stream8 | ||
command: /sbin/init | ||
capabilities: | ||
- SYS_ADMIN | ||
volumes: | ||
- /sys/fs/cgroup:/sys/fs/cgroup:ro | ||
provisioner: | ||
name: ansible | ||
|
||
verifier: | ||
name: ansible |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
- name: Install Rudder Relay | ||
yum: | ||
name: rudder-relay | ||
state: present | ||
register: relay_installed | ||
failed_when: (relay_installed is changed) or (relay_installed is failed) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
- name: Install Rudder Relay | ||
zypper: | ||
name: rudder-relay | ||
state: latest | ||
register: relay_installed | ||
failed_when: (relay_installed is changed) or (relay_installed is failed) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
--- | ||
- name: Converge | ||
hosts: all | ||
tasks: | ||
- name: "Include rudder_relay" | ||
include_role: | ||
name: "rudder_relay" | ||
vars: | ||
relay_version: 7.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
- name: Install Rudder Relay | ||
apt: | ||
name: rudder-server-relay | ||
state: present | ||
register: relay_installed | ||
failed_when: (relay_installed is changed) or (relay_installed is failed) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
dependency: | ||
name: galaxy | ||
driver: | ||
name: docker | ||
platforms: | ||
- name: instance | ||
image: quay.io/centos/centos:stream8 | ||
command: /sbin/init | ||
capabilities: | ||
- SYS_ADMIN | ||
volumes: | ||
- /sys/fs/cgroup:/sys/fs/cgroup:ro | ||
provisioner: | ||
name: ansible | ||
verifier: | ||
name: ansible |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
- name: Install Rudder Relay | ||
yum: | ||
name: rudder-server-relay | ||
state: present | ||
register: relay_installed | ||
failed_when: (relay_installed is changed) or (relay_installed is failed) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
- name: Install Rudder Relay | ||
zypper: | ||
name: rudder-server-relay | ||
state: latest | ||
register: relay_installed | ||
failed_when: (relay_installed is changed) or (relay_installed is failed) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
--- | ||
# This is an example playbook to execute Ansible tests. | ||
|
||
- name: Verify | ||
hosts: all | ||
tasks: | ||
- name: Get rudder cli path | ||
command: which rudder | ||
register: rudder_path | ||
|
||
- name: Get rudder policy server | ||
command: cat /var/rudder/cfengine-community/policy_server.dat | ||
register: current_policy_server | ||
|
||
- name: Rudder-agent must be installed | ||
assert: | ||
that: | ||
- rudder_path.stdout == "/usr/bin/rudder" | ||
|
||
- name: Policy server must be configured | ||
assert: | ||
that: | ||
- current_policy_server.stdout == "rudder.server" | ||
|
||
- include_tasks: redhat.yml | ||
when: ansible_os_family == "RedHat" | ||
- include_tasks: debian.yml | ||
when: ansible_os_family == "Debian" | ||
- include_tasks: sles.yml | ||
when: ansible_os_family == "Suse" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
- name: Install Rudder Relay | ||
apt: | ||
name: rudder-server-relay | ||
name: "{{ rudder_relay_package_name }}" | ||
state: latest | ||
notify: | ||
- Send inventory |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
- name: Install Rudder Relay | ||
yum: | ||
name: rudder-server-relay | ||
name: "{{ rudder_relay_package_name }}" | ||
state: latest | ||
notify: | ||
- Send inventory |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
- name: Install Rudder Relay | ||
zypper: | ||
name: rudder-server-relay | ||
name: "{{ rudder_relay_package_name }}" | ||
state: latest | ||
notify: | ||
- Send inventory |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
rudder_server_package_name: "rudder-server" | ||
rudder_relay_package_name: "rudder-relay" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
rudder_server_package_name: "rudder-server-root" | ||
rudder_relay_package_name: "rudder-server-relay" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
--- | ||
server_version: 7.0 | ||
server_version: 7.2 | ||
rudder_repository_username: "" | ||
rudder_repository_password: "" | ||
rudder_repository: repository.rudder.io | ||
rudder_repository_url: "" | ||
update_cache: yes | ||
apt_key_url: "https://repository.rudder.io/apt/rudder_apt_key.pub" | ||
rpm_key_url: "https://repository.rudder.io/rpm/rudder_rpm_key.pub" | ||
rpm_key_url: "https://repository.rudder.io/rpm/rudder_rpm_key.pub" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
- name: Install Rudder Agent | ||
- name: Install Rudder Server | ||
apt: | ||
name: rudder-server-root | ||
name: rudder-server | ||
state: present | ||
register: server_installed | ||
failed_when: (server_installed is changed) or (server_installed is failed) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
- name: Install Rudder Agent | ||
- name: Install Rudder Server | ||
yum: | ||
name: rudder-server-root | ||
name: rudder-server | ||
state: present | ||
register: server_installed | ||
failed_when: (server_installed is changed) or (server_installed is failed) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
- name: Install Rudder Agent | ||
- name: Install Rudder Server | ||
zypper: | ||
name: rudder-server-root | ||
name: rudder-server | ||
state: latest | ||
register: server_installed | ||
failed_when: (server_installed is changed) or (server_installed is failed) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
- name: Converge | ||
hosts: all | ||
tasks: | ||
- name: "Include rudder_server" | ||
include_role: | ||
name: "rudder_server" | ||
vars: | ||
server_version: 7.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
- name: Install Rudder Agent | ||
apt: | ||
name: rudder-server-root | ||
state: present | ||
register: server_installed | ||
failed_when: (server_installed is changed) or (server_installed is failed) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
dependency: | ||
name: galaxy | ||
driver: | ||
name: docker | ||
platforms: | ||
- name: instance | ||
image: quay.io/centos/centos:stream8 | ||
command: /sbin/init | ||
capabilities: | ||
- SYS_ADMIN | ||
volumes: | ||
- /sys/fs/cgroup:/sys/fs/cgroup:ro | ||
provisioner: | ||
name: ansible | ||
verifier: | ||
name: ansible |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
- name: Install Rudder Agent | ||
yum: | ||
name: rudder-server-root | ||
state: present | ||
register: server_installed | ||
failed_when: (server_installed is changed) or (server_installed is failed) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
- name: Install Rudder Agent | ||
zypper: | ||
name: rudder-server-root | ||
state: latest | ||
register: server_installed | ||
failed_when: (server_installed is changed) or (server_installed is failed) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
--- | ||
# This is an example playbook to execute Ansible tests. | ||
|
||
- name: Verify | ||
hosts: all | ||
tasks: | ||
- name: Get rudder cli path | ||
command: which rudder | ||
register: rudder_path | ||
|
||
- name: Rudder-agent must be installed | ||
assert: | ||
that: | ||
- rudder_path.stdout == "/usr/bin/rudder" | ||
|
||
- include_tasks: redhat.yml | ||
when: ansible_os_family == "RedHat" | ||
- include_tasks: debian.yml | ||
when: ansible_os_family == "Debian" | ||
- include_tasks: sles.yml | ||
when: ansible_os_family == "Suse" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
- name: Install Rudder Server | ||
apt: | ||
name: rudder-server-root | ||
name: "{{ rudder_server_package_name }}" | ||
state: latest |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
- name: Install Rudder Server | ||
yum: | ||
name: rudder-server-root | ||
name: "{{ rudder_server_package_name }}" | ||
state: latest |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
- name: Install Rudder Server | ||
zypper: | ||
name: rudder-server-root | ||
name: "{{ rudder_server_package_name }}" | ||
state: latest |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
rudder_server_package_name: "rudder-server" | ||
rudder_relay_package_name: "rudder-relay" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
rudder_server_package_name: "rudder-server-root" | ||
rudder_relay_package_name: "rudder-server-relay" |