Replace secret key with appropriate value during provisioning in

all platforms, removed the platform check Closes-Bug: 1390325 Change-Id: Id7bfd22101d4bfa566b4a4a3b510bf4746cd3e63
Juniper · Nov 7, 2014 · 1a500b4 · 1a500b4
1 parent 1afe5da
commit 1a500b4
Showing 1 changed file with 5 additions and 6 deletions.
diff --git 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")