Merge "Cease using ci-puppetmaster.openstack.org"
This commit is contained in:
commit
0017d8f948
@ -171,14 +171,6 @@ node 'community.openstack.org' {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Node-OS: precise
|
|
||||||
node 'ci-puppetmaster.openstack.org' {
|
|
||||||
class { 'openstack_project::puppetmaster':
|
|
||||||
root_rsa_key => hiera('puppetmaster_root_rsa_key', 'XXX'),
|
|
||||||
sysadmins => hiera('sysadmins', []),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Node-OS: precise
|
# Node-OS: precise
|
||||||
node 'puppetmaster.openstack.org' {
|
node 'puppetmaster.openstack.org' {
|
||||||
class { 'openstack_project::puppetmaster':
|
class { 'openstack_project::puppetmaster':
|
||||||
|
@ -1,14 +0,0 @@
|
|||||||
---
|
|
||||||
- hosts: git0*
|
|
||||||
gather_facts: false
|
|
||||||
max_fail_percentage: 1
|
|
||||||
roles:
|
|
||||||
- { role: puppet, puppetmaster: ci-puppetmaster.openstack.org }
|
|
||||||
- hosts: review.openstack.org
|
|
||||||
gather_facts: false
|
|
||||||
roles:
|
|
||||||
- { role: puppet, puppetmaster: ci-puppetmaster.openstack.org }
|
|
||||||
- hosts: "!review.openstack.org:!git0*"
|
|
||||||
gather_facts: false
|
|
||||||
roles:
|
|
||||||
- { role: puppet, puppetmaster: ci-puppetmaster.openstack.org }
|
|
@ -102,14 +102,18 @@ class openstack_project::base(
|
|||||||
ensure => absent,
|
ensure => absent,
|
||||||
user => 'root',
|
user => 'root',
|
||||||
}
|
}
|
||||||
|
|
||||||
ssh_authorized_key { 'puppet-remote-2014-09-11':
|
ssh_authorized_key { 'puppet-remote-2014-09-11':
|
||||||
|
ensure => absent,
|
||||||
|
user => 'root',
|
||||||
|
}
|
||||||
|
|
||||||
|
ssh_authorized_key { 'puppet-remote-2014-09-15':
|
||||||
ensure => present,
|
ensure => present,
|
||||||
user => 'root',
|
user => 'root',
|
||||||
type => 'ssh-rsa',
|
type => 'ssh-rsa',
|
||||||
key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDSLlN41ftgxkNeUi/kATYPwMPjJdMaSbgokSb9PSkRPZE7GeNai60BCfhu+ky8h5eMe70Bpwb7mQ7GAtHGXPNU1SRBPhMuVN9EYrQbt5KSiwuiTXtQHsWyYrSKtB+XGbl2PhpMQ/TPVtFoL5usxu/MYaakVkCEbt5IbPYNg88/NKPixicJuhi0qsd+l1X1zoc1+Fn87PlwMoIgfLIktwaL8hw9mzqr+pPcDIjCFQQWnjqJVEObOcMstBT20XwKj/ymiH+6p123nnlIHilACJzXhmIZIZO+EGkNF7KyXpcBSfv9efPI+VCE2TOv/scJFdEHtDFkl2kdUBYPC0wQ92rp',
|
key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDSLlN41ftgxkNeUi/kATYPwMPjJdMaSbgokSb9PSkRPZE7GeNai60BCfhu+ky8h5eMe70Bpwb7mQ7GAtHGXPNU1SRBPhMuVN9EYrQbt5KSiwuiTXtQHsWyYrSKtB+XGbl2PhpMQ/TPVtFoL5usxu/MYaakVkCEbt5IbPYNg88/NKPixicJuhi0qsd+l1X1zoc1+Fn87PlwMoIgfLIktwaL8hw9mzqr+pPcDIjCFQQWnjqJVEObOcMstBT20XwKj/ymiH+6p123nnlIHilACJzXhmIZIZO+EGkNF7KyXpcBSfv9efPI+VCE2TOv/scJFdEHtDFkl2kdUBYPC0wQ92rp',
|
||||||
options => [
|
options => [
|
||||||
'from="ci-puppetmaster.openstack.org,puppetmaster.openstack.org"',
|
'from="puppetmaster.openstack.org"',
|
||||||
],
|
],
|
||||||
require => File['/root/.ssh'],
|
require => File['/root/.ssh'],
|
||||||
}
|
}
|
||||||
|
@ -18,11 +18,7 @@ class openstack_project::puppetmaster (
|
|||||||
ca_server => $ca_server,
|
ca_server => $ca_server,
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($version == '2.7.'){
|
$ansible_remote_puppet_source = 'puppet:///modules/openstack_project/ansible/remote_puppet.yaml'
|
||||||
$ansible_remote_puppet_source = 'puppet:///modules/openstack_project/ansible/remote_puppet2.yaml'
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
$ansible_remote_puppet_source = 'puppet:///modules/openstack_project/ansible/remote_puppet3.yaml'
|
|
||||||
|
|
||||||
file {'/etc/puppet/environments':
|
file {'/etc/puppet/environments':
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
@ -43,7 +39,6 @@ class openstack_project::puppetmaster (
|
|||||||
mode => '0644',
|
mode => '0644',
|
||||||
source => 'puppet:///modules/openstack_project/puppetmaster/production_environment.conf',
|
source => 'puppet:///modules/openstack_project/puppetmaster/production_environment.conf',
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
class { 'ansible':
|
class { 'ansible':
|
||||||
ansible_hostfile => '/etc/ansible/hostfile',
|
ansible_hostfile => '/etc/ansible/hostfile',
|
||||||
|
@ -86,8 +86,5 @@ Subsystem sftp <%= scope.lookupvar('::ssh::params::sftp_path') %>
|
|||||||
UsePAM yes
|
UsePAM yes
|
||||||
|
|
||||||
# allow ansible connections from puppetmaster host
|
# allow ansible connections from puppetmaster host
|
||||||
Match host ci-puppetmaster.openstack.org
|
|
||||||
PermitRootLogin without-password
|
|
||||||
|
|
||||||
Match host puppetmaster.openstack.org
|
Match host puppetmaster.openstack.org
|
||||||
PermitRootLogin without-password
|
PermitRootLogin without-password
|
||||||
|
Loading…
Reference in New Issue
Block a user