Merge "Template credentials for Packet Host/Platform 9"
This commit is contained in:
commit
d8e1ad6b87
manifests
modules/openstack_project/templates
playbooks
@ -1089,6 +1089,9 @@ node /^nl\d+\.openstack\.org$/ {
|
|||||||
$limestone_username = hiera('nodepool_limestone_username', 'username')
|
$limestone_username = hiera('nodepool_limestone_username', 'username')
|
||||||
$limestone_password = hiera('nodepool_limestone_password')
|
$limestone_password = hiera('nodepool_limestone_password')
|
||||||
$limestone_project = hiera('nodepool_limestone_project', 'project')
|
$limestone_project = hiera('nodepool_limestone_project', 'project')
|
||||||
|
$packethost_username = hiera('nodepool_packethost_username', 'username')
|
||||||
|
$packethost_password = hiera('nodepool_packethost_password')
|
||||||
|
$packethost_project = hiera('nodepool_packethost_project', 'project')
|
||||||
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
|
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
|
||||||
|
|
||||||
class { 'openstack_project::server':
|
class { 'openstack_project::server':
|
||||||
@ -1149,6 +1152,9 @@ node /^nb\d+\.openstack\.org$/ {
|
|||||||
$limestone_username = hiera('nodepool_limestone_username', 'username')
|
$limestone_username = hiera('nodepool_limestone_username', 'username')
|
||||||
$limestone_password = hiera('nodepool_limestone_password')
|
$limestone_password = hiera('nodepool_limestone_password')
|
||||||
$limestone_project = hiera('nodepool_limestone_project', 'project')
|
$limestone_project = hiera('nodepool_limestone_project', 'project')
|
||||||
|
$packethost_username = hiera('nodepool_packethost_username', 'username')
|
||||||
|
$packethost_password = hiera('nodepool_packethost_password')
|
||||||
|
$packethost_project = hiera('nodepool_packethost_project', 'project')
|
||||||
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
|
$clouds_yaml = template("openstack_project/nodepool/clouds.yaml.erb")
|
||||||
|
|
||||||
class { 'openstack_project::server':
|
class { 'openstack_project::server':
|
||||||
|
@ -96,3 +96,13 @@ clouds:
|
|||||||
identity_api_version: 3
|
identity_api_version: 3
|
||||||
floating_ip_source: None
|
floating_ip_source: None
|
||||||
cacert: /home/nodepool/.config/openstack/limestone_cacert.pem
|
cacert: /home/nodepool/.config/openstack/limestone_cacert.pem
|
||||||
|
packethost:
|
||||||
|
regions:
|
||||||
|
- us-west-1
|
||||||
|
auth:
|
||||||
|
auth_url: https://packet.platform9.net/keystone
|
||||||
|
username: <%= @packethost_username %>
|
||||||
|
password: <%= @packethost_password %>
|
||||||
|
project_name: <%= @packethost_project %>
|
||||||
|
user_domain_name: default
|
||||||
|
project_domain_name: default
|
||||||
|
@ -171,3 +171,23 @@ clouds:
|
|||||||
project_domain_name: default
|
project_domain_name: default
|
||||||
identity_api_version: 3
|
identity_api_version: 3
|
||||||
cacert: /etc/openstack/limestone_cacert.pem
|
cacert: /etc/openstack/limestone_cacert.pem
|
||||||
|
openstackci-packethost:
|
||||||
|
regions:
|
||||||
|
- us-west-1
|
||||||
|
auth:
|
||||||
|
auth_url: https://packet.platform9.net/keystone
|
||||||
|
username: <%= @puppetmaster_clouds['openstackci_packethost_username'] %>
|
||||||
|
password: <%= @puppetmaster_clouds['openstackci_packethost_password'] %>
|
||||||
|
project_name: <%= @puppetmaster_clouds['openstackci_packethost_project_name'] %>
|
||||||
|
user_domain_name: default
|
||||||
|
project_domain_name: default
|
||||||
|
openstackzuul-packethost:
|
||||||
|
regions:
|
||||||
|
- us-west-1
|
||||||
|
auth:
|
||||||
|
auth_url: https://packet.platform9.net/keystone
|
||||||
|
username: <%= @puppetmaster_clouds['openstackzuul_packethost_username'] %>
|
||||||
|
password: <%= @puppetmaster_clouds['openstackzuul_packethost_password'] %>
|
||||||
|
project_name: <%= @puppetmaster_clouds['openstackzuul_packethost_project_name'] %>
|
||||||
|
user_domain_name: default
|
||||||
|
project_domain_name: default
|
||||||
|
@ -96,3 +96,13 @@ clouds:
|
|||||||
project_domain_name: default
|
project_domain_name: default
|
||||||
identity_api_version: 3
|
identity_api_version: 3
|
||||||
cacert: /etc/openstack/limestone_cacert.pem
|
cacert: /etc/openstack/limestone_cacert.pem
|
||||||
|
openstackci-packethost:
|
||||||
|
regions:
|
||||||
|
- us-west-1
|
||||||
|
auth:
|
||||||
|
auth_url: https://packet.platform9.net/keystone
|
||||||
|
username: <%= @puppetmaster_clouds['openstackci_packethost_username'] %>
|
||||||
|
password: <%= @puppetmaster_clouds['openstackci_packethost_password'] %>
|
||||||
|
project_name: <%= @puppetmaster_clouds['openstackci_packethost_project_name'] %>
|
||||||
|
user_domain_name: default
|
||||||
|
project_domain_name: default
|
||||||
|
@ -320,3 +320,15 @@ clouds:
|
|||||||
profiles:
|
profiles:
|
||||||
- openstackci-keypairs
|
- openstackci-keypairs
|
||||||
- openstackci-security
|
- openstackci-security
|
||||||
|
- name: openstackci-packethost
|
||||||
|
oscc_cloud: openstackci-packethost
|
||||||
|
region_name: us-west-1
|
||||||
|
profiles:
|
||||||
|
- openstackci-keypairs
|
||||||
|
- openstackci-security
|
||||||
|
- name: openstackzuul-packethost
|
||||||
|
oscc_cloud: openstackzuul-packethost
|
||||||
|
region_name: us-west-1
|
||||||
|
profiles:
|
||||||
|
- openstackci-keypairs
|
||||||
|
- openstackci-security
|
||||||
|
Loading…
x
Reference in New Issue
Block a user