Skip to content

Commit 262d73c

Browse files
committed
fix(naming): change the role name from trustee_server to trustee_attestation_server
Name change as titled. Signed-off-by: Li Tian <litian@redhat.com>
1 parent cc9d88e commit 262d73c

24 files changed

Lines changed: 100 additions & 100 deletions

.ansible-lint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ exclude_paths:
2121
- .markdownlint.yaml
2222
- examples/roles/
2323
mock_roles:
24-
- linux-system-roles.trustee_server
24+
- linux-system-roles.trustee_attestation_server
2525
supported_ansible_also:
2626
- "2.14.0"

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# trustee_server
1+
# trustee_attestation_server
22

3-
[![ansible-lint.yml](https://github.com/linux-system-roles/trustee_server/actions/workflows/ansible-lint.yml/badge.svg)](https://github.com/linux-system-roles/trustee_server/actions/workflows/ansible-lint.yml) [![ansible-test.yml](https://github.com/linux-system-roles/trustee_server/actions/workflows/ansible-test.yml/badge.svg)](https://github.com/linux-system-roles/trustee_server/actions/workflows/ansible-test.yml) [![codespell.yml](https://github.com/linux-system-roles/trustee_server/actions/workflows/codespell.yml/badge.svg)](https://github.com/linux-system-roles/trustee_server/actions/workflows/codespell.yml) [![markdownlint.yml](https://github.com/linux-system-roles/trustee_server/actions/workflows/markdownlint.yml/badge.svg)](https://github.com/linux-system-roles/trustee_server/actions/workflows/markdownlint.yml) [![qemu-kvm-integration-tests.yml](https://github.com/linux-system-roles/trustee_server/actions/workflows/qemu-kvm-integration-tests.yml/badge.svg)](https://github.com/linux-system-roles/trustee_server/actions/workflows/qemu-kvm-integration-tests.yml) [![shellcheck.yml](https://github.com/linux-system-roles/trustee_server/actions/workflows/shellcheck.yml/badge.svg)](https://github.com/linux-system-roles/trustee_server/actions/workflows/shellcheck.yml) [![tft.yml](https://github.com/linux-system-roles/trustee_server/actions/workflows/tft.yml/badge.svg)](https://github.com/linux-system-roles/trustee_server/actions/workflows/tft.yml) [![tft_citest_bad.yml](https://github.com/linux-system-roles/trustee_server/actions/workflows/tft_citest_bad.yml/badge.svg)](https://github.com/linux-system-roles/trustee_server/actions/workflows/tft_citest_bad.yml) [![woke.yml](https://github.com/linux-system-roles/trustee_server/actions/workflows/woke.yml/badge.svg)](https://github.com/linux-system-roles/trustee_server/actions/workflows/woke.yml)
3+
[![ansible-lint.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/ansible-lint.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/ansible-lint.yml) [![ansible-test.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/ansible-test.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/ansible-test.yml) [![codespell.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/codespell.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/codespell.yml) [![markdownlint.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/markdownlint.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/markdownlint.yml) [![qemu-kvm-integration-tests.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/qemu-kvm-integration-tests.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/qemu-kvm-integration-tests.yml) [![shellcheck.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/shellcheck.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/shellcheck.yml) [![tft.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/tft.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/tft.yml) [![tft_citest_bad.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/tft_citest_bad.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/tft_citest_bad.yml) [![woke.yml](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/woke.yml/badge.svg)](https://github.com/linux-system-roles/trustee_attestation_server/actions/workflows/woke.yml)
44

5-
![trustee_server](https://github.com/linux-system-roles/trustee_server/workflows/tox/badge.svg)
5+
![trustee_attestation_server](https://github.com/linux-system-roles/trustee_attestation_server/workflows/tox/badge.svg)
66

77
An Ansible role that deploys [Trustee](https://confidentialcontainers.org/docs/attestation/) server components for confidential computing. Trustee provides attestation and secret delivery services (KBS, AS, RVPS) for workloads running in Trusted Execution Environments (TEEs).
88

@@ -28,15 +28,15 @@ ansible-galaxy collection install -r meta/collection-requirements.yml
2828
- name: Deploy Trustee Server
2929
hosts: all
3030
vars:
31-
trustee_server_trustee: true
32-
trustee_server_quadlet_repo_url: "https://github.com/litian1992/trustee-quadlet-rhel.git"
33-
trustee_server_quadlet_repo_path: "quadlet"
34-
trustee_server_quadlet_repo_branch: "main"
35-
trustee_server_quadlet_install_dir: "/etc/containers/systemd"
36-
trustee_server_secret_registration_server_enabled: true
37-
trustee_server_secret_registration_listen_port: 8081
31+
trustee_attestation_server_trustee: true
32+
trustee_attestation_server_quadlet_repo_url: "https://github.com/litian1992/trustee-quadlet-rhel.git"
33+
trustee_attestation_server_quadlet_repo_path: "quadlet"
34+
trustee_attestation_server_quadlet_repo_branch: "main"
35+
trustee_attestation_server_quadlet_install_dir: "/etc/containers/systemd"
36+
trustee_attestation_server_secret_registration_server_enabled: true
37+
trustee_attestation_server_secret_registration_listen_port: 8081
3838
roles:
39-
- linux-system-roles.trustee_server
39+
- linux-system-roles.trustee_attestation_server
4040
```
4141
4242
More examples are in the [`examples/`](examples) directory.

contributing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Contributing to the trustee_server Linux System Role
1+
# Contributing to the trustee_attestation_server Linux System Role
22

33
## Where to start
44

@@ -12,12 +12,12 @@ This has all of the common information that all role developers need:
1212
* How to create git commits and submit pull requests
1313

1414
**Bugs and needed implementations** are listed on
15-
[Github Issues](https://github.com/linux-system-roles/trustee_server/issues).
15+
[Github Issues](https://github.com/linux-system-roles/trustee_attestation_server/issues).
1616
Issues labeled with
17-
[**help wanted**](https://github.com/linux-system-roles/trustee_server/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
17+
[**help wanted**](https://github.com/linux-system-roles/trustee_attestation_server/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
1818
are likely to be suitable for new contributors!
1919

20-
**Code** is managed on [Github](https://github.com/linux-system-roles/trustee_server), using
20+
**Code** is managed on [Github](https://github.com/linux-system-roles/trustee_attestation_server), using
2121
[Pull Requests](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests).
2222

2323
## Running CI Tests Locally

defaults/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
# This file also serves as a documentation for such a variables.
55

66
# Trustee Server Components Quadlet repository configuration
7-
trustee_server_trustee: true
8-
trustee_server_quadlet_repo_url: "https://github.com/litian1992/trustee-quadlet-rhel.git"
9-
trustee_server_quadlet_repo_path: "quadlet"
10-
trustee_server_quadlet_repo_branch: "main"
11-
trustee_server_quadlet_install_dir: "/etc/containers/systemd"
7+
trustee_attestation_server_trustee: true
8+
trustee_attestation_server_quadlet_repo_url: "https://github.com/litian1992/trustee-quadlet-rhel.git"
9+
trustee_attestation_server_quadlet_repo_path: "quadlet"
10+
trustee_attestation_server_quadlet_repo_branch: "main"
11+
trustee_attestation_server_quadlet_install_dir: "/etc/containers/systemd"
1212

1313
# Secret registration server service configuration
14-
trustee_server_secret_registration_server_enabled: false
15-
trustee_server_secret_registration_listen_port: 8081
14+
trustee_attestation_server_secret_registration_server_enabled: false
15+
trustee_attestation_server_secret_registration_listen_port: 8081

examples/simple.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
- name: Deploy Trustee Server Components using Podman Quadlets from GitHub repository
44
hosts: all
55
vars:
6-
trustee_server_trustee: true
7-
trustee_server_quadlet_repo_url: "https://github.com/litian1992/trustee-quadlet-rhel.git"
8-
trustee_server_quadlet_repo_path: "quadlet"
9-
trustee_server_quadlet_repo_branch: "main"
10-
trustee_server_quadlet_install_dir: "/etc/containers/systemd"
11-
trustee_server_secret_registration_server_enabled: false
6+
trustee_attestation_server_trustee: true
7+
trustee_attestation_server_quadlet_repo_url: "https://github.com/litian1992/trustee-quadlet-rhel.git"
8+
trustee_attestation_server_quadlet_repo_path: "quadlet"
9+
trustee_attestation_server_quadlet_repo_branch: "main"
10+
trustee_attestation_server_quadlet_install_dir: "/etc/containers/systemd"
11+
trustee_attestation_server_secret_registration_server_enabled: false
1212
roles:
1313
- linux-system-roles.trustee-server

handlers/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: MIT
22
---
3-
- name: Handler for trustee_server to restart services
3+
- name: Handler for trustee_attestation_server to restart services
44
service:
55
name: "{{ item }}"
66
state: restarted
7-
loop: "{{ __trustee_server_services }}"
7+
loop: "{{ __trustee_attestation_server_services }}"

plans/README-plans.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Introduction CI Testing Plans
22

3-
Linux System Roles CI runs [tmt](https://tmt.readthedocs.io/en/stable/index.html) test plans in [Testing farm](https://docs.testing-farm.io/Testing%20Farm/0.1/index.html) with the [tft.yml](https://github.com/linux-system-roles/trustee_server/blob/main/.github/workflows/tft.yml) GitHub workflow.
3+
Linux System Roles CI runs [tmt](https://tmt.readthedocs.io/en/stable/index.html) test plans in [Testing farm](https://docs.testing-farm.io/Testing%20Farm/0.1/index.html) with the [tft.yml](https://github.com/linux-system-roles/trustee_attestation_server/blob/main/.github/workflows/tft.yml) GitHub workflow.
44

55
The `plans/test_playbooks_parallel.fmf` plan is a test plan that runs test playbooks in parallel on multiple managed nodes.
66
`plans/test_playbooks_parallel.fmf` is generated centrally from `https://github.com/linux-system-roles/.github/`.
@@ -16,7 +16,7 @@ The `plans/test_playbooks_parallel.fmf` plan does the following steps:
1616
2. Does the required preparation on systems.
1717
3. For the given role and the given PR, runs the general test from [test.sh](https://github.com/linux-system-roles/tft-tests/blob/main/tests/general/test.sh).
1818

19-
The [tft.yml](https://github.com/linux-system-roles/trustee_server/blob/main/.github/workflows/tft.yml) workflow runs the above plan and uploads the results to our Fedora storage for public access.
19+
The [tft.yml](https://github.com/linux-system-roles/trustee_attestation_server/blob/main/.github/workflows/tft.yml) workflow runs the above plan and uploads the results to our Fedora storage for public access.
2020
This workflow uses Testing Farm's Github Action [Schedule tests on Testing Farm](https://github.com/marketplace/actions/schedule-tests-on-testing-farm).
2121

2222
## Running Tests
@@ -47,7 +47,7 @@ You can run tests locally with the `tmt try` cli or remotely in Testing Farm.
4747
$ TESTING_FARM_API_TOKEN=<your_api_token> \
4848
testing-farm request --pipeline-type="tmt-multihost" \
4949
--plan-filter="tag:playbooks_parallel" \
50-
--git-url "https://github.com/<my_user>/trustee_server" \
50+
--git-url "https://github.com/<my_user>/trustee_attestation_server" \
5151
--git-ref "<my_branch>" \
5252
--compose CentOS-Stream-9 \
5353
-e "SYSTEM_ROLES_ONLY_TESTS=tests_default.yml" \

tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
# Examples of some tasks:
77
- name: Deploy Trustee Server Components using Podman Quadlets
88
include_tasks: trustee_quadlet.yml
9-
when: trustee_server_trustee | bool
9+
when: trustee_attestation_server_trustee | bool
1010

1111
- name: Deploy Secret Registration Server Service
1212
include_tasks: secret_registration_server.yml
13-
when: trustee_server_secret_registration_server_enabled | bool and trustee_server_trustee | bool
13+
when: trustee_attestation_server_secret_registration_server_enabled | bool and trustee_attestation_server_trustee | bool

tasks/secret_registration_server.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
- name: Ensure secret registration server dependencies are installed
88
ansible.builtin.package:
9-
name: "{{ __trustee_server_secret_registration_packages }}"
9+
name: "{{ __trustee_attestation_server_secret_registration_packages }}"
1010
state: present
11-
use: "{{ (__trustee_server_is_ostree | d(false)) |
11+
use: "{{ (__trustee_attestation_server_is_ostree | d(false)) |
1212
ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
1313

1414
- name: Deploy secret registration server script
@@ -28,7 +28,7 @@
2828

2929
- name: Allow secret registration server port in firewall
3030
ansible.posix.firewalld:
31-
port: "{{ trustee_server_secret_registration_listen_port }}/tcp"
31+
port: "{{ trustee_attestation_server_secret_registration_listen_port }}/tcp"
3232
permanent: true
3333
immediate: true
3434
state: enabled

tasks/set_vars.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
- name: Ensure ansible_facts used by role
33
setup:
4-
gather_subset: "{{ __trustee_server_required_facts_subsets }}"
5-
when: __trustee_server_required_facts |
4+
gather_subset: "{{ __trustee_attestation_server_required_facts_subsets }}"
5+
when: __trustee_attestation_server_required_facts |
66
difference(ansible_facts.keys() | list) | length > 0
77

88
- name: Determine if system is ostree and set flag
9-
when: not __trustee_server_is_ostree is defined
9+
when: not __trustee_attestation_server_is_ostree is defined
1010
block:
1111
- name: Check if system is ostree
1212
stat:
@@ -15,7 +15,7 @@
1515

1616
- name: Set flag to indicate system is ostree
1717
set_fact:
18-
__trustee_server_is_ostree: "{{ __ostree_booted_stat.stat.exists }}"
18+
__trustee_attestation_server_is_ostree: "{{ __ostree_booted_stat.stat.exists }}"
1919

2020
- name: Set platform/version specific variables
2121
include_vars: "{{ __vars_file }}"

0 commit comments

Comments
 (0)