Cease using ci-puppetmaster.openstack.org

Now that the migration to puppetmaster.openstack.org is complete,
remove duplicate references to ci-puppetmaster.openstack.org and
also take out the temporary Puppet v2 vs v3 compatibility code used
to choose between them.

Change-Id: I32d48e844ab1872391f9f2a4e233804b7a29feb5
This commit is contained in:
Jeremy Stanley 2014-09-15 18:10:25 +00:00
parent 34c7abd85d
commit 3d76cd02b4
1 changed files with 0 additions and 3 deletions

View File

@ -86,8 +86,5 @@ Subsystem sftp <%= scope.lookupvar('::ssh::params::sftp_path') %>
UsePAM yes
# allow ansible connections from puppetmaster host
Match host ci-puppetmaster.openstack.org
PermitRootLogin without-password
Match host puppetmaster.openstack.org
PermitRootLogin without-password