opendev/system-config
Code Issues Proposed changes

Merge "Stop managing infracloud things"

Browse Source
This commit is contained in:
Zuul 2018-04-25 22:15:14 +00:00 committed by Gerrit Code Review
commit 881f9a5943
6 changed files with 0 additions and 492 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
hiera/common.yaml
View File

@ -502,8 +502,6 @@ cacti_hosts:
- mirror02.dfw.rax.openstack.org
- mirror01.ord.rax.openstack.org
- mirror01.iad.rax.openstack.org
- mirror01.regionone.infracloud-chocolate.openstack.org
- mirror01.regionone.infracloud-vanilla.openstack.org
- mirror01.regionone.limestone.openstack.org
- mirror01.kna1.citycloud.openstack.org
- mirror01.sto2.citycloud.openstack.org
@ -548,72 +546,6 @@ cacti_hosts:
- zm07.openstack.org
- zm08.openstack.org
- zuul01.openstack.org
infracloud_hpuseast_ssl_cert_file_contents: |
-----BEGIN CERTIFICATE-----
MIIEijCCAvICCQDZLTPao6k1yjANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UEBhMC
VVMxDDAKBgNVBAgMA04vQTEYMBYGA1UECgwPT3BlblN0YWNrIEluZnJhMR4wHAYD
VQQLDBVPcGVuU3RhY2sgSW5mcmEgQ2xvdWQxLzAtBgNVBAMMJmNvbnRyb2xsZXIw
MC5ocHVzZWFzdC5pYy5vcGVuc3RhY2sub3JnMB4XDTE2MDIxNTExMjczM1oXDTE3
MDIxNDExMjczM1owgYYxCzAJBgNVBAYTAlVTMQwwCgYDVQQIDANOL0ExGDAWBgNV
BAoMD09wZW5TdGFjayBJbmZyYTEeMBwGA1UECwwVT3BlblN0YWNrIEluZnJhIENs
b3VkMS8wLQYDVQQDDCZjb250cm9sbGVyMDAuaHB1c2Vhc3QuaWMub3BlbnN0YWNr
Lm9yZzCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKhAxy3ags3KaCN2
Qn8qCqRPrQGkVrDGt21R0tlMVUxHKTRKCOoQNBMSB+YfaNmFbZ9FgnXwjr0epuH4
t+x0mk3TKW3YH8VPgn1FRlTyRv+X/pGW1afja5+QuQyF2JnzqpV6mLYHXNxk5RT3
GgLm2fC9NfGDe53l0Fs8y4DXavJfBXoCqb5qcb58yXdDR4DFc33G2RvUZ5a1Bsz6
382yXDeIoV1L8lkkXWO6HwQVJJSpxhc3jFtghTTEy5a7xCrX7If5FHjCj1x5yihk
XJ+JiyltVm8dqdSzAIoDwZDfHGYDsPJxab+Sv01EcdLJc7Y7YkR/1aCluM0SIAMk
p+mm7R+c9pnx0pvEMjv5iPX9sUG5x0uOa7enZX5uSKQLlXUyXKBkGMcHOPUK6hql
E6mo4qydoMvyDiNWMreriHUpELUWYJlTe23EfSPdiLyvmmMRaBgOgcOF2yEHvvf/
fZOiDBhWVOEUrdDolbBlK/DlBfZ8xogamLfFDK3vggGpVdbcMQIDAQABMA0GCSqG
SIb3DQEBCwUAA4IBgQBBImCLV0xDydVvos2lMk3mgkAuVDPxMborJZW0euSTM0id
TEJMBgc8+xrmGSQRzWe9JHyAkMtuEOjvu6LdwPcdq24ppf3nyBIF+hSr+ZTI5QWc
RDW37rObFjBdK0kuvkA3h4Atmc83iu/GRadDCLL/Ca9CUwYw5lVmcFWrhCWJFYEJ
9l0/3WExumOPZnOzbTg4N7kzXmkXFOw42Low5UXtKdSwAbeeMbc2KGLWoF+iwaAF
yXyt2+w8wAC/v2RSk7Jc9bu6r/DheTKNJMxtDWzkE8h5iwDzwR/KNEbFwbExPjiW
dKYnVC+vch3ix5HF+zLnFe4FVxAwOJB1sJ0fMDLXI94dYVf6yMR8joVM+BNGCkyc
OJqPGjxm99356TcXBpVP9bXhLR3XrTVAHGIar74eP76E8bNOZc/k1mw0qn6Pfkbe
waHu4jUcpr+TPgFGlaQB7es/E48KpPG/A93QoBiGgqYn7BbtmmVqEQosYhsw9dM1
it1KkeR3ySIc6zXTpBM=
-----END CERTIFICATE-----
infracloud_vanilla_ssl_cert_file_contents: |
-----BEGIN CERTIFICATE-----
MIIC8DCCAdigAwIBAgIJAKnLfUr0fN5bMA0GCSqGSIb3DQEBCwUAMDAxLjAsBgNV
BAMTJWNvbnRyb2xsZXIwMC52YW5pbGxhLmljLm9wZW5zdGFjay5vcmcwHhcNMTYw
ODIzMDg0MTMzWhcNMjYwODIxMDg0MTMzWjAwMS4wLAYDVQQDEyVjb250cm9sbGVy
MDAudmFuaWxsYS5pYy5vcGVuc3RhY2sub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
AQ8AMIIBCgKCAQEA14C9pRprywQM3USXg+doOJOXXSNZzHAEnZ12qQ5kWV150EY1
XO92qZ5GJDomuVjxxW4WcH3FWbj0+fUHw6uWefeHhhTCI5PgeH95qlxPxzfsfLpy
Fx6JBaDTpfAaxlnlKtPsr6D1QwuAt53Q9imrPolrwuwelKgJMouDodfm9uDMbobU
jRd/vvXcOdw8HUxQE5pwwHyjUrYC0J4zclg+oVt7/WrfQUxXtsdBwDsoE08iBbrA
zSuU6ZNB+T/KJXgKcRozDQzwQW1K1C2i2062ZSw4khreqOhYe7CqRdFZMU5hh/Ih
LlNzIaHATJc6K0RaRZ7SMG9yE9OgnI4oWeYCzwIDAQABow0wCzAJBgNVHRMEAjAA
MA0GCSqGSIb3DQEBCwUAA4IBAQB/q7qC9Giv5XbeLng01M3Pnbxj/ixRt5/YYA+m
6OuzxDYgZHaJf7+EIHspfL+Q7grGX/7wsbJPtqx0IYhMRfKcOWVF4x4i0bTyiX23
5lPl2aPhQjH4dhnkAB7KbLKyqTRoaTX7NOKbiHQ43R3AtuqMAFVc6M8R9pAPVq3n
+URMb2i9MYTmnobZCRR8Kdg3PFE06rYlYGSzWj6l7bzFXLVJPOvRoc2ONmofTJ4d
UnQw19SK7OyeYbWwUFT2yEXyG5NTe1ZxPTtEnCEXEuK19gDxnvOceUpRgJuWoyjL
b0KPvk0AyP+1Bb2f6UKo9539EvakMYTEqpuPlMDwyjq7olwr
-----END CERTIFICATE-----
infracloud_chocolate_ssl_cert_file_contents: |
-----BEGIN CERTIFICATE-----
MIIC9DCCAdygAwIBAgIJAKj4cGAIm3KwMA0GCSqGSIb3DQEBCwUAMDIxMDAuBgNV
BAMTJ2NvbnRyb2xsZXIwMC5jaG9jb2xhdGUuaWMub3BlbnN0YWNrLm9yZzAeFw0x
NjA5MjExNDUwMzZaFw0yNjA5MTkxNDUwMzZaMDIxMDAuBgNVBAMTJ2NvbnRyb2xs
ZXIwMC5jaG9jb2xhdGUuaWMub3BlbnN0YWNrLm9yZzCCASIwDQYJKoZIhvcNAQEB
BQADggEPADCCAQoCggEBAOkbDJhI6kAX2sZi+YRVcU0ePZurpSS1aVJERDp9wVw5
NIESkPFilb5Ff7NlTkZs0NWSRG62hmf43ea16NpsJP3lbvIawx4iK58BFaFCJw3z
6J0A1On2oz6+qZ03NZ1CzwWCKlRWD0VpyDBtGXLwElwkS3QP9iFC1WPwBD2Hd1dC
YXZrN0l2wMrRRWHxiIZZaOvt9yntMA/GOGPG3MI3x82mxx3gZtXO8/LvvzN4Bqif
AmAKNdq1I5PQOMr4/j3Vs213MMIMEM9R4GjYoeYhNRQAV8OYvpzPLjdzqVx+5QZk
t3IHlApPjcefFJoGnqpAgUTbiLYqAAKljGF8/MuY848CAwEAAaMNMAswCQYDVR0T
BAIwADANBgkqhkiG9w0BAQsFAAOCAQEAVJo5q1LhVXngTOyqaAmXgrm0PU2Wb5Lr
keZ4JlQjLH9Y6M2JQ5i4ih37DuEOoyvRM48DrEFJ3uF4GCl/QgRd9NpWaqWH+VEu
nhdHkrVRdOVZiqcpPL4D661iUeN0ESxRnhmbGfr6UPFikNKdMuO9Q4n9oN9fm+gR
r9J0ZtHsyJva0C/ll/FXl3eQCx2PXDVRlrpf+0pCZxpSJJvksKFOhNMd8703lTaN
hSjXxXxM4KpXfGZQ8rdvB+TrladcBpRqsaFXN07BRU6OWZ59z6b1KFEV//XOkj8h
osIiNUq7LRJe9znYYeHvQVcp8vQhxBsfgv7IFW89gntNCpq7YITCVQ==
-----END CERTIFICATE-----
limestone_ssl_cert_file_contents: |
-----BEGIN CERTIFICATE-----
MIIDzTCCArWgAwIBAgIJAMjKv/sJrt0JMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNV

224
manifests/site.pp
View File

@ -224,22 +224,6 @@ node 'puppetmaster.openstack.org' {
mqtt_password => hiera('mqtt_service_user_password'),
mqtt_ca_cert_contents => hiera('mosquitto_tls_ca_file'),
}
file { '/etc/openstack/infracloud_vanilla_cacert.pem':
ensure => present,
owner => 'root',
group => 'root',
mode => '0444',
content => hiera('infracloud_vanilla_ssl_cert_file_contents'),
require => Class['::openstack_project::puppetmaster'],
}
file { '/etc/openstack/infracloud_chocolate_cacert.pem':
ensure => present,
owner => 'root',
group => 'root',
mode => '0444',
content => hiera('infracloud_chocolate_ssl_cert_file_contents'),
require => Class['::openstack_project::puppetmaster'],
}
file { '/etc/openstack/limestone_cacert.pem':
ensure => present,
owner => 'root',
@ -982,12 +966,6 @@ node 'nodepool.openstack.org' {
$tripleo_username = hiera('nodepool_tripleo_username', 'username')
$tripleo_password = hiera('nodepool_tripleo_password')
$tripleo_project = hiera('nodepool_tripleo_project', 'project')
$infracloud_vanilla_username = hiera('nodepool_infracloud_vanilla_username', 'username')
$infracloud_vanilla_password = hiera('nodepool_infracloud_vanilla_password')
$infracloud_vanilla_project = hiera('nodepool_infracloud_vanilla_project', 'project')
$infracloud_chocolate_username = hiera('nodepool_infracloud_chocolate_username', 'username')
$infracloud_chocolate_password = hiera('nodepool_infracloud_chocolate_password')
$infracloud_chocolate_project = hiera('nodepool_infracloud_chocolate_project', 'project')
$vexxhost_username = hiera('nodepool_vexxhost_username', 'username')
$vexxhost_password = hiera('nodepool_vexxhost_password')
$vexxhost_project = hiera('nodepool_vexxhost_project', 'project')
@ -1046,22 +1024,6 @@ node 'nodepool.openstack.org' {
jenkins_masters => [],
split_daemon => true,
}
file { '/home/nodepool/.config/openstack/infracloud_vanilla_cacert.pem':
ensure => present,
owner => 'nodepool',
group => 'nodepool',
mode => '0600',
content => hiera('infracloud_vanilla_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool'],
}
file { '/home/nodepool/.config/openstack/infracloud_chocolate_cacert.pem':
ensure => present,
owner => 'nodepool',
group => 'nodepool',
mode => '0600',
content => hiera('infracloud_chocolate_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool'],
}
file { '/home/nodepool/.config/openstack/limestone_cacert.pem':
ensure => present,
owner => 'nodepool',
@ -1102,12 +1064,6 @@ node /^nl\d+\.openstack\.org$/ {
$tripleo_username = hiera('nodepool_tripleo_username', 'username')
$tripleo_password = hiera('nodepool_tripleo_password')
$tripleo_project = hiera('nodepool_tripleo_project', 'project')
$infracloud_vanilla_username = hiera('nodepool_infracloud_vanilla_username', 'username')
$infracloud_vanilla_password = hiera('nodepool_infracloud_vanilla_password')
$infracloud_vanilla_project = hiera('nodepool_infracloud_vanilla_project', 'project')
$infracloud_chocolate_username = hiera('nodepool_infracloud_chocolate_username', 'username')
$infracloud_chocolate_password = hiera('nodepool_infracloud_chocolate_password')
$infracloud_chocolate_project = hiera('nodepool_infracloud_chocolate_project', 'project')
$vexxhost_username = hiera('nodepool_vexxhost_username', 'username')
$vexxhost_password = hiera('nodepool_vexxhost_password')
$vexxhost_project = hiera('nodepool_vexxhost_project', 'project')
@ -1138,22 +1094,6 @@ node /^nl\d+\.openstack\.org$/ {
enable_webapp => true,
}
file { '/home/nodepool/.config/openstack/infracloud_vanilla_cacert.pem':
ensure => present,
owner => 'nodepool',
group => 'nodepool',
mode => '0600',
content => hiera('infracloud_vanilla_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool_launcher'],
}
file { '/home/nodepool/.config/openstack/infracloud_chocolate_cacert.pem':
ensure => present,
owner => 'nodepool',
group => 'nodepool',
mode => '0600',
content => hiera('infracloud_chocolate_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool_launcher'],
}
file { '/home/nodepool/.config/openstack/limestone_cacert.pem':
ensure => present,
owner => 'nodepool',
@ -1184,12 +1124,6 @@ node /^nb\d+\.openstack\.org$/ {
$tripleo_username = hiera('nodepool_tripleo_username', 'username')
$tripleo_password = hiera('nodepool_tripleo_password')
$tripleo_project = hiera('nodepool_tripleo_project', 'project')
$infracloud_vanilla_username = hiera('nodepool_infracloud_vanilla_username', 'username')
$infracloud_vanilla_password = hiera('nodepool_infracloud_vanilla_password')
$infracloud_vanilla_project = hiera('nodepool_infracloud_vanilla_project', 'project')
$infracloud_chocolate_username = hiera('nodepool_infracloud_chocolate_username', 'username')
$infracloud_chocolate_password = hiera('nodepool_infracloud_chocolate_password')
$infracloud_chocolate_project = hiera('nodepool_infracloud_chocolate_project', 'project')
$vexxhost_username = hiera('nodepool_vexxhost_username', 'username')
$vexxhost_password = hiera('nodepool_vexxhost_password')
$vexxhost_project = hiera('nodepool_vexxhost_project', 'project')
@ -1224,23 +1158,6 @@ node /^nb\d+\.openstack\.org$/ {
zuulv3 => true,
}
file { '/home/nodepool/.config/openstack/infracloud_vanilla_cacert.pem':
ensure => present,
owner => 'nodepool',
group => 'nodepool',
mode => '0600',
content => hiera('infracloud_vanilla_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool_builder'],
}
file { '/home/nodepool/.config/openstack/infracloud_chocolate_cacert.pem':
ensure => present,
owner => 'nodepool',
group => 'nodepool',
mode => '0600',
content => hiera('infracloud_chocolate_ssl_cert_file_contents'),
require => Class['::openstackci::nodepool_builder'],
}
file { '/home/nodepool/.config/openstack/limestone_cacert.pem':
ensure => present,
owner => 'nodepool',
@ -1782,145 +1699,4 @@ node /^codesearch\d*\.openstack\.org$/ {
}
}
# Node-OS: trusty
node 'controller00.vanilla.ic.openstack.org' {
$group = 'infracloud'
class { '::openstack_project::server':
iptables_public_tcp_ports => [80,5000,5671,8774,9292,9696,35357], # logs,keystone,rabbit,nova,glance,neutron,keystone
sysadmins => hiera('sysadmins', []),
enable_unbound => false,
purge_apt_sources => false,
}
class { '::openstack_project::infracloud::controller':
keystone_rabbit_password => hiera('keystone_rabbit_password'),
neutron_rabbit_password => hiera('neutron_rabbit_password'),
nova_rabbit_password => hiera('nova_rabbit_password'),
root_mysql_password => hiera('infracloud_mysql_password'),
keystone_mysql_password => hiera('keystone_mysql_password'),
glance_mysql_password => hiera('glance_mysql_password'),
neutron_mysql_password => hiera('neutron_mysql_password'),
nova_mysql_password => hiera('nova_mysql_password'),
keystone_admin_password => hiera('keystone_admin_password'),
glance_admin_password => hiera('glance_admin_password'),
neutron_admin_password => hiera('neutron_admin_password'),
nova_admin_password => hiera('nova_admin_password'),
keystone_admin_token => hiera('keystone_admin_token'),
ssl_key_file_contents => hiera('ssl_key_file_contents'),
ssl_cert_file_contents => hiera('infracloud_vanilla_ssl_cert_file_contents'),
br_name => hiera('bridge_name'),
controller_public_address => $::fqdn,
neutron_subnet_cidr => '15.184.64.0/19',
neutron_subnet_gateway => '15.184.64.1',
neutron_subnet_allocation_pools => [
'start=15.184.65.2,end=15.184.65.254',
'start=15.184.66.2,end=15.184.66.254',
'start=15.184.67.2,end=15.184.67.254'
],
mysql_max_connections => hiera('mysql_max_connections'),
}
}
node /^compute\d{3}\.vanilla\.ic\.openstack\.org$/ {
$group = 'infracloud'
class { '::openstack_project::server':
sysadmins => hiera('sysadmins', []),
enable_unbound => false,
purge_apt_sources => false,
}
class { '::openstack_project::infracloud::compute':
nova_rabbit_password => hiera('nova_rabbit_password'),
neutron_rabbit_password => hiera('neutron_rabbit_password'),
neutron_admin_password => hiera('neutron_admin_password'),
ssl_key_file_contents => hiera('ssl_key_file_contents'),
ssl_cert_file_contents => hiera('infracloud_vanilla_ssl_cert_file_contents'),
br_name => hiera('bridge_name'),
controller_public_address => 'controller00.vanilla.ic.openstack.org',
}
}
# Node-OS: trusty
node 'controller00.chocolate.ic.openstack.org' {
$group = 'infracloud'
class { '::openstack_project::server':
iptables_public_tcp_ports => [80,5000,5671,8774,9292,9696,35357], # logs,keystone,rabbit,nova,glance,neutron,keystone
sysadmins => hiera('sysadmins', []),
enable_unbound => false,
purge_apt_sources => false,
}
class { '::openstack_project::infracloud::controller':
keystone_rabbit_password => hiera('keystone_rabbit_password'),
neutron_rabbit_password => hiera('neutron_rabbit_password'),
nova_rabbit_password => hiera('nova_rabbit_password'),
root_mysql_password => hiera('infracloud_mysql_password'),
keystone_mysql_password => hiera('keystone_mysql_password'),
glance_mysql_password => hiera('glance_mysql_password'),
neutron_mysql_password => hiera('neutron_mysql_password'),
nova_mysql_password => hiera('nova_mysql_password'),
keystone_admin_password => hiera('keystone_admin_password'),
glance_admin_password => hiera('glance_admin_password'),
neutron_admin_password => hiera('neutron_admin_password'),
nova_admin_password => hiera('nova_admin_password'),
keystone_admin_token => hiera('keystone_admin_token'),
ssl_key_file_contents => hiera('infracloud_chocolate_ssl_key_file_contents'),
ssl_cert_file_contents => hiera('infracloud_chocolate_ssl_cert_file_contents'),
br_name => 'br-vlan2551',
controller_public_address => $::fqdn,
neutron_subnet_cidr => '15.184.64.0/19',
neutron_subnet_gateway => '15.184.64.1',
neutron_subnet_allocation_pools => [
'start=15.184.68.2,end=15.184.68.254',
'start=15.184.69.2,end=15.184.69.254',
'start=15.184.70.2,end=15.184.70.254'
]
}
}
node /^compute\d{3}\.chocolate\.ic\.openstack\.org$/ {
$group = 'infracloud'
class { '::openstack_project::server':
sysadmins => hiera('sysadmins', []),
enable_unbound => false,
purge_apt_sources => false,
}
class { '::openstack_project::infracloud::compute':
nova_rabbit_password => hiera('nova_rabbit_password'),
neutron_rabbit_password => hiera('neutron_rabbit_password'),
neutron_admin_password => hiera('neutron_admin_password'),
ssl_key_file_contents => hiera('infracloud_chocolate_ssl_key_file_contents'),
ssl_cert_file_contents => hiera('infracloud_chocolate_ssl_cert_file_contents'),
br_name => 'br-vlan2551',
controller_public_address => 'controller00.chocolate.ic.openstack.org',
}
}
# Node-OS: trusty
# Upgrade-Modules
node /^baremetal\d{2}\.vanilla\.ic\.openstack\.org$/ {
$group = 'infracloud'
class { '::openstack_project::server':
iptables_public_udp_ports => [67,69],
sysadmins => hiera('sysadmins', []),
enable_unbound => false,
purge_apt_sources => false,
}
class { '::openstack_project::infracloud::baremetal':
ironic_inventory => hiera('ironic_inventory', {}),
ironic_db_password => hiera('ironic_db_password'),
mysql_password => hiera('bifrost_mysql_password'),
ipmi_passwords => hiera('ipmi_passwords'),
ssh_private_key => hiera('bifrost_vanilla_ssh_private_key'),
ssh_public_key => hiera('bifrost_vanilla_ssh_public_key'),
bridge_name => hiera('bridge_name'),
vlan => hiera('vlan'),
gateway_ip => hiera('gateway_ip'),
default_network_interface => hiera('default_network_interface'),
dhcp_pool_start => hiera('dhcp_pool_start'),
dhcp_pool_end => hiera('dhcp_pool_end'),
network_interface => hiera('network_interface'),
ipv4_nameserver => hiera('ipv4_nameserver'),
ipv4_subnet_mask => hiera('ipv4_subnet_mask'),
}
}
# vim:sw=2:ts=2:expandtab:textwidth=79

11
modules.env
View File

@ -37,16 +37,6 @@
OPENSTACK_GIT_ROOT=https://git.openstack.org
# InfraCloud modules
SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-cinder"]="mitaka-eol"
SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-glance"]="mitaka-eol"
SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-ironic"]="mitaka-eol"
SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-keystone"]="mitaka-eol"
SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-neutron"]="mitaka-eol"
SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-nova"]="mitaka-eol"
SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-openstack_extras"]="mitaka-eol"
SOURCE_MODULES["$OPENSTACK_GIT_ROOT/openstack/puppet-openstacklib"]="mitaka-eol"
SOURCE_MODULES["https://git.drupal.org/project/puppet-drush"]="origin/1.0.x"
SOURCE_MODULES["https://git.openstack.org/openstack-infra/puppet-vcsrepo"]="0.0.8"
# NOTE(yolanda): please note that grafana depends on camptocamp-archive. This is a
@ -114,7 +104,6 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-graphite"]="orig
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-haveged"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-hound"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-httpd"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-infracloud"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-iptables"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-jeepyb"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-jenkins"]="origin/master"

130
modules/openstack_project/files/puppetmaster/infracloud
View File

@ -1,130 +0,0 @@
[disabled:children]
[infracloud]
baremetal00.vanilla.ic.openstack.org
controller00.vanilla.ic.openstack.org
compute000.vanilla.ic.openstack.org
compute001.vanilla.ic.openstack.org
compute002.vanilla.ic.openstack.org
compute003.vanilla.ic.openstack.org
compute004.vanilla.ic.openstack.org
compute005.vanilla.ic.openstack.org
compute006.vanilla.ic.openstack.org
compute007.vanilla.ic.openstack.org
compute009.vanilla.ic.openstack.org
compute010.vanilla.ic.openstack.org
compute011.vanilla.ic.openstack.org
compute012.vanilla.ic.openstack.org
compute013.vanilla.ic.openstack.org
compute014.vanilla.ic.openstack.org
compute015.vanilla.ic.openstack.org
compute017.vanilla.ic.openstack.org
compute018.vanilla.ic.openstack.org
compute019.vanilla.ic.openstack.org
compute020.vanilla.ic.openstack.org
compute021.vanilla.ic.openstack.org
compute022.vanilla.ic.openstack.org
compute023.vanilla.ic.openstack.org
compute024.vanilla.ic.openstack.org
compute026.vanilla.ic.openstack.org
compute027.vanilla.ic.openstack.org
compute028.vanilla.ic.openstack.org
compute030.vanilla.ic.openstack.org
compute031.vanilla.ic.openstack.org
compute032.vanilla.ic.openstack.org
compute033.vanilla.ic.openstack.org
compute034.vanilla.ic.openstack.org
compute035.vanilla.ic.openstack.org
compute036.vanilla.ic.openstack.org
compute037.vanilla.ic.openstack.org
compute039.vanilla.ic.openstack.org
compute040.vanilla.ic.openstack.org
compute041.vanilla.ic.openstack.org
compute042.vanilla.ic.openstack.org
compute043.vanilla.ic.openstack.org
compute044.vanilla.ic.openstack.org
compute045.vanilla.ic.openstack.org
controller00.chocolate.ic.openstack.org
compute000.chocolate.ic.openstack.org
compute001.chocolate.ic.openstack.org
compute002.chocolate.ic.openstack.org
compute003.chocolate.ic.openstack.org
compute004.chocolate.ic.openstack.org
compute005.chocolate.ic.openstack.org
compute006.chocolate.ic.openstack.org
compute007.chocolate.ic.openstack.org
compute008.chocolate.ic.openstack.org
compute009.chocolate.ic.openstack.org
compute010.chocolate.ic.openstack.org
compute011.chocolate.ic.openstack.org
compute012.chocolate.ic.openstack.org
compute013.chocolate.ic.openstack.org
compute014.chocolate.ic.openstack.org
compute015.chocolate.ic.openstack.org
compute016.chocolate.ic.openstack.org
compute017.chocolate.ic.openstack.org
compute018.chocolate.ic.openstack.org
compute019.chocolate.ic.openstack.org
compute021.chocolate.ic.openstack.org
compute022.chocolate.ic.openstack.org
compute023.chocolate.ic.openstack.org
compute024.chocolate.ic.openstack.org
compute025.chocolate.ic.openstack.org
compute026.chocolate.ic.openstack.org
compute028.chocolate.ic.openstack.org
compute029.chocolate.ic.openstack.org
compute030.chocolate.ic.openstack.org
compute031.chocolate.ic.openstack.org
compute032.chocolate.ic.openstack.org
compute033.chocolate.ic.openstack.org
compute034.chocolate.ic.openstack.org
compute035.chocolate.ic.openstack.org
compute036.chocolate.ic.openstack.org
compute037.chocolate.ic.openstack.org
compute038.chocolate.ic.openstack.org
compute039.chocolate.ic.openstack.org
compute040.chocolate.ic.openstack.org
compute041.chocolate.ic.openstack.org
compute042.chocolate.ic.openstack.org
compute043.chocolate.ic.openstack.org
compute044.chocolate.ic.openstack.org
compute045.chocolate.ic.openstack.org
compute046.chocolate.ic.openstack.org
compute047.chocolate.ic.openstack.org
compute048.chocolate.ic.openstack.org
compute049.chocolate.ic.openstack.org
compute050.chocolate.ic.openstack.org
compute051.chocolate.ic.openstack.org
compute052.chocolate.ic.openstack.org
compute053.chocolate.ic.openstack.org
compute054.chocolate.ic.openstack.org
compute055.chocolate.ic.openstack.org
compute056.chocolate.ic.openstack.org
compute057.chocolate.ic.openstack.org
compute058.chocolate.ic.openstack.org
compute059.chocolate.ic.openstack.org
compute060.chocolate.ic.openstack.org
compute061.chocolate.ic.openstack.org
compute062.chocolate.ic.openstack.org
compute063.chocolate.ic.openstack.org
compute064.chocolate.ic.openstack.org
compute065.chocolate.ic.openstack.org
compute066.chocolate.ic.openstack.org
compute067.chocolate.ic.openstack.org
compute068.chocolate.ic.openstack.org
compute069.chocolate.ic.openstack.org
compute070.chocolate.ic.openstack.org
compute071.chocolate.ic.openstack.org
compute082.chocolate.ic.openstack.org
compute083.chocolate.ic.openstack.org
compute084.chocolate.ic.openstack.org
compute085.chocolate.ic.openstack.org
compute086.chocolate.ic.openstack.org
compute087.chocolate.ic.openstack.org
compute088.chocolate.ic.openstack.org
compute089.chocolate.ic.openstack.org
compute090.chocolate.ic.openstack.org
compute091.chocolate.ic.openstack.org
compute092.chocolate.ic.openstack.org
compute093.chocolate.ic.openstack.org
compute094.chocolate.ic.openstack.org

47
modules/openstack_project/manifests/puppetmaster.pp
View File

@ -82,17 +82,6 @@ class openstack_project::puppetmaster (
environment => 'PATH=/var/lib/gems/1.8/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
}
cron { 'updateinfracloud':
user => 'root',
minute => $puppetmaster_update_cron_interval[min],
hour => $puppetmaster_update_cron_interval[hour],
monthday => $puppetmaster_update_cron_interval[day],
month => $puppetmaster_update_cron_interval[month],
weekday => $puppetmaster_update_cron_interval[weekday],
command => 'flock -n /var/run/puppet/puppet_run_infracloud.lock bash /opt/system-config/production/run_infracloud.sh >> /var/log/puppet_run_infracloud_cron.log 2>&1',
environment => 'PATH=/var/lib/gems/1.8/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
}
logrotate::file { 'updatepuppetmaster':
ensure => present,
log => '/var/log/puppet_run_all.log',
@ -121,34 +110,6 @@ class openstack_project::puppetmaster (
require => Cron['updatepuppetmaster'],
}
logrotate::file { 'updateinfracloud':
ensure => present,
log => '/var/log/puppet_run_all_infracloud.log',
options => ['compress',
'copytruncate',
'delaycompress',
'missingok',
'rotate 7',
'daily',
'notifempty',
],
require => Cron['updateinfracloud'],
}
logrotate::file { 'updateinfracloudcron':
ensure => present,
log => '/var/log/puppet_run_infracloud_cron.log',
options => ['compress',
'copytruncate',
'delaycompress',
'missingok',
'rotate 7',
'daily',
'notifempty',
],
require => Cron['updateinfracloud'],
}
cron { 'deleteoldreports':
user => 'root',
hour => '3',
@ -343,14 +304,6 @@ class openstack_project::puppetmaster (
mode => '0664',
}
file { '/etc/ansible/hosts/infracloud':
ensure => present,
owner => 'root',
group => 'root',
mode => '0644',
source => 'puppet:///modules/openstack_project/puppetmaster/infracloud',
}
file { '/etc/ansible/groups.txt':
owner => 'root',
group => 'root',

12
modules/openstack_project/templates/nodepool/clouds.yaml.erb
View File

@ -51,18 +51,6 @@ clouds:
password: '<%= @vexxhost_password %>'
project_name: '<%= @vexxhost_project %>'
image_format: 'raw'
infracloud-chocolate:
api_timeout: 60
auth:
auth_url: https://controller00.chocolate.ic.openstack.org:5000
username: '<%= @infracloud_chocolate_username %>'
password: '<%= @infracloud_chocolate_password %>'
project_name: '<%= @infracloud_chocolate_project %>'
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
floating_ip_source: None
cacert: /home/nodepool/.config/openstack/infracloud_chocolate_cacert.pem
citycloud:
regions:
- Lon1