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
7 changes: 6 additions & 1 deletion .github/workflows/ansible-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,10 @@ jobs:
- name: Install dependency
run: ansible-galaxy collection install -r requirements.yaml

# This works around the lint error from `ansible-playbook --syntax-check -vv playbooks/install_stack.yaml`
# [ERROR]: Could not find specified file in role, its 'tasks/' is not usable.
- name: Prepare redhat-subscription
run: git clone --depth 1 --branch 1.3.0 https://opendev.org/openstack/ansible-role-redhat-subscription.git $HOME/.ansible/roles/redhat-subscription

- name: Run lint
run: ansible-lint playbooks/**
run: export ANSIBLE_COLLECTIONS_PATH=$HOME/.ansible/collections;
2 changes: 1 addition & 1 deletion playbooks/prepare_stack_testconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
# Create a router for private<->external
if ! openstack router show private-subnet-external >/dev/null; then
openstack router create private-subnet-external
openstack router set private-subnet-external --external-gateway external
openstack router set private-subnet-external --external-gateway {{ external_network }}
openstack router add subnet private-subnet-external private-subnet
fi
environment:
Expand Down
4 changes: 4 additions & 0 deletions playbooks/templates/dev-install_net_config.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ network_config:
- type: interface
name: dummy0
nm_controlled: true
{% if enable_dummy_mtu %}
mtu: {{ dcn_az is defined | ternary(ctlplane_mtu, public_mtu) }}
{% end %}
{% for ip in tunnel_remote_ips %}
- type: ovs_tunnel
name: "tun-ctlplane-{{ ip | to_uuid }}"
Expand Down Expand Up @@ -63,7 +65,9 @@ network_config:
- type: interface
name: dummy1
nm_controlled: true
{% if enable_dummy_mtu %}
mtu: {{ dcn_az is defined | ternary(hostonly_mtu, public_mtu) }}
{% end %}
{% if sriov_interface is defined %}
- type: sriov_pf
name: {{ sriov_interface }}
Expand Down
6 changes: 3 additions & 3 deletions playbooks/templates/standalone_parameters.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,15 @@ parameter_defaults:
AdminPassword: {{ admin_password }}
{% endif %}
{% if rhsm_enabled %}
{% if ntp_server is defined %}
NtpServer: {{ ntp_server }}
{% endif %}
ContainerImageRegistryCredentials:
# assume first registry
{{ registers.0.name | ansible.builtin.mandatory}}:
{{ registers.0.username | ansible.builtin.mandatory | ansible.builtin.quote }}: {{ registers.0.password | ansible.builtin.mandatory | ansible.builtin.quote }}
ContainerImageRegistryLogin: true
{% endif %}
{% if ntp_server is defined %}
NtpServer: {{ ntp_server }}
{% endif %}
{% if ssl_enabled %}
AddVipsToEtcHosts: true
HorizonSecureCookies: True
Expand Down
9 changes: 9 additions & 0 deletions playbooks/vars/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -270,3 +270,12 @@ public_mtu: "{{ ctlplane_mtu | int + 100 }}"
# Usually people don't use RHSM when deploying from the internal RH network, but use
# the puddles; so they'll get our internal NTP server.
ntp_server: "{{ rhsm_enabled | ternary('0.pool.ntp.org', 'clock.redhat.com') }}"

# Dummy interfaces may have max mtu = 0, which causes failure when os-net-config tries to apply
# the specified mtu. This allows disabling setting mtu for dummy interfaces.
enable_dummy_mtu: true

# If external_fip_pool_start and external_fip_pool_end are not defined, network `external`
# will not be created. `hostonly` can be used as the external network for the router when
# running `prepare_stack_testconfig.yaml`
external_network: external
Loading