path: root/ci/environments/multinode.yaml
diff options
authorEmilien Macchi <emilien@redhat.com>2017-01-25 10:35:20 -0500
committerEmilien Macchi <emilien@redhat.com>2017-01-27 14:26:31 +0000
commit1dd364fc8aea3305faa039524dc09ab1078237bb (patch)
tree33c08714ff299b07167f7a8b03eb9eeb812198de /ci/environments/multinode.yaml
parentc349789089157b0210d8de4f317599df81fa9760 (diff)
Use os-net-config in multinode jobs
Full credits to James Slagle, author of this code in TripleO CI: https://review.openstack.org/#/c/409346 This patch adds a new template for configuring networking on the Overcloud nodes using os-net-config in multinode jobs. Previously we were not using os-net-config at all. Also updates the multinode.yaml environment to use this network config template. The IP of each subnode is used when the vxlan tunnels are configured in OVS, given that, each node needs its own unique network configuration. To accomodate that, the templates makes use of the network_config_hook function to influence run-os-net-config.sh This patch is just the first step to totally switching to os-net-config in multinode jobs. The devstack-gate code is still in use to bootstrap the initial networking on the undercloud and subnodes. That will be switched over in subsequent patches. Change-Id: I6efa71eb23109d0b3b480061135c572ab89f5981 Co-Authorized-By: James Slagle <jslagle@redhat.com> Implements: blueprint multinode-ci-os-net-config
Diffstat (limited to 'ci/environments/multinode.yaml')
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/environments/multinode.yaml b/ci/environments/multinode.yaml
index d7b61bb6..11243c8a 100644
--- a/ci/environments/multinode.yaml
+++ b/ci/environments/multinode.yaml
@@ -1,6 +1,6 @@
- OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
- OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
+ OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml
+ OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml