|
17 | 17 | # Server Applications, proxy product and modules, proxy devel |
18 | 18 | if os_family.match?(/^sles/) && os_version.match?(/^15/) |
19 | 19 | repos += 'proxy_module_pool_repo proxy_module_update_repo ' \ |
20 | | - 'proxy_product_pool_repo proxy_product_update_repo ' \ |
21 | | - 'module_server_applications_pool_repo module_server_applications_update_repo ' |
| 20 | + 'proxy_product_pool_repo proxy_product_update_repo ' \ |
| 21 | + 'module_server_applications_pool_repo module_server_applications_update_repo ' |
22 | 22 | repos += 'proxy_devel_releasenotes_repo proxy_devel_repo ' unless $build_validation || product_version_full.include?('-released') |
23 | 23 | elsif os_family.match?(/^opensuse/) |
24 | 24 | repos += 'proxy_pool_repo ' unless $is_containerized_server |
|
33 | 33 | when 'Uyuni' |
34 | 34 | step 'I enable repositories before installing branch server' |
35 | 35 | cmd = 'zypper --non-interactive --ignore-unknown remove atftp && ' \ |
36 | | - 'zypper --non-interactive install tftp && ' \ |
37 | | - 'systemctl enable tftp.service && ' \ |
38 | | - 'systemctl start tftp.service' |
| 36 | + 'zypper --non-interactive install tftp && ' \ |
| 37 | + 'systemctl enable tftp.service && ' \ |
| 38 | + 'systemctl start tftp.service' |
39 | 39 | get_target('proxy').run(cmd) |
40 | 40 | step 'I disable repositories after installing branch server' |
41 | 41 | else |
|
117 | 117 | # otherwise the name server we get from DHCP is lost at the end of the list |
118 | 118 | # (the name servers list in resolv.conf is limited to 3 entries) |
119 | 119 | cmd = 'nmcli connection modify "Wired connection 1" ipv4.dns-priority 20 && ' \ |
120 | | - "nmcli device modify #{node.public_interface} ipv4.dns-priority 20 && " \ |
121 | | - 'nmcli connection modify "Wired connection 2" ipv4.dns-priority 10 && ' \ |
122 | | - "nmcli device modify #{node.private_interface} ipv4.dns-priority 10" |
| 120 | + "nmcli device modify #{node.public_interface} ipv4.dns-priority 20 && " \ |
| 121 | + 'nmcli connection modify "Wired connection 2" ipv4.dns-priority 10 && ' \ |
| 122 | + "nmcli device modify #{node.private_interface} ipv4.dns-priority 10" |
123 | 123 | else |
124 | 124 | # Wicked: is there a way to give eth1 precedence? |
125 | 125 | # we use a static setting for the name server instead |
126 | 126 | static_dns = net_prefix + PRIVATE_ADDRESSES['dhcp_dns'] |
127 | 127 | cmd = 'echo -e "BOOTPROTO=dhcp\nSTARTMODE=auto\n" > /etc/sysconfig/network/ifcfg-eth1 && ' \ |
128 | | - 'ifup eth1 && ' \ |
129 | | - "sed -i 's/^NETCONFIG_DNS_STATIC_SERVERS=\".*\"/NETCONFIG_DNS_STATIC_SERVERS=\"#{static_dns}\"/' /etc/sysconfig/network/config && " \ |
130 | | - 'netconfig update -f' |
| 128 | + 'ifup eth1 && ' \ |
| 129 | + "sed -i 's/^NETCONFIG_DNS_STATIC_SERVERS=\".*\"/NETCONFIG_DNS_STATIC_SERVERS=\"#{static_dns}\"/' /etc/sysconfig/network/config && " \ |
| 130 | + 'netconfig update -f' |
131 | 131 | end |
132 | 132 | node.run(cmd) |
133 | 133 | end |
|
0 commit comments