Skip to content

Commit

Permalink
Enable TLS Everywhere testing
Browse files Browse the repository at this point in the history
Depends-On: openstack-k8s-operators/install_yamls#756
Depends-On: openstack-k8s-operators/data-plane-adoption#331
Change-Id: Id40199097d46ba19b12b79577ace599c97674441
  • Loading branch information
xek committed May 9, 2024
1 parent 9d2ea22 commit 86ad3d7
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@
HOST_PRIMARY_RESOLV_CONF_ENTRY: "{{ standalone_gateway }}"
EDPM_COMPUTE_CEPH_ENABLED: "{{ use_ceph | default('true') }}"
EDPM_COMPUTE_CEPH_NOVA: "{{ use_ceph | default('true') }}"
DNS_DOMAIN: "{{ cloud_domain | default('localdomain') }}"
TLS_ENABLED: "{{ enable_tls | default('false') }}"
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
-e "standalone_ip={{ standalone_ip }}" -e "standalone_gateway={{ standalone_gateway }}"
-e "standalone_dns={{ standalone_dns | default(standalone_gateway) }}"
-e "use_ceph={{ use_ceph | default('true') }}"
-e "cloud_domain={{ cloud_domain | default('localdomain') }}"
-e "enable_tls={{ enable_tls | default('false') }}"
args:
chdir: "{{ framework_dir }}"

Expand Down Expand Up @@ -69,6 +71,18 @@
- "source_mariadb_ip"
- "source_ovndb_ip"

- name: Set EDPM node hostname in vars.yaml
ansible.builtin.lineinfile:
path: "{{ rdo_dir }}/vars.yaml"
regexp: "'^edpm_node_hostname:'"
value: "edpm_node_hostname: standalone.{{ cloud_domain | default('localdomain') }}"

- name: Set TLS Everywhere in vars.yaml
ansible.builtin.lineinfile:
path: "{{ rdo_dir }}/vars.yaml"
regexp: "'^enable_tlse:'"
value: "enable_tlse: {{ enable_tls | default('false') }}"

- name: Insert vars for data plane operator and os-net-config with zuul native standalone node
ansible.builtin.blockinfile:
marker_begin: "BEGIN os-net-config vars"
Expand Down Expand Up @@ -134,6 +148,12 @@
regexp: 'controller1_ssh:'
value: "controller1_ssh: ssh -i {{ standalone_private_key | default('/home/zuul/src/github.com/openstack-k8s-operators/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa') }} root@{{ standalone_ip }}"

- name: Set ipa_ssh var in secrets.yaml
ansible.builtin.lineinfile:
path: "{{ rdo_dir }}/secrets.yaml"
regexp: 'ipa_ssh:'
value: "ipa_ssh: ssh -i {{ standalone_private_key | default('/home/zuul/src/github.com/openstack-k8s-operators/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa') }} root@{{ standalone_ip }} podman exec -ti freeipa-server-container"

- name: Install required packages
become: true
ansible.builtin.package:
Expand Down
15 changes: 13 additions & 2 deletions playbooks/data_plane_adoption/deploy_tripleo_run_repo_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,18 @@
regexp: "'^edpm_node_ip:'"
value: "edpm_node_ip: {{ edpm_node_ip }}"

- name: Set EDPM node hostname in vars.yaml
ansible.builtin.lineinfile:
path: "{{ rdo_dir }}/vars.yaml"
regexp: "'^edpm_node_hostname:'"
value: "edpm_node_hostname: {{ compute_hostname['content'] | b64decode | trim }}.{{ cloud_domain | default('localdomain') }}"

- name: Set TLS Everywhere in vars.yaml
ansible.builtin.lineinfile:
path: "{{ rdo_dir }}/vars.yaml"
regexp: "'^enable_tlse:'"
value: "enable_tlse: {{ enable_tls | default('false') }}"

- name: Fetch compute hostname to set edpm_node_hostname var
delegate_to: "overcloud-novacompute-0"
ansible.builtin.slurp:
Expand All @@ -140,13 +152,12 @@
dataplane_public_iface: eth1
dataplane_os_net_config_set_route: false
os_cloud_name: overcloud
edpm_node_hostname: "{{ compute_hostname['content'] | b64decode | trim }}.localdomain"
edpm_user: zuul
standalone_ip: "{{ standalone_ip | default('192.168.122.100') }}"
neutron_physical_bridge_name: br-ex
edpm_nodes:
{{ compute_hostname['content'] | b64decode | trim }}:
hostName: "{{ compute_hostname['content'] | b64decode | trim }}.localdomain"
hostName: "{{ compute_hostname['content'] | b64decode | trim }}.{{ cloud_domain | default('localdomain') }}"
ansible:
ansibleHost: {{ edpm_node_ip }}
networks:
Expand Down
3 changes: 3 additions & 0 deletions playbooks/data_plane_adoption/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ heat_auth_encryption_key: CUSTOMIZE_THIS
manila_password: CUSTOMIZE_THIS
swift_password: CUSTOMIZE_THIS

# FreeIPA SSH connection strings for importing the CA certificate and key
ipa_ssh: "ssh -F ~/director_stanalone/vagrant_ssh_config vagrant@standalone podman exec -ti freeipa-server-container" # CUSTOMIZE THIS

# Controller SSH connection strings for the MariaDB copy procedure.
# Use ":" for controler 2 and 3 if you are testing with a single controller.
controller1_ssh: "ssh -F ~/director_stanalone/vagrant_ssh_config vagrant@standalone" # CUSTOMIZE THIS
Expand Down
7 changes: 7 additions & 0 deletions playbooks/data_plane_adoption/vars.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Path to install_yamls repo
install_yamls_path: /home/zuul/src/github.com/openstack-k8s-operators/install_yamls/

# This flag signifies if TLS Everywhere is enabled on the source cloud
enable_tlse: CUSTOMIZE_THIS

# To enable TLS-E, the standalone hostname must be set to standalone.ooo.test
edpm_node_hostname: CUSTOMIZE_THIS

# Whether to remove all the persistent data (databases, dumbs, ansible logs)
# before the test
reset_crc_storage: true
Expand Down
4 changes: 3 additions & 1 deletion zuul.d/_data_plane_adoption.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
name: data-plane-adoption-osp-17-to-extracted-crc-minimal-no-ceph
parent: data-plane-adoption-osp-17-to-extracted-crc
vars:
enable_tls: "true"
cloud_domain: "ooo.test"
use_ceph: "false"
dpa_test_suite: "test-minimal"

Expand Down Expand Up @@ -91,4 +93,4 @@
name: data-plane-adoption-osp17-multinode-to-extracted-crc-with-ceph
parent: data-plane-adoption-osp17-multinode-to-extracted-crc-no-ceph
vars:
use_ceph: 'true'
use_ceph: "true"

0 comments on commit 86ad3d7

Please sign in to comment.