diff --git a/manifests/site.pp b/manifests/site.pp index f2eed835b4..0f93705e08 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -681,6 +681,9 @@ node 'nodepool.openstack.org' { $osic_username = hiera('nodepool_osic_username', 'username') $osic_password = hiera('nodepool_osic_password') $osic_project = hiera('nodepool_osic_project', 'project') + $vexxhost_username = hiera('nodepool_vexxhost_username', 'username') + $vexxhost_password = hiera('nodepool_vexxhost_password') + $vexxhost_project = hiera('nodepool_vexxhost_project', 'project') $clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb") class { 'openstack_project::server': sysadmins => hiera('sysadmins', []), diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index baf4d98121..0613c947e5 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -59,3 +59,10 @@ clouds: # Since DNS is not setup for the CN in the self signed cert we are not # able to verify even if we provide the cert to check against. verify: False + vexxhost: + region_name: ca-ymq-1 + profile: vexxhost + auth: + username: '<%= vexxhost_username %>' + password: '<%= vexxhost_password %>' + project_name: '<%= vexxhost_project %>' diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index e800447f93..9ae62d4398 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -138,3 +138,17 @@ clouds: # Since DNS is not setup for the CN in the self signed cert we are not # able to verify even if we provide the cert to check against. verify: False + openstackjenkins-vexxhost: + region_name: ca-ymq-1 + profile: vexxhost + auth: + username: '<%= @puppetmaster_clouds['openstackjenkins_vexxhost_username'] %>' + password: '<%= @puppetmaster_clouds['openstackjenkins_vexxhost_password'] %>' + project_name: '<%= @puppetmaster_clouds['openstackjenkins_vexxhost_project_name'] %>' + openstackci-vexxhost: + region_name: ca-ymq-1 + profile: vexxhost + auth: + username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>' + password: '<%= @puppetmaster_clouds['openstackci_vexxhost_password'] %>' + project_name: '<%= @puppetmaster_clouds['openstackci_vexxhost_project_name'] %>' diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index dc46b9a460..e4a6b8f788 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -51,3 +51,10 @@ clouds: # Since DNS is not setup for the CN in the self signed cert we are not # able to verify even if we provide the cert to check against. verify: False + openstackci-vexxhost: + region_name: ca-ymq-1 + profile: vexxhost + auth: + username: '<%= @puppetmaster_clouds['openstackci_vexxhost_username'] %>' + password: '<%= @puppetmaster_clouds['openstackci_vexxhost_password'] %>' + project_name: '<%= @puppetmaster_clouds['openstackci_vexxhost_project_name'] %>'