From b23025acaa74602bdddb77d979244de8fbd808c6 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 30 Nov 2015 07:44:10 -0600 Subject: [PATCH] Fix three nits These were caught in earlier reviews. Change-Id: I026678fbbe871ffb138fd2c0dba9e788457da3a0 --- doc/source/sysadmin.rst | 2 +- launch/launch-node.py | 3 ++- modules/openstack_project/manifests/puppetmaster.pp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/source/sysadmin.rst b/doc/source/sysadmin.rst index 6aa8675ba5..d0ff64b7ca 100644 --- a/doc/source/sysadmin.rst +++ b/doc/source/sysadmin.rst @@ -299,7 +299,7 @@ puppet at times when landing a change to the puppet repo would be either unreasonable or impossible. There are two sections in each file, `disabled` and `disabled:children`. Due -to te multi-cloud nature of the ansible inventory, a hostname cannot be counted +to the multi-cloud nature of the ansible inventory, a hostname cannot be counted on to be unique, so each cloud instance is listed in the inventory by its UUID with a group created for its hostname. If you want to disable a cloud instance by name, you need to put its name in `disabled:children`. If you want diff --git a/launch/launch-node.py b/launch/launch-node.py index b4beae0aa1..dac4d485bd 100755 --- a/launch/launch-node.py +++ b/launch/launch-node.py @@ -298,7 +298,8 @@ def main(): dns.print_dns(client, options.name) # Remove the ansible inventory cache so that next run finds the new # server - os.unlink('/var/cache/ansible-inventory.json') + if os.path.exists('/var/cache/ansible-inventory/ansible-inventory.cache'): + os.unlink('/var/cache/ansible-inventory/ansible-inventory.cache') if __name__ == '__main__': main() diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp index ca694d677c..0cf515ef6d 100644 --- a/modules/openstack_project/manifests/puppetmaster.pp +++ b/modules/openstack_project/manifests/puppetmaster.pp @@ -207,6 +207,6 @@ class openstack_project::puppetmaster ( ensure => present, owner => 'root', group => 'root', - mode => '0444', + mode => '0644', } }