From 14e6d4cf2bca496df0548e0b25dcce27c042b70a Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 18 Nov 2015 10:55:07 -0800 Subject: [PATCH] Add internap to nodepool clouds.yaml Hiera has been updated to include these values. Change-Id: Ic837f76fc4bbffa21a19f3ed7439d39c6eeac4eb --- manifests/site.pp | 3 +++ .../openstack_project/templates/nodepool/clouds.yaml.erb | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index d27ad33c27..82308b91cd 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -657,6 +657,9 @@ node 'nodepool.openstack.org' { $hpcloud_username = hiera('nodepool_hpcloud_username', 'username') $hpcloud_password = hiera('nodepool_hpcloud_password') $hpcloud_project = hiera('nodepool_hpcloud_project', 'project') + $internap_username = hiera('nodepool_internap_username', 'username') + $internap_password = hiera('nodepool_internap_password') + $internap_project = hiera('nodepool_internap_project', 'project') $ovh_username = hiera('nodepool_ovh_username', 'username') $ovh_password = hiera('nodepool_ovh_password') $ovh_project = hiera('nodepool_ovh_project', 'project') diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 6a8db8ed42..3d81bfcb41 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -37,3 +37,10 @@ clouds: password: '<%= bluebox_password %>' project_name: '<%= bluebox_project %>' auth_url: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5001/v2.0' + internap: + profile: internap + region_name: nyj01 + auth: + username: '<%= internap_username %>' + password: '<%= internap_password %>' + project_name: '<%= internap_project %>'