From 172e6e67ddc682c601754226c619cc675dd4cfc9 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Mon, 13 Apr 2015 16:20:20 +0200 Subject: [PATCH] New nodes should install puppet from install_puppet.sh The install_puppet.sh script installs several things needed by new nodes besides puppet (like pip), so making an 'apt-get install puppet' is not sufficient. This also matches the behavior from launch-node.py, which leverages install_puppet.sh to install puppet on new nodes. Change-Id: I90a68b0918dcdaac136bc107ac8a1dd76f00128f --- doc/source/puppet.rst | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/source/puppet.rst b/doc/source/puppet.rst index 34e82119f4..7b832d96d0 100644 --- a/doc/source/puppet.rst +++ b/doc/source/puppet.rst @@ -73,12 +73,18 @@ file should have mode 0600. Adding a node ------------- -On the new server connecting (for example, review.openstack.org) to -the puppet master: +For adding a new node to your puppet master, you can either use the +``/opt/system-config/production/launch/launch-node.py`` script +(see :file:`launch/README` for full details) or bootstrap puppet manually. + +For manual bootstrap, you need to run on the new server connecting +(for example, review.openstack.org) to the puppet master: .. code-block:: bash - sudo apt-get install puppet + sudo su - + wget https://git.openstack.org/cgit/openstack-infra/system-config/plain/install_puppet.sh + bash -x install_puppet.sh The node then needs to be configured to set a fixed hostname and the hostname of the puppet master with the following additions to