Skip to content

Commit c84b103

Browse files
litian1992richm
authored andcommitted
refactor(trustee_server): rename the role to trustee_server
The present name 'trustee_attestation_server' is too long. The keyword attestation is not obviously reflected in the role. Signed-off-by: Li Tian <litian@redhat.com>
1 parent c38c086 commit c84b103

33 files changed

Lines changed: 122 additions & 135 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_attestation_server
24+
- linux-system-roles.trustee_server
2525
supported_ansible_also:
2626
- "2.14.0"

.github/workflows/tft.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
tf_scope: private
182182
api_key: ${{ secrets.TF_API_KEY_RH }}
183183
update_pull_request_status: false
184-
tmt_plan_filter: "tag:playbooks_parallel,trustee_attestation_server"
184+
tmt_plan_filter: "tag:playbooks_parallel,trustee_server"
185185

186186
- name: Set final commit status
187187
uses: myrotvorets/set-commit-status-action@master

README.md

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

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)
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)
44

5-
![trustee_attestation_server](https://github.com/linux-system-roles/trustee_attestation_server/workflows/tox/badge.svg)
5+
![trustee_server](https://github.com/linux-system-roles/trustee_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,11 +28,11 @@ ansible-galaxy collection install -r meta/collection-requirements.yml
2828
- name: Deploy Trustee Server
2929
hosts: all
3030
vars:
31-
trustee_attestation_server_trustee: true
32-
trustee_attestation_server_secret_registration_enabled: true
33-
trustee_attestation_server_secret_registration_listen_port: 8081
31+
trustee_server_trustee: true
32+
trustee_server_secret_registration_enabled: true
33+
trustee_server_secret_registration_listen_port: 8081
3434
roles:
35-
- linux-system-roles.trustee_attestation_server
35+
- linux-system-roles.trustee_server
3636
```
3737
3838
More examples are in the [`examples/`](examples) directory.
@@ -65,5 +65,4 @@ MIT
6565

6666
## Author
6767

68-
An optional section for the role authors to include contact information, or a
69-
website (HTML is not allowed).
68+
Li Tian <litian@redhat.com>

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_attestation_server Linux System Role
1+
# Contributing to the trustee_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_attestation_server/issues).
15+
[Github Issues](https://github.com/linux-system-roles/trustee_server/issues).
1616
Issues labeled with
17-
[**help wanted**](https://github.com/linux-system-roles/trustee_attestation_server/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
17+
[**help wanted**](https://github.com/linux-system-roles/trustee_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_attestation_server), using
20+
**Code** is managed on [Github](https://github.com/linux-system-roles/trustee_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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Here is the right place to put the role's input variables.
44
# This file also serves as a documentation for such a variables.
55

6-
trustee_attestation_server_trustee: true
6+
trustee_server_trustee: true
77
# Secret registration server service configuration
8-
trustee_attestation_server_secret_registration_enabled: false
9-
trustee_attestation_server_secret_registration_listen_port: 8081
8+
trustee_server_secret_registration_enabled: false
9+
trustee_server_secret_registration_listen_port: 8081

examples/simple.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: Deploy Trustee Server Components using Podman Quadlets from GitHub repository
44
hosts: all
55
vars:
6-
trustee_attestation_server_trustee: true
7-
trustee_attestation_server_secret_registration_enabled: false
6+
trustee_server_trustee: true
7+
trustee_server_secret_registration_enabled: false
88
roles:
9-
- linux-system-roles.trustee_attestation_server
9+
- linux-system-roles.trustee_server

handlers/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
name: "{{ item }}"
1111
enabled: true
1212
state: restarted
13-
loop: "{{ __trustee_attestation_server_services | default([]) }}"
13+
loop: "{{ __trustee_server_services | default([]) }}"
1414
listen: "restart trustee 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_attestation_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_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_attestation_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_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_attestation_server" \
50+
--git-url "https://github.com/<my_user>/trustee_server" \
5151
--git-ref "<my_branch>" \
5252
--compose CentOS-Stream-9 \
5353
-e "SYSTEM_ROLES_ONLY_TESTS=tests_default.yml" \

plans/test_playbooks_parallel.fmf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ provision:
1010
environment:
1111
# ensure versions are strings!
1212
SR_ANSIBLE_VER: "2.17"
13-
SR_REPO_NAME: trustee_attestation_server
13+
SR_REPO_NAME: trustee_server
1414
SR_PYTHON_VERSION: "3.12"
1515
SR_ONLY_TESTS: "" # tests_default.yml
1616
SR_TEST_LOCAL_CHANGES: true

tasks/main.yml

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

1111
- name: Deploy Secret Registration Server Service
1212
include_tasks: secret_registration_server.yml
1313
when:
14-
- trustee_attestation_server_secret_registration_enabled | bool
15-
- trustee_attestation_server_trustee | bool
14+
- trustee_server_secret_registration_enabled | bool
15+
- trustee_server_trustee | bool

0 commit comments

Comments
 (0)