openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
James Slagle 2018-01-06 14:30:51 -05:00
parent fc49be56bb
commit c74318381c
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml
View File

@ -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

2
ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml
View File

@ -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

2
ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml
View File

@ -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

2
ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml
View File

@ -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

2
ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml
View File

@ -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