@@ -68,14 +68,14 @@ The OSISM Testbed requires at least the following project quota when using the d
68
68
69
69
| Quantity | Resource | Note |
70
70
| :---------| :---------------------| :----------------------------------------------|
71
- | 4 | Instances | 28 VCPUs + 112 GByte RAM (3 modes , 1 manager) |
71
+ | 4 | Instances | 28 VCPUs + 112 GByte RAM (3 nodes , 1 manager) |
72
72
| 9 | Volumes | 90 GByte volume storage |
73
73
| 1 | Floating IP | |
74
74
| 1 | Keypair | |
75
- | 3 | Security group | |
75
+ | 3 | Security groups | |
76
76
| 16 | Security group rules | |
77
77
| 1 | Network | |
78
- | 1 | Subetwork | |
78
+ | 1 | Subnet | |
79
79
| 6 | Ports | |
80
80
| 1 | Router | |
81
81
@@ -117,7 +117,7 @@ This section describes step by step how to deploy the OSISM Testbed.
117
117
definition in ` terraform/clouds.yaml ` .
118
118
119
119
The user specific settings of the ` clouds.yaml ` file are provided by the cloud provider. Please check the
120
- documentation of the cloud provider you are using or their support for details.
120
+ documentation of the cloud provider you are using or their support for details.
121
121
122
122
[ REGIO.cloud] ( https://regio.digital ) is used as an example here. The cloud name in ` clouds.yaml `
123
123
and the environment name (value of ` ENVIRONMENT ` ) are ` regiocloud ` in this case. It is important that
@@ -226,7 +226,7 @@ This section describes step by step how to deploy the OSISM Testbed.
226
226
make ENVIRONMENT=regiocloud login
227
227
` ` `
228
228
229
- Yo can log in to the nodes of the cluster via the manager.
229
+ You can log in to the nodes of the cluster via the manager.
230
230
231
231
` ` ` bash
232
232
osism console testbed-node-0
@@ -461,17 +461,19 @@ The expiration time of the Single Sign On tokens can be controlled on multiple l
461
461
462
462
# ### Usage of the OpenStack CLI
463
463
464
- The `environments/openstack` folder contains the needed files for the openstack client :
464
+ The `environments/openstack` folder contains the files needed for the ` openstack` client :
465
465
466
466
` ` ` bash
467
467
cd environments/openstack
468
468
export OS_CLOUD=<the cloud environment> # i.e. admin
469
469
openstack floating ip list
470
470
` ` `
471
471
472
+ * TODO: fill this with some useful stuff to make the reference below worthwhile
473
+
472
474
# ### OpenStack CLI operations with OpenID Connect password
473
475
474
- Using the OpenStack cli is also possible via OIDC, assuming you provisioned the user **alice** with password **password**,
476
+ Using the OpenStack CLI is also possible via OIDC, assuming you provisioned the user **alice** with password **password**,
475
477
then you can perform a simple `project list` operation like this :
476
478
477
479
See chapter "Usage the OpenStack CLI" for basic openstack usage.
@@ -494,10 +496,10 @@ project list
494
496
495
497
# ### OpenStack CLI token issue with OpenID Connect
496
498
497
- It is also possible to exchange your username/password to a token, for further use with the cli .
499
+ It is also possible to exchange your username/password to a token, for further use with the CLI .
498
500
The `token issue` subcommand returns an SQL table, in which the `id` column's `value` field contains the token :
499
501
500
- See chapter "Usage the OpenStack CLI" for basic openstack usage.
502
+ See chapter "Usage of the OpenStack CLI" for basic openstack usage.
501
503
502
504
` ` ` bash
503
505
openstack \
@@ -541,7 +543,7 @@ OpenStack dashboard via the public IP address of the manager, the following chan
541
543
of the other cloud is changed accordingly.
542
544
543
545
1. Add the customisation `external_api`. This customisation makes sure that the required security group rules
544
- are created for the various OpenStack APIs and the OpenStack dashboard.
546
+ are created to allow access to the various OpenStack APIs and the OpenStack dashboard.
545
547
546
548
```
547
549
# customisation:external_api
@@ -766,7 +768,7 @@ export LC_ALL=en_US.UTF-8
766
768
To find out the locale used on the system ` printenv ` can be used.
767
769
768
770
` ` ` bash
769
- $ printenv | grep - i lang | locale
771
+ $ printenv | egrep - i ' lang|lc_ '
770
772
LANG = " en_US.UTF-8"
771
773
LC_COLLATE = " en_US.UTF-8"
772
774
LC_CTYPE = " UTF-8"
@@ -787,6 +789,8 @@ This section describes how to configure and customise the OSISM Testbed.
787
789
788
790
The defaults for the OpenTofu variables are intended for [REGIO.cloud](https://regio.digital).
789
791
792
+ * TODO: Ubuntu 24.04 supported? default?
793
+
790
794
| Variable | Default | Note |
791
795
|:--------------------------|:-------------------------|:-----------------------------------------|
792
796
| availability_zone | ` nova ` | |
@@ -853,19 +857,22 @@ The following stable Ceph and OpenStack releases are supported.
853
857
854
858
The deployment of Ceph is based on [ceph-ansible](https://docs.ceph.com/ceph-ansible/).
855
859
860
+ * TODO: check current default
856
861
* Ceph Quincy (**default**)
857
862
* Ceph Reef
858
863
* Ceph Squid
859
864
860
865
The deployment of OpenStack is based on [kolla-ansible](https://docs.openstack.org/kolla-ansible/latest/).
861
866
862
- * OpenStack 2023.1
863
867
* OpenStack 2023.2
864
868
* OpenStack 2024.1 (**default**)
869
+ * OpenStack 2024.2
870
+ * TODO: check current default
865
871
866
872
The deployment of Kubernetes is based on [k3s-ansible](https://github.com/techno-tim/k3s-ansible).
867
873
868
874
* Kubernetes v1.30 (**default**)
875
+ * TODO: check current default
869
876
870
877
### Included services
871
878
0 commit comments