From 16c927421344dc705886410f412a9715358a05e1 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 15 Apr 2016 08:13:03 -0500 Subject: [PATCH] Also set the network info for internap ci account Same as the previous nodepool patch - it's important that we configure internap correctly in our other clouds.yaml files. Change-Id: I100fa7f7aa4836579dc8ddcfd40d78402aef38ef --- .../templates/puppetmaster/all-clouds.yaml.erb | 5 +++++ .../templates/puppetmaster/ansible-clouds.yaml.erb | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index 049cf41d3a..c7b5cf8d50 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -34,6 +34,11 @@ clouds: username: <%= @puppetmaster_clouds['openstackci_internap_username'] %> password: <%= @puppetmaster_clouds['openstackci_internap_password'] %> project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %> + networks: + - name: inap-17301-WAN2344 + routes_externally: True + - name: inap-17301-LAN3328 + routes_externally: False openstackjenkins-internap: region_name: nyj01 profile: internap diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index 8d8acaa3e3..29e227e6ec 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -18,6 +18,11 @@ clouds: username: <%= @puppetmaster_clouds['openstackci_internap_username'] %> password: <%= @puppetmaster_clouds['openstackci_internap_password'] %> project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %> + networks: + - name: inap-17301-WAN2344 + routes_externally: True + - name: inap-17301-LAN3328 + routes_externally: False openstackci-ovh: regions: - GRA1