From c6404c9b47d8344665a308ce92bb7e4f859141cd Mon Sep 17 00:00:00 2001 From: James Slagle Date: Sat, 6 Jan 2018 14:30:51 -0500 Subject: [PATCH] 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 commit c74318381c91751e0f43f1b99f26011cecafe440) --- .../network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml | 2 +- .../network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml | 2 +- .../network/multiple-nics-ipv6/nic-configs/compute.yaml | 2 +- .../network/multiple-nics-ipv6/nic-configs/controller.yaml | 2 +- .../network/multiple-nics-ipv6/nic-configs/swift-storage.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml index dcd3533b16..0fb293f6e0 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml +++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml @@ -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 diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml index 160cfca2fb..e424f9b715 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml +++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml @@ -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 diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml index 882121e130..d30c4b5085 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml +++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml @@ -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 diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml index 389c433f87..744ee2b90c 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml +++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml @@ -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 diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml index 160cfca2fb..e424f9b715 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml +++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml @@ -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