diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-10-19 18:06:08 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-10-19 18:06:08 -0200 |
| commit | 3315926c54b6267113f5ac49941cb58948658e9c (patch) | |
| tree | bae80a57587632965afc1a481a29f3a03a483774 /share/hydra/newnode | |
| parent | c48c4abab75794f6e1b91e841bfd9736e1c189a8 (diff) | |
| download | hydra-3315926c54b6267113f5ac49941cb58948658e9c.tar.gz hydra-3315926c54b6267113f5ac49941cb58948658e9c.tar.bz2 | |
Newnode: check if node was given by fqdn or just hostname
Diffstat (limited to 'share/hydra/newnode')
| -rwxr-xr-x | share/hydra/newnode | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/share/hydra/newnode b/share/hydra/newnode index b375b8a..3f614c3 100755 --- a/share/hydra/newnode +++ b/share/hydra/newnode @@ -41,9 +41,14 @@ fi # Domain DOMAIN="`cat $HYDRA_FOLDER/config/domain`" +# Check if node was given by fqdn or just hostname +if ! echo $NODE | grep -q '\.'; then + $NODE="$NODE.$DOMAIN" +fi + # Create node if [ -e "$NODES" ]; then - echo "import \"nodes/$NODE.$DOMAIN.pp\"" >> $NODES + echo "import \"nodes/$NODE.pp\"" >> $NODES fi # Set YAML template @@ -62,24 +67,24 @@ fi # Copy YAML template mkdir -p $HYDRA_FOLDER/puppet/hiera/node -cp $YAML $HYDRA_FOLDER/puppet/hiera/node/$NODE.$DOMAIN.yaml +cp $YAML $HYDRA_FOLDER/puppet/hiera/node/$NODE.yaml # Setup secret YAML template mkdir -p $HYDRA_FOLDER/puppet/hiera/secrets/node -echo "---" > $HYDRA_FOLDER/puppet/hiera/secrets/node/$NODE.$DOMAIN.yaml +echo "---" > $HYDRA_FOLDER/puppet/hiera/secrets/node/$NODE.yaml # Copy node template mkdir -p $HYDRA_FOLDER/puppet/manifests/nodes -cp $PP $HYDRA_FOLDER/puppet/manifests/nodes/$NODE.$DOMAIN.pp +cp $PP $HYDRA_FOLDER/puppet/manifests/nodes/$NODE.pp # Edit the template -sed -i -e "s/nodename/$NODE/g" $HYDRA_FOLDER/puppet/manifests/nodes/$NODE.$DOMAIN.pp -sed -i -e "s/example.org/$DOMAIN/g" $HYDRA_FOLDER/puppet/manifests/nodes/$NODE.$DOMAIN.pp +sed -i -e "s/nodename/$NODE/g" $HYDRA_FOLDER/puppet/manifests/nodes/$NODE.pp +sed -i -e "s/example.org/$DOMAIN/g" $HYDRA_FOLDER/puppet/manifests/nodes/$NODE.pp # Add to git ( cd $HYDRA_FOLDER/puppet - git add manifests/nodes/$NODE.pp hiera/node/$NODE.$DOMAIN.yaml hiera/secrets/node/$NODE.$DOMAIN.yaml + git add manifests/nodes/$NODE.pp hiera/node/$NODE.yaml hiera/secrets/node/$NODE.yaml if [ -e 'manifests/site.pp' ]; then git add manifests/site.pp |