Skip to content

Commit 5ccb185

Browse files
committed
revert
1 parent 371aa0e commit 5ccb185

File tree

1 file changed

+41
-41
lines changed

1 file changed

+41
-41
lines changed

source/vars.rst

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
.. |alertmanager_url| replace:: https://cloud-stage.s3it.uzh.ch:9093
2-
.. |base_path| replace:: ~/deployment/
1+
.. |alertmanager_url| replace:: https://openstack.acme.example:9093
2+
.. |base_path| replace:: ~/kayobe-env
33
.. |bmc| replace:: BMC
4-
.. |chat_system| replace:: Rocket Chat
4+
.. |chat_system| replace:: Slack
55
.. |control_host_access| replace:: |control_host| is used as the Ansible control host. Each operator uses their own account on this host, but with a shared SSH key stored as ``~/.ssh/id_rsa``.
6-
.. |control_host| replace:: controller0
7-
.. |controller0_hostname| replace:: ``os-controller-1``
8-
.. |controller1_hostname| replace:: ``os-controller-2``
9-
.. |controller2_hostname| replace:: ``os-controller-3``
6+
.. |control_host| replace:: acme-seed-hypervisor
7+
.. |controller0_hostname| replace:: ``ctrl0``
8+
.. |controller1_hostname| replace:: ``ctrl1``
9+
.. |controller2_hostname| replace:: ``ctr2``
1010
.. |file_share_location| replace:: Google Drive
11-
.. |flavor_name| replace:: tiny
11+
.. |flavor_name| replace:: m1.tiny
1212
.. |floating_ip_access| replace:: from acme-seed-hypervisor and the rest of the Acme network
13-
.. |grafana_url| replace:: https://cloud-stage.s3it.uzh.ch:3000
13+
.. |grafana_url| replace:: https://openstack.acme.example:3000
1414
.. |grafana_username| replace:: ``grafana_local_admin``
1515
.. |horizon_access| replace:: via the Internet.
1616
.. |horizon_theme_clone_url| replace:: https://github.com/acme-openstack/horizon-theme.git
17-
.. |horizon_theme_name| replace:: Default
18-
.. |horizon_url| replace:: https://cloud-stage.s3it.uzh.ch
19-
.. |hypervisor_hostname| replace:: ``controller0``
17+
.. |horizon_theme_name| replace:: acme
18+
.. |horizon_url| replace:: https://openstack.acme.example
19+
.. |hypervisor_hostname| replace:: ``comp0``
2020
.. |hypervisor_type| replace:: KVM
2121
.. |ipmi_username| replace:: admin
22-
.. |kayobe_config_source_url| replace:: https://gitlab.int/science-it/cloud/kayobe-config
23-
.. |kayobe_config_source_version| replace:: ``uzh/yoga``
22+
.. |kayobe_config_source_url| replace:: https://github.com/acme-openstack/kayobe-config.git
23+
.. |kayobe_config_source_version| replace:: ``acme/train``
2424
.. |kayobe_config| replace:: kayobe-config
25-
.. |kayobe_source_url| replace:: https://github.com/stackhpc/kayobe
26-
.. |kayobe_source_version| replace:: ``stable/yoga``
27-
.. |keystone_public_url| replace:: https://cloud-stage.s3it.uzh.ch:5000/
28-
.. |kibana_url| replace:: https://cloud-stage.s3it.uzh.ch:5601/
29-
.. |kolla_passwords| replace:: https://gitlab.int/science-it/cloud/kayobe-config/-/blob/uzh/yoga/etc/kayobe/environments/staging/kolla/passwords.yml
30-
.. |monitoring_host| replace:: ``os-monitor-1``
31-
.. |network_name| replace:: provision_oc_net
32-
.. |nova_rbd_pool| replace:: vms
33-
.. |project_config_source_url| replace:: https://gitlab.int/science-it/cloud/openstack-config
34-
.. |project_config| replace:: openstack-config
35-
.. |project_name| replace:: openstack-config
36-
.. |provisioning_net_cidr| replace:: 10.129.64.0/20
25+
.. |kayobe_source_url| replace:: https://github.com/acme-openstack/kayobe.git
26+
.. |kayobe_source_version| replace:: ``acme/train``
27+
.. |keystone_public_url| replace:: https://openstack.acme.example:5000
28+
.. |kibana_url| replace:: https://openstack.acme.example:5601
29+
.. |kolla_passwords| replace:: https://github.com/acme-openstack/kayobe-config/blob/acme/train/etc/kayobe/kolla/passwords.yml
30+
.. |monitoring_host| replace:: ``mon0``
31+
.. |network_name| replace:: admin-vxlan
32+
.. |nova_rbd_pool| replace:: acme-vms
33+
.. |project_config_source_url| replace:: https://github.com/acme-openstack/acme-config.git
34+
.. |project_config| replace:: acme-config
35+
.. |project_name| replace:: Acme
36+
.. |provisioning_net_cidr| replace:: 192.168.0.0/24
3737
.. |public_api_access_host| replace:: |control_host|
38-
.. |public_endpoint_fqdn| replace:: cloud-stage.s3it.uzh.ch
39-
.. |public_network| replace:: external_internet
40-
.. |public_subnet| replace:: 130.60.9.0/24
41-
.. |public_vip| replace:: 130.60.9.249
42-
.. |reference_architecture_url| replace:: https://docs.google.com/document/d/1dwzE0Y2tC0G1fEZK6drqjyE_AhXrq8LxIjD5wFwuTeo
43-
.. |seed_ip| replace:: 10.129.120.12
44-
.. |seed_name| replace:: seed0
38+
.. |public_endpoint_fqdn| replace:: openstack.acme.example
39+
.. |public_network| replace:: public
40+
.. |public_subnet| replace:: 10.0.0.0/8
41+
.. |public_vip| replace:: 10.0.0.1
42+
.. |reference_architecture_url| replace:: https://docs.google.com/document/u/0/?tgif=d
43+
.. |seed_ip| replace:: 192.168.0.2
44+
.. |seed_name| replace:: acme-seed
4545
.. |seed_type| replace:: virtual machine
4646
.. |seed_user| replace:: stack
47-
.. |support_email| replace:: TBD
48-
.. |support_level| replace:: TBD
49-
.. |tempest_recipes| replace:: TBD
50-
.. |tls_setup| replace:: TLS is implemented using a wildcard certificate available for ``https://cloud-stage.s3it.uzh.ch``.
51-
.. |vault_password_file_path| replace:: ~/vault.pass
52-
.. |wazuh_manager_url| replace:: https://TBD:5601
53-
.. |wazuh_manager_ip| replace:: TBD:5601
54-
.. |wazuh_manager_name| replace:: TBD
47+
.. |support_email| replace:: [email protected]
48+
.. |support_level| replace:: standard support
49+
.. |tempest_recipes| replace:: https://github.com/acme-openstack/tempest-recipes.git
50+
.. |tls_setup| replace:: TLS is implemented using a wildcard certificate available for ``*.acme.example``.
51+
.. |vault_password_file_path| replace:: ~/vault-password
52+
.. |wazuh_manager_url| replace:: https://172.168.0.10:5601
53+
.. |wazuh_manager_ip| replace:: 172.168.0.10:5601
54+
.. |wazuh_manager_name| replace:: wazuh-manager01

0 commit comments

Comments
 (0)