Use relative path in ipv6 nic configs
The path to run-os-net-config.sh in these nic config templates for ci should be relative, not absolute. The absolute path does not honor a different directory specified via --templates, and it also fails the overcloud deploy entirely b/c the absolute path does not exist in the plan in swift. Change-Id: I85ac081571965f42beef4bd283db985b9a03078f (cherry picked from commitc74318381c
) (cherry picked from commitc6404c9b47
)
This commit is contained in:
parent
89649d1c59
commit
2d22477ba1
|
@ -114,7 +114,7 @@ resources:
|
|||
addresses:
|
||||
- ip_netmask: {get_param: StorageMgmtIpSubnet}
|
||||
template:
|
||||
get_file: /usr/share/openstack-tripleo-heat-templates/network/scripts/run-os-net-config.sh
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
|
||||
|
|
|
@ -86,7 +86,7 @@ resources:
|
|||
$network_config:
|
||||
network_config: []
|
||||
template:
|
||||
get_file: /usr/share/openstack-tripleo-heat-templates/network/scripts/run-os-net-config.sh
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
|
||||
|
|
|
@ -125,7 +125,7 @@ resources:
|
|||
mtu: 1350
|
||||
primary: true
|
||||
template:
|
||||
get_file: /usr/share/openstack-tripleo-heat-templates/network/scripts/run-os-net-config.sh
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
|
||||
|
|
|
@ -146,7 +146,7 @@ resources:
|
|||
mtu: 1350
|
||||
primary: true
|
||||
template:
|
||||
get_file: /usr/share/openstack-tripleo-heat-templates/network/scripts/run-os-net-config.sh
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
|
||||
|
|
|
@ -86,7 +86,7 @@ resources:
|
|||
$network_config:
|
||||
network_config: []
|
||||
template:
|
||||
get_file: /usr/share/openstack-tripleo-heat-templates/network/scripts/run-os-net-config.sh
|
||||
get_file: ../../../../../network/scripts/run-os-net-config.sh
|
||||
group: script
|
||||
type: OS::Heat::SoftwareConfig
|
||||
|
||||
|
|
Loading…
Reference in New Issue