Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: setup: always use public http/https ports
......................................................................
packaging: setup: always use public http/https ports
Change-Id: I560efda78530d493bdb1cb1d7475288da9e9c7d6
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-rename/core/tools.py
M packaging/setup/plugins/ovirt-engine-setup/config/tools.py
M packaging/setup/plugins/ovirt-engine-setup/network/firewall.py
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/18774/1
diff --git a/packaging/setup/plugins/ovirt-engine-rename/core/tools.py
b/packaging/setup/plugins/ovirt-engine-rename/core/tools.py
index b2eefe6..ee7f01b 100644
--- a/packaging/setup/plugins/ovirt-engine-rename/core/tools.py
+++ b/packaging/setup/plugins/ovirt-engine-rename/core/tools.py
@@ -78,7 +78,7 @@
osetupcons.RenameEnv.FQDN
],
self.environment[
- osetupcons.ConfigEnv.HTTPS_PORT
+ osetupcons.ConfigEnv.PUBLIC_HTTPS_PORT
],
)
content.append(line)
diff --git a/packaging/setup/plugins/ovirt-engine-setup/config/tools.py
b/packaging/setup/plugins/ovirt-engine-setup/config/tools.py
index 890f883..d9b2ab9 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/config/tools.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/config/tools.py
@@ -84,7 +84,7 @@
osetupcons.ConfigEnv.FQDN
],
port=self.environment[
- osetupcons.ConfigEnv.HTTPS_PORT
+ osetupcons.ConfigEnv.PUBLIC_HTTPS_PORT
],
user=osetupcons.Const.USER_ADMIN,
domain=osetupcons.Const.DOMAIN_INTERNAL,
diff --git a/packaging/setup/plugins/ovirt-engine-setup/network/firewall.py
b/packaging/setup/plugins/ovirt-engine-setup/network/firewall.py
index 79f4934..f912892 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/network/firewall.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/network/firewall.py
@@ -52,10 +52,10 @@
osetupcons.NetEnv.FIREWALLD_SUBST
].update({
'@HTTP_PORT@': self.environment[
- osetupcons.ConfigEnv.HTTP_PORT
+ osetupcons.ConfigEnv.PUBLIC_HTTP_PORT
],
'@HTTPS_PORT@': self.environment[
- osetupcons.ConfigEnv.HTTPS_PORT
+ osetupcons.ConfigEnv.PUBLIC_HTTPS_PORT
],
'@JBOSS_HTTP_PORT@': self.environment[
osetupcons.ConfigEnv.JBOSS_DIRECT_HTTP_PORT
--
To view, visit http://gerrit.ovirt.org/18774
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I560efda78530d493bdb1cb1d7475288da9e9c7d6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
