Skip to content

Commit 3b23d5a

Browse files
fmaximusyadvr
authored andcommitted
CLOUDSTACK-10245: Fix password server regression (#2419)
In case of isolated, both self.config.is_vpc() and self.config.is_router() are false, but self.config.is_dhcp() is true. Moved the password server logic to the `if has_metadata` block, as this is valid for all 3 systemvm types.
1 parent 2ca264c commit 3b23d5a

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

systemvm/debian/opt/cloud/bin/cs/CsAddress.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -556,14 +556,6 @@ def post_config_change(self, method):
556556
if self.config.is_vpc() or self.config.is_router():
557557
CsDevice(self.dev, self.config).configure_rp()
558558

559-
# If redundant then this is dealt with
560-
# by the master backup functions
561-
if not cmdline.is_redundant():
562-
if method == "add":
563-
CsPasswdSvc(self.address['public_ip']).start()
564-
elif method == "delete":
565-
CsPasswdSvc(self.address['public_ip']).stop()
566-
567559
logging.error(
568560
"Not able to setup source-nat for a regular router yet")
569561

@@ -575,6 +567,14 @@ def post_config_change(self, method):
575567
app = CsApache(self)
576568
app.setup()
577569

570+
# If redundant then this is dealt with
571+
# by the master backup functions
572+
if not cmdline.is_redundant():
573+
if method == "add":
574+
CsPasswdSvc(self.address['public_ip']).start()
575+
elif method == "delete":
576+
CsPasswdSvc(self.address['public_ip']).stop()
577+
578578
if self.get_type() == "public" and self.config.is_vpc() and method == "add":
579579
if self.address["source_nat"]:
580580
vpccidr = cmdline.get_vpccidr()

0 commit comments

Comments
 (0)