From 3d4a724eff17fd626178098c6f49d0df220c147c Mon Sep 17 00:00:00 2001 From: "James E. Blair" <jeblair@linux.vnet.ibm.com> Date: Tue, 13 Oct 2015 17:28:31 -0700 Subject: [PATCH] Add Blue Box to nodepool Change-Id: Ia6d0cd54ab38973bcf215c4bdc6559a8e0075c1b --- manifests/site.pp | 3 +++ .../openstack_project/templates/nodepool/clouds.yaml.erb | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index 8719ef3172..93b7c37d0f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -647,6 +647,9 @@ node 'status.openstack.org' { # Node-OS: trusty node 'nodepool.openstack.org' { + $bluebox_username = hiera('nodepool_bluebox_username', 'username'), + $bluebox_password = hiera('nodepool_bluebox_password'), + $bluebox_project = hiera('nodepool_bluebox_project', 'project'), $rackspace_username = hiera('nodepool_rackspace_username', 'username') $rackspace_password = hiera('nodepool_rackspace_password') $rackspace_project = hiera('nodepool_rackspace_project', 'project') diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index b9034ac2ff..6a8db8ed42 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -31,3 +31,9 @@ clouds: password: '<%= tripleo_password %>' project_name: '<%= tripleo_project %>' auth_url: 'https://ci-overcloud.rh1.tripleo.org:13000/v2.0' + bluebox-sjc1: + auth: + username: '<%= bluebox_username %>' + password: '<%= bluebox_password %>' + project_name: '<%= bluebox_project %>' + auth_url: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5001/v2.0'