From 1a500b479e58387d85df5086825917c0e485ec24 Mon Sep 17 00:00:00 2001 From: Ignatious Johnson Date: Thu, 6 Nov 2014 21:57:02 -0800 Subject: [PATCH] Replace secret key with appropriate value during provisioning in all platforms, removed the platform check Closes-Bug: 1390325 Change-Id: Id7bfd22101d4bfa566b4a4a3b510bf4746cd3e63 --- contrail_provisioning/control/setup.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/contrail_provisioning/control/setup.py b/contrail_provisioning/control/setup.py index 13176b4a..13ef3a5d 100755 --- a/contrail_provisioning/control/setup.py +++ b/contrail_provisioning/control/setup.py @@ -84,12 +84,11 @@ def fixup_dns(self): self._template_substitute_write(dns_conf.template, dns_template_vals, self._temp_dir_name + '/dns.conf') local("sudo mv %s/dns.conf /etc/contrail/dns.conf" %(self._temp_dir_name)) - if self.pdist == 'Ubuntu': - for confl in 'rndc named'.split(): - local("".join(["sudo perl -pi -e ", - "'s/(\\s*secret\\s+\").*\"\\s*;/", - "\\1xvysmOR8lnUQRBcunkC6vg==\";/g;'", - " /etc/contrail/dns/%s.conf" % confl])) + for confl in 'rndc named'.split(): + local("".join(["sudo perl -pi -e ", + "'s/(\\s*secret\\s+\").*\"\\s*;/", + "\\1xvysmOR8lnUQRBcunkC6vg==\";/g;'", + " /etc/contrail/dns/%s.conf" % confl])) def run_services(self): local("sudo control-server-setup.sh")