From 4f8ab04db81191b3a1608e150db1ad6cedfc38d4 Mon Sep 17 00:00:00 2001 From: wangyaoguang Date: Tue, 10 May 2016 14:38:55 +0800 Subject: inject dns_alt_names into puppet.conf There were cert issues when puppet agents use old hostname 'rubbos-control'. This can be eliminated by adding dns-alt_names in puppet.conf JIRA: BOTTLENECK-75 Change-Id: Id483ca2792b8faef6ab87788371e60ce8e390b5e Signed-off-by: wangyaoguang --- utils/infra_setup/user_data/p-agent-user-data | 1 + utils/infra_setup/user_data/p-master-user-data | 1 + 2 files changed, 2 insertions(+) diff --git a/utils/infra_setup/user_data/p-agent-user-data b/utils/infra_setup/user_data/p-agent-user-data index 2641c900..6ec191b8 100644 --- a/utils/infra_setup/user_data/p-agent-user-data +++ b/utils/infra_setup/user_data/p-agent-user-data @@ -10,5 +10,6 @@ runcmd: - sed -i '/^factpath/a runinterval=1d' /etc/puppet/puppet.conf - sed -i '/^templatedir/d' /etc/puppet/puppet.conf - sed -i 's/START=no/START=yes/g' /etc/default/puppet + - sed -i '/^\[master\]/a dns_alt_names=REPLACED_PUPPET_MASTER_SERVER' /etc/puppet/puppet.conf final_message: "The system with puppet is finally up, after $UPTIME seconds." diff --git a/utils/infra_setup/user_data/p-master-user-data b/utils/infra_setup/user_data/p-master-user-data index 05d137dd..76087259 100644 --- a/utils/infra_setup/user_data/p-master-user-data +++ b/utils/infra_setup/user_data/p-master-user-data @@ -9,5 +9,6 @@ runcmd: - sed -i '/^factpath/a server=REPLACED_PUPPET_MASTER_SERVER' /etc/puppet/puppet.conf - sed -i '/^factpath/a runinterval=1d' /etc/puppet/puppet.conf - sed -i '/^templatedir/d' /etc/puppet/puppet.conf + - sed -i '/^\[master\]/a dns_alt_names=REPLACED_PUPPET_MASTER_SERVER' /etc/puppet/puppet.conf final_message: "The system with puppet is finally up, after $UPTIME seconds." -- cgit 1.2.3-korg