Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ansible.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[defaults]
inject_facts_as_vars = True

[ssh_connection]
pipelining = true
2 changes: 1 addition & 1 deletion playbooks/install_stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@
- rhsm_ephemeral
block:
- name: Unregister Red Hat Subscription Manager
ansible.builtin.import_role:
ansible.builtin.include_role:
name: redhat-subscription
tasks_from: unregister.yml

Expand Down
10 changes: 5 additions & 5 deletions playbooks/network.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
when:
- dpdk_interface is not defined
ansible.builtin.set_fact:
nmstate_ifs: |
nmstate_ifs:
- name: dummy0
type: dummy
state: up
Expand All @@ -55,15 +55,15 @@
when:
- dpdk_interface is defined
ansible.builtin.set_fact:
nmstate_ifs: |
nmstate_ifs:
- name: dummy0
type: dummy
state: up
ipv4:
enabled: true
address:
- ip: {{ local_ip }}
prefix-length: {{ control_plane_prefix | int }}
- ip: "{{ local_ip }}"
prefix-length: "{{ control_plane_prefix | int }}"
ipv6:
enabled: false

Expand Down Expand Up @@ -96,7 +96,7 @@
# * We need it for installation
- name: Remove all physical nics from NM control except the public interface
ansible.builtin.set_fact:
nmstate_ifs: "{{ nmstate_ifs | from_yaml + [{'name': item} | combine(removed)] }}"
nmstate_ifs: "{{ nmstate_ifs + [{'name': item} | combine(removed)] }}"
loop: "{{ physical_nics | difference(primary_nic) }}"
vars:
primary_nic: "{{ [network_info.public_ipv4.interface] }}"
Expand Down
4 changes: 0 additions & 4 deletions playbooks/prepare_host.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@
dnf -y swap centos-linux-repos centos-stream-repos
dnf -y distro-sync
fi
args:
warn: false
register: stream_output
changed_when: (stream_output.stdout_lines | length) > 1

Expand All @@ -118,8 +116,6 @@
ansible.builtin.shell: |
dnf module disable -y container-tools:rhel8
dnf module enable -y container-tools:3.0
args:
warn: false

# This fixes a bogus resolv.conf entry in the CentOS cloud image. The CentOS
# cloud image disables this in /etc/NetworkManager/conf.d/99-cloud-init.conf
Expand All @@ -130,7 +126,7 @@
when:
- ansible_facts.distribution == 'CentOS'
block:
- name: Set main/dns=default in NetworkManager

Check warning on line 129 in playbooks/prepare_host.yaml

View workflow job for this annotation

GitHub Actions / build

args[module]

Unsupported parameters for (basic.py) module: mode, option, path, section, value. Supported parameters include: .
community.general.ini_file:
path: /etc/NetworkManager/conf.d/99-cloud-init.conf
section: main
Expand Down Expand Up @@ -201,16 +197,16 @@
ansible.builtin.package:
name: lvm2
state: present
- name: Create VG for local ephemeral storage

Check warning on line 200 in playbooks/prepare_host.yaml

View workflow job for this annotation

GitHub Actions / build

args[module]

Unsupported parameters for (basic.py) module: pvs, vg. Supported parameters include: .
community.general.lvg:
vg: vg_nova
pvs: "{{ ephemeral_storage_devices | join(',') }}"
- name: Create LV for local ephemeral storage

Check warning on line 204 in playbooks/prepare_host.yaml

View workflow job for this annotation

GitHub Actions / build

args[module]

Unsupported parameters for (basic.py) module: lv, size, vg. Supported parameters include: .
community.general.lvol:
vg: vg_nova
lv: data
size: 100%VG
- name: Create XFS filesystem for local ephemeral storage

Check warning on line 209 in playbooks/prepare_host.yaml

View workflow job for this annotation

GitHub Actions / build

args[module]

Unsupported parameters for (basic.py) module: dev, fstype. Supported parameters include: .
community.general.filesystem:
fstype: xfs
dev: /dev/vg_nova/data
Expand Down Expand Up @@ -263,16 +259,16 @@
enabled: true
state: "{{ create_losetup_service.changed | ternary('restarted', 'started') }}"
daemon_reload: "{{ create_losetup_service.changed }}"
- name: Create volume group for ceph

Check warning on line 262 in playbooks/prepare_host.yaml

View workflow job for this annotation

GitHub Actions / build

args[module]

Unsupported parameters for (basic.py) module: pvs, vg. Supported parameters include: .
community.general.lvg:
vg: vg_ceph
pvs: /dev/loop1
- name: Create ceph data LV

Check warning on line 266 in playbooks/prepare_host.yaml

View workflow job for this annotation

GitHub Actions / build

args[module]

Unsupported parameters for (basic.py) module: lv, size, vg. Supported parameters include: .
community.general.lvol:
vg: vg_ceph
lv: data
size: 96%VG
- name: Create ceph db LV

Check warning on line 271 in playbooks/prepare_host.yaml

View workflow job for this annotation

GitHub Actions / build

args[module]

Unsupported parameters for (basic.py) module: lv, size, vg. Supported parameters include: .
community.general.lvol:
vg: vg_ceph
lv: db
Expand All @@ -296,11 +292,11 @@
ansible.builtin.package:
name: lvm2
state: present
- name: Create VG for ceph devices

Check warning on line 295 in playbooks/prepare_host.yaml

View workflow job for this annotation

GitHub Actions / build

args[module]

Unsupported parameters for (basic.py) module: pvs, vg. Supported parameters include: .
community.general.lvg:
vg: vg_ceph
pvs: "{{ ceph_devices | join(',') }}"
- name: Create LV for ceph devices

Check warning on line 299 in playbooks/prepare_host.yaml

View workflow job for this annotation

GitHub Actions / build

args[module]

Unsupported parameters for (basic.py) module: lv, size, vg. Supported parameters include: .
community.general.lvol:
vg: vg_ceph
lv: data
Expand Down
4 changes: 2 additions & 2 deletions playbooks/roles/ceph/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
interface: br-ctlplane
dummy_ip_cidr: "{{ mon_ip ~ '/' ~ control_plane_prefix | string }}"
dummy_vip: "{{ control_plane_ip }}"
start: "{{ control_plane_cidr | nthhost(4) }}"
end: "{{ control_plane_cidr | nthhost(250) }}"
start: "{{ control_plane_cidr | ansible.utils.nthhost(4) }}"
end: "{{ control_plane_cidr | ansible.utils.nthhost(250) }}"

- name: Create OSD spec file
ansible.builtin.copy:
Expand Down
22 changes: 11 additions & 11 deletions playbooks/vars/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ openshift_password: password
# You probably won't need to change this.
control_plane_cidr: 192.168.24.0/24
control_plane_prefix: "{{ control_plane_cidr | ansible.utils.ipaddr('prefix') }}"
local_ip: "{{ control_plane_cidr | nthhost(1) }}"
control_plane_ip: "{{ control_plane_cidr | nthhost(2) }}"
local_ip: "{{ control_plane_cidr | ansible.utils.nthhost(1) }}"
control_plane_ip: "{{ control_plane_cidr | ansible.utils.nthhost(2) }}"

# The IP address of the public openstack endpoints
# By default we use the default IP of the host
Expand Down Expand Up @@ -63,22 +63,22 @@ external_gateway: "{{ network_info.public_ipv4.gateway }}"
hostonly_cidr: 192.168.25.0/24
# The IP of the gateway used by the hostonly provider network, which must be
# within hostonly_cidr.
hostonly_gateway: "{{ hostonly_cidr | nthhost(1) }}"
hostonly_gateway: "{{ hostonly_cidr | ansible.utils.nthhost(1) }}"
# The range of allocatable FIPs within hostonly_cidr
hostonly_fip_pool_start: "{{ hostonly_cidr | nthhost(2) }}"
hostonly_fip_pool_end: "{{ hostonly_cidr | nthhost(-2) }}"
hostonly_fip_pool_start: "{{ hostonly_cidr | ansible.utils.nthhost(2) }}"
hostonly_fip_pool_end: "{{ hostonly_cidr | ansible.utils.nthhost(-2) }}"
# Same for IPv6
hostonly_v6_cidr: 2001:db8::/64
hostonly_v6_gateway: "{{ hostonly_v6_cidr | nthhost(1) }}"
hostonly_v6_fip_pool_start: "{{ hostonly_v6_cidr | nthhost(2) }}"
hostonly_v6_fip_pool_end: "{{ hostonly_v6_cidr | nthhost(-2) }}"
hostonly_v6_gateway: "{{ hostonly_v6_cidr | ansible.utils.nthhost(1) }}"
hostonly_v6_fip_pool_start: "{{ hostonly_v6_cidr | ansible.utils.nthhost(2) }}"
hostonly_v6_fip_pool_end: "{{ hostonly_v6_cidr | ansible.utils.nthhost(-2) }}"

# `hostonly` variants
hostonly_sriov_cidr: 192.168.26.0/24
hostonly_sriov_gateway: "{{ hostonly_sriov_cidr | nthhost(1) }}"
hostonly_sriov_gateway: "{{ hostonly_sriov_cidr | ansible.utils.nthhost(1) }}"
hostonly_sriov_prefix: "{{ hostonly_sriov_cidr | ansible.utils.ipaddr('prefix') }}"
hostonly_sriov_fip_pool_start: "{{ hostonly_sriov_cidr | nthhost(2) }}"
hostonly_sriov_fip_pool_end: "{{ hostonly_sriov_cidr | nthhost(-2) }}"
hostonly_sriov_fip_pool_start: "{{ hostonly_sriov_cidr | ansible.utils.nthhost(2) }}"
hostonly_sriov_fip_pool_end: "{{ hostonly_sriov_cidr | ansible.utils.nthhost(-2) }}"

# Configuration used only by prepare_stack_testconfig, which is not run by
# default.
Expand Down
Loading