From gerrit at ovirt.org  Fri Jan  6 17:03:14 2017
From: gerrit at ovirt.org (Code Review)
Date: Fri, 6 Jan 2017 12:03:14 -0500
Subject: [node-patches] Change in ovirt-node[master]: Satellite 6: Fixed
	registration process for Red Hat Satellit...
In-Reply-To: <gerrit.1481320406962.Id133817a3d511c78dc5ed6b6975b6066b0f7b438@gerrit.ovirt.org>
References: <gerrit.1481320406962.Id133817a3d511c78dc5ed6b6975b6066b0f7b438@gerrit.ovirt.org>
Message-ID: <201701061703.v06H3EeF026937@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: Satellite 6: Fixed registration process for Red Hat Satellite 6.2
......................................................................


Patch Set 1: Code-Review+2 Continuous-Integration+1 Verified+1

-- 
To view, visit https://gerrit.ovirt.org/68076
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id133817a3d511c78dc5ed6b6975b6066b0f7b438
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Marcelo Moreira de Mello <mmello at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Marcelo Moreira de Mello <mmello at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Fri Jan  6 17:03:17 2017
From: gerrit at ovirt.org (Code Review)
Date: Fri, 6 Jan 2017 12:03:17 -0500
Subject: [node-patches] Change in ovirt-node[master]: Satellite 6: Fixed
	registration process for Red Hat Satellit...
In-Reply-To: <gerrit.1481320406962.Id133817a3d511c78dc5ed6b6975b6066b0f7b438@gerrit.ovirt.org>
References: <gerrit.1481320406962.Id133817a3d511c78dc5ed6b6975b6066b0f7b438@gerrit.ovirt.org>
Message-ID: <201701061703.v06H3HrD026948@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: Satellite 6: Fixed registration process for Red Hat Satellite 6.2
......................................................................


Satellite 6: Fixed registration process for Red Hat Satellite 6.2

This fix handles the katello-server-ca.crt distributed by
Red Hat Satellite 6.2 or higher at http://<FQDN>/pub directory.

It also added some requirements enforced by subscription-manager
to allow a system to be registered at Satellite 6
(environment and organization).

Change-Id: Id133817a3d511c78dc5ed6b6975b6066b0f7b438
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1339883
Signed-off-by: Marcelo Moreira de Mello <mmello at redhat.com>
---
M src/ovirt/node/setup/rhn/rhn_model.py
M src/ovirt/node/setup/rhn/rhn_page.py
2 files changed, 58 insertions(+), 18 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests
  Marcelo Moreira de Mello: Verified
  Ryan Barry: Looks good to me, but someone else must approve



-- 
To view, visit https://gerrit.ovirt.org/68076
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id133817a3d511c78dc5ed6b6975b6066b0f7b438
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Marcelo Moreira de Mello <mmello at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Marcelo Moreira de Mello <mmello at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>

From gerrit at ovirt.org  Fri Jan  6 17:03:25 2017
From: gerrit at ovirt.org (Code Review)
Date: Fri, 6 Jan 2017 12:03:25 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: Satellite 6: Fixed
	registration process for Red Hat Satellit...
Message-ID: <gerrit.1483722205527.Id133817a3d511c78dc5ed6b6975b6066b0f7b438@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: Satellite 6: Fixed registration process for Red Hat Satellite 6.2
......................................................................

Satellite 6: Fixed registration process for Red Hat Satellite 6.2

This fix handles the katello-server-ca.crt distributed by
Red Hat Satellite 6.2 or higher at http://<FQDN>/pub directory.

It also added some requirements enforced by subscription-manager
to allow a system to be registered at Satellite 6
(environment and organization).

Change-Id: Id133817a3d511c78dc5ed6b6975b6066b0f7b438
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1339883
Signed-off-by: Marcelo Moreira de Mello <mmello at redhat.com>
(cherry picked from commit 0189cbb86b171440142711d78770f41c349db590)
---
M src/ovirt/node/setup/rhn/rhn_model.py
M src/ovirt/node/setup/rhn/rhn_page.py
2 files changed, 58 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/67/69767/1

diff --git a/src/ovirt/node/setup/rhn/rhn_model.py b/src/ovirt/node/setup/rhn/rhn_model.py
index 7b0a4f9..c12b8c0 100755
--- a/src/ovirt/node/setup/rhn/rhn_model.py
+++ b/src/ovirt/node/setup/rhn/rhn_model.py
@@ -29,6 +29,8 @@
 import requests
 import urlparse
 
+DEFAULT_CA_SAT6 = 'katello-server-ca'
+
 
 class RHN(NodeConfigFileSection):
     """Configure RHN
@@ -43,12 +45,13 @@
             "OVIRT_RHN_PROFILE",
             "OVIRT_RHN_ACTIVATIONKEY",
             "OVIRT_RHN_ORG",
+            "OVIRT_RHN_ENVIRONMENT",
             "OVIRT_RHN_PROXY",
             "OVIRT_RHN_PROXYUSER")
 
     @NodeConfigFileSection.map_and_update_defaults_decorator
     def update(self, rhntype, url, ca_cert, username, profile,
-               activationkey, org, proxy, proxyuser):
+               activationkey, org, environment, proxy, proxyuser):
         pass
 
     def retrieve(self):
@@ -335,7 +338,7 @@
                     host, port, prefix = RHN().parse_host_uri(cfg["url"])
 
                     # Default to /rhsm for Satellite 6
-                    if cfg["ca_cert"].endswith(".pem") and \
+                    if DEFAULT_CA_SAT6 in cfg["ca_cert"] and \
                        cfg["rhntype"] == "satellite":
                         prefix = "/rhsm"
 
@@ -353,7 +356,7 @@
 
                 # Figure out what other arguments need to be set
                 # If there's a ca certificate or it's satellite, it's sat6
-                if cfg["ca_cert"] and not cfg["ca_cert"].endswith(".pem") or \
+                if cfg["ca_cert"] and DEFAULT_CA_SAT6 in cfg["ca_cert"] and \
                    cfg["rhntype"] == "satellite":
                     mapping["--server.prefix"] = prefix
                 else:
@@ -426,6 +429,7 @@
 
                 mapping = {"--activationkey": cfg["activationkey"],
                            "--org":           cfg["org"],
+                           "--environment":   cfg["environment"],
                            "--username":      cfg["username"],
                            "--password":      password,
                            "--name":          cfg["profile"],
@@ -446,9 +450,8 @@
                                                       "/password combination",
                                "already been taken":  "This hostname is "
                                                       "already registered",
-                               "Organization":        "Organization must be "
-                                                      "specified with "
-                                                      "Satellite 6"}
+                               "Organization":        "Organization not found "
+                                                      "on Satellite 6"}
                     for k, v in mapping.items():
                         if k in smreg_output:
                             raise RuntimeError(v)
@@ -507,17 +510,51 @@
 
         self.logger.debug(cfg)
         rhntype = cfg["rhntype"]
-        cacert = cfg["ca_cert"] or ""
         tx = utils.Transaction("Performing entitlement registration")
         tx.append(RemoveConfigs())
 
-        if rhntype == "sam" or cacert.endswith(".pem") or \
+        if rhntype == "sam" or \
+           (rhntype == "satellite" and DEFAULT_CA_SAT6 in cfg["ca_cert"]) or \
            (system.is_min_el(7) and rhntype == "rhn"):
-            if rhntype == "satellite" and not cfg["org"]:
-                del tx[0]
-                tx.extend([RaiseError("Registration to Satellite 6 requires "
-                                      "an organization to be set")])
-                return tx
+            if rhntype == "satellite":
+                if cfg["activationkey"]:
+                    if not cfg["org"]:
+                        del tx[0]
+                        tx.extend([RaiseError(
+                                        "Registration to Satellite "
+                                        "6 with activation key requires "
+                                        "an organization to be set")])
+                        return tx
+                    if cfg["environment"]:
+                        del tx[0]
+                        tx.extend([RaiseError(
+                                        "Registration to Satellite 6 with "
+                                        "activation key do not allow "
+                                        "environments to be specified")])
+                        return tx
+                    if cfg["username"] or password:
+                        del tx[0]
+                        tx.extend([RaiseError(
+                                        "Registration to Satellite 6 with an "
+                                        "activation key do not require "
+                                        "credentials")])
+                        return tx
+                else:
+                    if not cfg["org"] or not cfg["environment"]:
+                        del tx[0]
+                        tx.extend([RaiseError(
+                                        "Registration to Satellite 6 requires "
+                                        "an organization and environment to "
+                                        "be set")])
+                        return tx
+
+                    if not cfg["username"] or not password:
+                        del tx[0]
+                        tx.extend([RaiseError(
+                                        "Registration to Satellite 6 without "
+                                        "an activation key requires user "
+                                        "credentials")])
+                        return tx
 
             if cfg["proxy"]:
                 tx.append(ConfigureSAMProxy())
diff --git a/src/ovirt/node/setup/rhn/rhn_page.py b/src/ovirt/node/setup/rhn/rhn_page.py
index 74862ad..78fc96d 100755
--- a/src/ovirt/node/setup/rhn/rhn_page.py
+++ b/src/ovirt/node/setup/rhn/rhn_page.py
@@ -55,6 +55,7 @@
                  "rhn.url": cfg["url"],
                  "rhn.ca": cfg["ca_cert"],
                  "rhn.org": cfg["org"],
+                 "rhn.environment": cfg["environment"],
                  "rhn.activation_key": cfg["activationkey"],
                  "rhn.proxyuser": cfg["proxyuser"],
                  "rhn.proxyhost": "",
@@ -63,9 +64,8 @@
                  "rhn.proxypassword": "",
                  }
         try:
-            model["rhn.proxyhost"], model["rhn.proxyport"] = cfg["proxy"
-                                                                 ].rsplit(
-                ":", 1)
+            model["rhn.proxyhost"], \
+                model["rhn.proxyport"] = cfg["proxy"].rsplit(":", 1)
         except:
             # We're passing because it can't assign multiple values, reassign
             # instead of passing
@@ -82,6 +82,7 @@
                 "rhn.proxyport": valid.Port() | valid.Empty(),
                 "rhn.proxyuser": valid.Text() | valid.Empty(),
                 "rhn.org": valid.Text() | valid.Empty(),
+                "rhn.environment": valid.Text() | valid.Empty(),
                 "rhn.activation_key": valid.Text() | valid.Empty(),
                 }
 
@@ -117,6 +118,7 @@
                   ui.Entry("rhn.url", "URL:"),
                   ui.Entry("rhn.ca", "CA URL:"),
                   ui.Entry("rhn.org", "Organization:"),
+                  ui.Entry("rhn.environment", "Environment:"),
                   ui.Entry("rhn.activation_key", "Activation Key:"),
                   ui.Button("button.proxy", "HTTP Proxy Configuration"),
                   ]
@@ -135,6 +137,7 @@
                     self.widgets["rhn.url"].enabled(True)
                     self.widgets["rhn.ca"].enabled(True)
                     self.widgets["rhn.org"].enabled(True)
+                    self.widgets["rhn.environment"].enabled(True)
                     self.widgets["rhn.activation_key"].enabled(True)
                     self.stash_pop_change("rhn.url", reuse_old=True)
                     self.stash_pop_change("rhn.ca", reuse_old=True)
@@ -163,7 +166,7 @@
         rhn_keys = ["rhn.username", "rhn.password", "rhn.profilename",
                     "rhn.type", "rhn.url", "rhn.ca", "rhn.proxyhost",
                     "rhn.proxyport", "rhn.proxyuser", "rhn.proxypassword",
-                    "rhn.org", "rhn.activation_key"]
+                    "rhn.org", "rhn.environment", "rhn.activation_key"]
 
         if "button.proxy" in changes:
             description = ("Please enter the proxy details to use " +
@@ -206,7 +209,7 @@
 
             rhn_keys = ["rhn.type", "rhn.url", "rhn.ca", "rhn.username",
                         "rhn.profilename", "rhn.activation_key", "rhn.org",
-                        "rhn.proxy", "rhn.proxyuser"]
+                        "rhn.environment", "rhn.proxy", "rhn.proxyuser"]
 
             pw = effective_model["rhn.password"]
             proxypassword = effective_model["rhn.proxypassword"]


-- 
To view, visit https://gerrit.ovirt.org/69767
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id133817a3d511c78dc5ed6b6975b6066b0f7b438
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Marcelo Moreira de Mello <mmello at redhat.com>

From gerrit at ovirt.org  Fri Jan  6 17:03:36 2017
From: gerrit at ovirt.org (Code Review)
Date: Fri, 6 Jan 2017 12:03:36 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: Satellite 6: Fixed
	registration process for Red Hat Satellit...
In-Reply-To: <gerrit.1483722205527.Id133817a3d511c78dc5ed6b6975b6066b0f7b438@gerrit.ovirt.org>
References: <gerrit.1483722205527.Id133817a3d511c78dc5ed6b6975b6066b0f7b438@gerrit.ovirt.org>
Message-ID: <201701061703.v06H3aC2026990@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: Satellite 6: Fixed registration process for Red Hat Satellite 6.2
......................................................................


Patch Set 1: Code-Review+2 Continuous-Integration+1 Verified+1

-- 
To view, visit https://gerrit.ovirt.org/69767
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id133817a3d511c78dc5ed6b6975b6066b0f7b438
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Marcelo Moreira de Mello <mmello at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Fri Jan  6 17:03:42 2017
From: gerrit at ovirt.org (Code Review)
Date: Fri, 6 Jan 2017 12:03:42 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: Satellite 6: Fixed
	registration process for Red Hat Satellit...
In-Reply-To: <gerrit.1483722205527.Id133817a3d511c78dc5ed6b6975b6066b0f7b438@gerrit.ovirt.org>
References: <gerrit.1483722205527.Id133817a3d511c78dc5ed6b6975b6066b0f7b438@gerrit.ovirt.org>
Message-ID: <201701061703.v06H3gwO027016@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: Satellite 6: Fixed registration process for Red Hat Satellite 6.2
......................................................................


Patch Set 1:

backport only

-- 
To view, visit https://gerrit.ovirt.org/69767
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id133817a3d511c78dc5ed6b6975b6066b0f7b438
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcelo Moreira de Mello <mmello at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Fri Jan  6 17:04:03 2017
From: gerrit at ovirt.org (Code Review)
Date: Fri, 6 Jan 2017 12:04:03 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: Satellite 6: Fixed
	registration process for Red Hat Satellit...
In-Reply-To: <gerrit.1483722205527.Id133817a3d511c78dc5ed6b6975b6066b0f7b438@gerrit.ovirt.org>
References: <gerrit.1483722205527.Id133817a3d511c78dc5ed6b6975b6066b0f7b438@gerrit.ovirt.org>
Message-ID: <201701061704.v06H43K7027028@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: Satellite 6: Fixed registration process for Red Hat Satellite 6.2
......................................................................


Satellite 6: Fixed registration process for Red Hat Satellite 6.2

This fix handles the katello-server-ca.crt distributed by
Red Hat Satellite 6.2 or higher at http://<FQDN>/pub directory.

It also added some requirements enforced by subscription-manager
to allow a system to be registered at Satellite 6
(environment and organization).

Change-Id: Id133817a3d511c78dc5ed6b6975b6066b0f7b438
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1339883
Signed-off-by: Marcelo Moreira de Mello <mmello at redhat.com>
(cherry picked from commit 0189cbb86b171440142711d78770f41c349db590)
---
M src/ovirt/node/setup/rhn/rhn_model.py
M src/ovirt/node/setup/rhn/rhn_page.py
2 files changed, 58 insertions(+), 18 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/69767
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id133817a3d511c78dc5ed6b6975b6066b0f7b438
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>

From gerrit at ovirt.org  Mon Jan  9 20:32:55 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 9 Jan 2017 15:32:55 -0500
Subject: [node-patches] Change in ovirt-node[master]: ovirt.te.in: add rule
	for lldpad
In-Reply-To: <gerrit.1483993962489.I1f610cac7c18a14a4520948200f6d9a5113975a3@gerrit.ovirt.org>
References: <gerrit.1483993962489.I1f610cac7c18a14a4520948200f6d9a5113975a3@gerrit.ovirt.org>
Message-ID: <201701092032.v09KWteY009896@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: ovirt.te.in: add rule for lldpad
......................................................................


Patch Set 1: Verified+1

-- 
To view, visit https://gerrit.ovirt.org/69878
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1f610cac7c18a14a4520948200f6d9a5113975a3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Mon Jan  9 20:32:42 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 9 Jan 2017 15:32:42 -0500
Subject: [node-patches] Change in ovirt-node[master]: ovirt.te.in: add rule
	for lldpad
Message-ID: <gerrit.1483993962489.I1f610cac7c18a14a4520948200f6d9a5113975a3@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: ovirt.te.in: add rule for lldpad
......................................................................

ovirt.te.in: add rule for lldpad

Avoid AVC during boot for lldpad:
type=AVC msg=audit(1482459394.399:25): avc:  denied  { read write }
for  pid=1297 comm="lldpad" name="lldpad.state" dev="tmpfs"
ino=18471 scontext=system_u:system_r:lldpad_t:s0
tcontext=system_u:object_r:tmpfs_t:s0 tclass=file

Change-Id: I1f610cac7c18a14a4520948200f6d9a5113975a3
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1406673
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M semodule/ovirt.te.in
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/78/69878/1

diff --git a/semodule/ovirt.te.in b/semodule/ovirt.te.in
index e9350c3..5ee5031 100644
--- a/semodule/ovirt.te.in
+++ b/semodule/ovirt.te.in
@@ -590,6 +590,14 @@
 ')
 
 
+#============= lldpad_t ==============
+optional_policy(`
+    require {
+        type lldpad_t;
+    }
+    allow lldpad_t tmpfs_t:file { read write open };
+')
+
 #============= mandb_t ==============
 optional_policy(`
     require {


-- 
To view, visit https://gerrit.ovirt.org/69878
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f610cac7c18a14a4520948200f6d9a5113975a3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>

From gerrit at ovirt.org  Mon Jan  9 21:43:34 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 9 Jan 2017 16:43:34 -0500
Subject: [node-patches] Change in ovirt-node[master]: ovirt.te.in: update
	iptables_t rules
Message-ID: <gerrit.1483998214869.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: ovirt.te.in: update iptables_t rules
......................................................................

ovirt.te.in: update iptables_t rules

Avoid boot AVC:

type=AVC msg=audit(1482319168.924:51): avc:  denied  { read }
for  pid=1998 comm="iptables" name="xtables.lock" dev="tmpfs"
ino=23877 scontext=system_u:system_r:iptables_t:s0-s0:c0.c1023
tcontext=system_u:object_r:var_run_t:s0 tclass=file

Change-Id: I9d9b2edb39cf5315c9570ee12b2b276403c970db
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1406673
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M semodule/ovirt.te.in
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/81/69881/1

diff --git a/semodule/ovirt.te.in b/semodule/ovirt.te.in
index e9350c3..5f22fe8 100644
--- a/semodule/ovirt.te.in
+++ b/semodule/ovirt.te.in
@@ -485,12 +485,14 @@
         type iptables_t;
         type insmod_t;
         type var_lib_t;
+        type var_run_t;
     }
     allow iptables_t tmpfs_t:dir search;
     allow iptables_t insmod_t:process { siginh rlimitinh noatsecure };
     allow iptables_t user_tmpfs_t:file { read open getattr };
     allow iptables_t var_lib_t:dir { write remove_name create add_name };
     allow iptables_t var_lib_t:file { write create unlink open };
+    allow iptables_t var_run_t:file { read open lock };
 ')
 
 #============= init_t ==============


-- 
To view, visit https://gerrit.ovirt.org/69881
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d9b2edb39cf5315c9570ee12b2b276403c970db
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>

From gerrit at ovirt.org  Mon Jan  9 22:13:06 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 9 Jan 2017 17:13:06 -0500
Subject: [node-patches] Change in ovirt-node[master]: ovirt.te.in: update
	iptables_t rules
In-Reply-To: <gerrit.1483998214869.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>
References: <gerrit.1483998214869.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>
Message-ID: <201701092213.v09MD6JP015026@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: ovirt.te.in: update iptables_t rules
......................................................................


Patch Set 1: Verified+1

-- 
To view, visit https://gerrit.ovirt.org/69881
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9d9b2edb39cf5315c9570ee12b2b276403c970db
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Tue Jan 10 19:01:04 2017
From: gerrit at ovirt.org (Code Review)
Date: Tue, 10 Jan 2017 14:01:04 -0500
Subject: [node-patches] Change in ovirt-node[master]: ovirt.te.in: add rule
	for lldpad
In-Reply-To: <gerrit.1483993962489.I1f610cac7c18a14a4520948200f6d9a5113975a3@gerrit.ovirt.org>
References: <gerrit.1483993962489.I1f610cac7c18a14a4520948200f6d9a5113975a3@gerrit.ovirt.org>
Message-ID: <201701101901.v0AJ14F7008232@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: ovirt.te.in: add rule for lldpad
......................................................................


Patch Set 1: Code-Review+2 Continuous-Integration+1

-- 
To view, visit https://gerrit.ovirt.org/69878
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1f610cac7c18a14a4520948200f6d9a5113975a3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Tue Jan 10 19:01:08 2017
From: gerrit at ovirt.org (Code Review)
Date: Tue, 10 Jan 2017 14:01:08 -0500
Subject: [node-patches] Change in ovirt-node[master]: ovirt.te.in: add rule
	for lldpad
In-Reply-To: <gerrit.1483993962489.I1f610cac7c18a14a4520948200f6d9a5113975a3@gerrit.ovirt.org>
References: <gerrit.1483993962489.I1f610cac7c18a14a4520948200f6d9a5113975a3@gerrit.ovirt.org>
Message-ID: <201701101901.v0AJ18nV008241@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: ovirt.te.in: add rule for lldpad
......................................................................


ovirt.te.in: add rule for lldpad

Avoid AVC during boot for lldpad:
type=AVC msg=audit(1482459394.399:25): avc:  denied  { read write }
for  pid=1297 comm="lldpad" name="lldpad.state" dev="tmpfs"
ino=18471 scontext=system_u:system_r:lldpad_t:s0
tcontext=system_u:object_r:tmpfs_t:s0 tclass=file

Change-Id: I1f610cac7c18a14a4520948200f6d9a5113975a3
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1406673
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M semodule/ovirt.te.in
1 file changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests
  Sandro Bonazzola: Looks good to me, but someone else must approve
  Ryan Barry: Looks good to me, but someone else must approve



-- 
To view, visit https://gerrit.ovirt.org/69878
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f610cac7c18a14a4520948200f6d9a5113975a3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>

From gerrit at ovirt.org  Tue Jan 10 19:01:18 2017
From: gerrit at ovirt.org (Code Review)
Date: Tue, 10 Jan 2017 14:01:18 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: ovirt.te.in: add
	rule for lldpad
Message-ID: <gerrit.1484074878863.I1f610cac7c18a14a4520948200f6d9a5113975a3@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: ovirt.te.in: add rule for lldpad
......................................................................

ovirt.te.in: add rule for lldpad

Avoid AVC during boot for lldpad:
type=AVC msg=audit(1482459394.399:25): avc:  denied  { read write }
for  pid=1297 comm="lldpad" name="lldpad.state" dev="tmpfs"
ino=18471 scontext=system_u:system_r:lldpad_t:s0
tcontext=system_u:object_r:tmpfs_t:s0 tclass=file

Change-Id: I1f610cac7c18a14a4520948200f6d9a5113975a3
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1406673
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
(cherry picked from commit 273dbe0f0db5f29ce154833e1a839b957000bfbb)
---
M semodule/ovirt.te.in
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/43/69943/1

diff --git a/semodule/ovirt.te.in b/semodule/ovirt.te.in
index e9350c3..5ee5031 100644
--- a/semodule/ovirt.te.in
+++ b/semodule/ovirt.te.in
@@ -590,6 +590,14 @@
 ')
 
 
+#============= lldpad_t ==============
+optional_policy(`
+    require {
+        type lldpad_t;
+    }
+    allow lldpad_t tmpfs_t:file { read write open };
+')
+
 #============= mandb_t ==============
 optional_policy(`
     require {


-- 
To view, visit https://gerrit.ovirt.org/69943
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f610cac7c18a14a4520948200f6d9a5113975a3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>

From gerrit at ovirt.org  Tue Jan 10 19:01:30 2017
From: gerrit at ovirt.org (Code Review)
Date: Tue, 10 Jan 2017 14:01:30 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: ovirt.te.in: add
	rule for lldpad
In-Reply-To: <gerrit.1484074878863.I1f610cac7c18a14a4520948200f6d9a5113975a3@gerrit.ovirt.org>
References: <gerrit.1484074878863.I1f610cac7c18a14a4520948200f6d9a5113975a3@gerrit.ovirt.org>
Message-ID: <201701101901.v0AJ1UCv008285@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: ovirt.te.in: add rule for lldpad
......................................................................


Patch Set 1: Code-Review+2 Continuous-Integration+1 Verified+1

backport only

-- 
To view, visit https://gerrit.ovirt.org/69943
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I1f610cac7c18a14a4520948200f6d9a5113975a3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Tue Jan 10 19:01:32 2017
From: gerrit at ovirt.org (Code Review)
Date: Tue, 10 Jan 2017 14:01:32 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: ovirt.te.in: add
	rule for lldpad
In-Reply-To: <gerrit.1484074878863.I1f610cac7c18a14a4520948200f6d9a5113975a3@gerrit.ovirt.org>
References: <gerrit.1484074878863.I1f610cac7c18a14a4520948200f6d9a5113975a3@gerrit.ovirt.org>
Message-ID: <201701101901.v0AJ1WR1008305@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: ovirt.te.in: add rule for lldpad
......................................................................


ovirt.te.in: add rule for lldpad

Avoid AVC during boot for lldpad:
type=AVC msg=audit(1482459394.399:25): avc:  denied  { read write }
for  pid=1297 comm="lldpad" name="lldpad.state" dev="tmpfs"
ino=18471 scontext=system_u:system_r:lldpad_t:s0
tcontext=system_u:object_r:tmpfs_t:s0 tclass=file

Change-Id: I1f610cac7c18a14a4520948200f6d9a5113975a3
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1406673
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
(cherry picked from commit 273dbe0f0db5f29ce154833e1a839b957000bfbb)
---
M semodule/ovirt.te.in
1 file changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/69943
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f610cac7c18a14a4520948200f6d9a5113975a3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>

From gerrit at ovirt.org  Tue Jan 10 19:01:48 2017
From: gerrit at ovirt.org (Code Review)
Date: Tue, 10 Jan 2017 14:01:48 -0500
Subject: [node-patches] Change in ovirt-node[master]: ovirt.te.in: update
	iptables_t rules
In-Reply-To: <gerrit.1483998214869.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>
References: <gerrit.1483998214869.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>
Message-ID: <201701101901.v0AJ1mGa008364@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: ovirt.te.in: update iptables_t rules
......................................................................


Patch Set 1: Code-Review+2 Continuous-Integration+1

-- 
To view, visit https://gerrit.ovirt.org/69881
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9d9b2edb39cf5315c9570ee12b2b276403c970db
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Tue Jan 10 19:02:00 2017
From: gerrit at ovirt.org (Code Review)
Date: Tue, 10 Jan 2017 14:02:00 -0500
Subject: [node-patches] Change in ovirt-node[master]: ovirt.te.in: update
	iptables_t rules
In-Reply-To: <gerrit.1483998214869.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>
References: <gerrit.1483998214869.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>
Message-ID: <201701101902.v0AJ20dl008388@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: ovirt.te.in: update iptables_t rules
......................................................................


Patch Set 2: Continuous-Integration+1

-- 
To view, visit https://gerrit.ovirt.org/69881
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9d9b2edb39cf5315c9570ee12b2b276403c970db
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Tue Jan 10 19:02:04 2017
From: gerrit at ovirt.org (Code Review)
Date: Tue, 10 Jan 2017 14:02:04 -0500
Subject: [node-patches] Change in ovirt-node[master]: ovirt.te.in: update
	iptables_t rules
In-Reply-To: <gerrit.1483998214869.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>
References: <gerrit.1483998214869.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>
Message-ID: <201701101902.v0AJ24Xm008397@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: ovirt.te.in: update iptables_t rules
......................................................................


ovirt.te.in: update iptables_t rules

Avoid boot AVC:

type=AVC msg=audit(1482319168.924:51): avc:  denied  { read }
for  pid=1998 comm="iptables" name="xtables.lock" dev="tmpfs"
ino=23877 scontext=system_u:system_r:iptables_t:s0-s0:c0.c1023
tcontext=system_u:object_r:var_run_t:s0 tclass=file

Change-Id: I9d9b2edb39cf5315c9570ee12b2b276403c970db
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1406673
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M semodule/ovirt.te.in
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests
  Sandro Bonazzola: Looks good to me, but someone else must approve



-- 
To view, visit https://gerrit.ovirt.org/69881
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d9b2edb39cf5315c9570ee12b2b276403c970db
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>

From gerrit at ovirt.org  Tue Jan 10 19:02:11 2017
From: gerrit at ovirt.org (Code Review)
Date: Tue, 10 Jan 2017 14:02:11 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: ovirt.te.in: update
	iptables_t rules
Message-ID: <gerrit.1484074931776.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: ovirt.te.in: update iptables_t rules
......................................................................

ovirt.te.in: update iptables_t rules

Avoid boot AVC:

type=AVC msg=audit(1482319168.924:51): avc:  denied  { read }
for  pid=1998 comm="iptables" name="xtables.lock" dev="tmpfs"
ino=23877 scontext=system_u:system_r:iptables_t:s0-s0:c0.c1023
tcontext=system_u:object_r:var_run_t:s0 tclass=file

Change-Id: I9d9b2edb39cf5315c9570ee12b2b276403c970db
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1406673
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
(cherry picked from commit abc33c7524f1b9bd5498c4f17dd6a635ecde72aa)
---
M semodule/ovirt.te.in
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/44/69944/1

diff --git a/semodule/ovirt.te.in b/semodule/ovirt.te.in
index 5ee5031..c87a5cd 100644
--- a/semodule/ovirt.te.in
+++ b/semodule/ovirt.te.in
@@ -485,12 +485,14 @@
         type iptables_t;
         type insmod_t;
         type var_lib_t;
+        type var_run_t;
     }
     allow iptables_t tmpfs_t:dir search;
     allow iptables_t insmod_t:process { siginh rlimitinh noatsecure };
     allow iptables_t user_tmpfs_t:file { read open getattr };
     allow iptables_t var_lib_t:dir { write remove_name create add_name };
     allow iptables_t var_lib_t:file { write create unlink open };
+    allow iptables_t var_run_t:file { read open lock };
 ')
 
 #============= init_t ==============


-- 
To view, visit https://gerrit.ovirt.org/69944
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d9b2edb39cf5315c9570ee12b2b276403c970db
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>

From gerrit at ovirt.org  Tue Jan 10 19:02:24 2017
From: gerrit at ovirt.org (Code Review)
Date: Tue, 10 Jan 2017 14:02:24 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: ovirt.te.in: update
	iptables_t rules
In-Reply-To: <gerrit.1484074931776.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>
References: <gerrit.1484074931776.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>
Message-ID: <201701101902.v0AJ2OrE008450@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: ovirt.te.in: update iptables_t rules
......................................................................


Patch Set 1: Code-Review+2 Continuous-Integration+1 Verified+1

backport only

-- 
To view, visit https://gerrit.ovirt.org/69944
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I9d9b2edb39cf5315c9570ee12b2b276403c970db
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Tue Jan 10 19:02:26 2017
From: gerrit at ovirt.org (Code Review)
Date: Tue, 10 Jan 2017 14:02:26 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: ovirt.te.in: update
	iptables_t rules
In-Reply-To: <gerrit.1484074931776.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>
References: <gerrit.1484074931776.I9d9b2edb39cf5315c9570ee12b2b276403c970db@gerrit.ovirt.org>
Message-ID: <201701101902.v0AJ2QOC008458@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: ovirt.te.in: update iptables_t rules
......................................................................


ovirt.te.in: update iptables_t rules

Avoid boot AVC:

type=AVC msg=audit(1482319168.924:51): avc:  denied  { read }
for  pid=1998 comm="iptables" name="xtables.lock" dev="tmpfs"
ino=23877 scontext=system_u:system_r:iptables_t:s0-s0:c0.c1023
tcontext=system_u:object_r:var_run_t:s0 tclass=file

Change-Id: I9d9b2edb39cf5315c9570ee12b2b276403c970db
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1406673
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
(cherry picked from commit abc33c7524f1b9bd5498c4f17dd6a635ecde72aa)
---
M semodule/ovirt.te.in
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/69944
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d9b2edb39cf5315c9570ee12b2b276403c970db
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>

From gerrit at ovirt.org  Thu Jan 12 17:47:57 2017
From: gerrit at ovirt.org (Code Review)
Date: Thu, 12 Jan 2017 12:47:57 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn: Add environment
	into rhn missing bits
Message-ID: <gerrit.1484243277245.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: rhn: Add environment into rhn missing bits
......................................................................

rhn: Add environment into rhn missing bits

In the commit 0189cbb86 we improved rhn bits
to support sat6.2. However, we have new variable
environment which should be included in the
autoinstall and migrate script too.

Change-Id: Ic322f71a2be33bad3b4a7b007a2a249b47093706
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1412619
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M plugins/rhn_autoinstall.py
M src/ovirt/node/config/migrate.py
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/62/70162/1

diff --git a/plugins/rhn_autoinstall.py b/plugins/rhn_autoinstall.py
index 3e0296a..9cde8a7 100644
--- a/plugins/rhn_autoinstall.py
+++ b/plugins/rhn_autoinstall.py
@@ -30,12 +30,13 @@
 SYSTEMID = "/etc/sysconfig/rhn/systemid"
 
 args = _functions.get_cmdline_args()
-keys = ["rhn_type", "rhn_url", "rhn_ca_cert", "rhn_username",
+keys = ["rhn_type", "rhn_url", "rhn_environment", "rhn_ca_cert", "rhn_username",
         "rhn_profile", "rhn_activationkey", "rhn_org",
         "rhn_proxy", "rhn_proxyuser"]
 
 keys_to_model = {"rhn_type": "rhn.rhntype",
                  "rhn_url": "rhn.url",
+                 "rhn_environment": "rhn.environment",
                  "rhn_ca_cert": "rhn.ca_cert",
                  "rhn_username": "rhn.username",
                  "rhn_profile": "rhn.profile",
@@ -64,6 +65,7 @@
     effective_model = Changeset({
         "rhn.rhntype": cfg['rhntype'],
         "rhn.url": cfg['url'],
+        "rhn.environment": cfg['environment'],
         "rhn.ca_cert": cfg['ca_cert'],
         "rhn.username": cfg['username'],
         "rhn.profile": cfg['profile'],
diff --git a/src/ovirt/node/config/migrate.py b/src/ovirt/node/config/migrate.py
index b30eec7..153a40c 100644
--- a/src/ovirt/node/config/migrate.py
+++ b/src/ovirt/node/config/migrate.py
@@ -238,6 +238,7 @@
             rhn_org = None
             rhn_proxyurl = None
             rhn_proxyuser = None
+            rhn_environment = None
 
             rhn_conf = rhn.get_rhn_config()
             status, rhn_type = rhn.get_rhn_status()
@@ -279,6 +280,8 @@
                          rhn_type.lower() if rhn_type else "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_URL",
                          rhn_url or "")
+            self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_ENVIRONMENT",
+                         rhn_environment or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_CA_CERT",
                          rhn_ca or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_USERNAME",


-- 
To view, visit https://gerrit.ovirt.org/70162
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic322f71a2be33bad3b4a7b007a2a249b47093706
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>

From gerrit at ovirt.org  Thu Jan 12 21:42:53 2017
From: gerrit at ovirt.org (Code Review)
Date: Thu, 12 Jan 2017 16:42:53 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn: Add environment
	into rhn missing bits
In-Reply-To: <gerrit.1484243277245.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>
References: <gerrit.1484243277245.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>
Message-ID: <201701122142.v0CLgsN7017337@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rhn: Add environment into rhn missing bits
......................................................................


Patch Set 1: Verified+1

-- 
To view, visit https://gerrit.ovirt.org/70162
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic322f71a2be33bad3b4a7b007a2a249b47093706
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Marcelo Moreira de Mello <mmello at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Thu Jan 12 22:01:19 2017
From: gerrit at ovirt.org (Code Review)
Date: Thu, 12 Jan 2017 17:01:19 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn: Add environment
	into rhn missing bits
In-Reply-To: <gerrit.1484243277245.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>
References: <gerrit.1484243277245.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>
Message-ID: <201701122201.v0CM1JS0017866@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rhn: Add environment into rhn missing bits
......................................................................


Patch Set 1: Code-Review+2 Continuous-Integration+1

-- 
To view, visit https://gerrit.ovirt.org/70162
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic322f71a2be33bad3b4a7b007a2a249b47093706
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Marcelo Moreira de Mello <mmello at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Thu Jan 12 22:01:23 2017
From: gerrit at ovirt.org (Code Review)
Date: Thu, 12 Jan 2017 17:01:23 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn: Add environment
	into rhn missing bits
In-Reply-To: <gerrit.1484243277245.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>
References: <gerrit.1484243277245.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>
Message-ID: <201701122201.v0CM1NLs017882@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: rhn: Add environment into rhn missing bits
......................................................................


rhn: Add environment into rhn missing bits

In the commit 0189cbb86 we improved rhn bits
to support sat6.2. However, we have new variable
environment which should be included in the
autoinstall and migrate script too.

Change-Id: Ic322f71a2be33bad3b4a7b007a2a249b47093706
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1412619
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M plugins/rhn_autoinstall.py
M src/ovirt/node/config/migrate.py
2 files changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests
  Ryan Barry: Looks good to me, but someone else must approve



-- 
To view, visit https://gerrit.ovirt.org/70162
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic322f71a2be33bad3b4a7b007a2a249b47093706
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>

From gerrit at ovirt.org  Thu Jan 12 22:01:32 2017
From: gerrit at ovirt.org (Code Review)
Date: Thu, 12 Jan 2017 17:01:32 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: rhn: Add
	environment into rhn missing bits
Message-ID: <gerrit.1484258491959.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: rhn: Add environment into rhn missing bits
......................................................................

rhn: Add environment into rhn missing bits

In the commit 0189cbb86 we improved rhn bits
to support sat6.2. However, we have new variable
environment which should be included in the
autoinstall and migrate script too.

Change-Id: Ic322f71a2be33bad3b4a7b007a2a249b47093706
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1412619
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
(cherry picked from commit 611f9ec148158ac989486e69148778064de6f846)
---
M plugins/rhn_autoinstall.py
M src/ovirt/node/config/migrate.py
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/76/70176/1

diff --git a/plugins/rhn_autoinstall.py b/plugins/rhn_autoinstall.py
index 3e0296a..9cde8a7 100644
--- a/plugins/rhn_autoinstall.py
+++ b/plugins/rhn_autoinstall.py
@@ -30,12 +30,13 @@
 SYSTEMID = "/etc/sysconfig/rhn/systemid"
 
 args = _functions.get_cmdline_args()
-keys = ["rhn_type", "rhn_url", "rhn_ca_cert", "rhn_username",
+keys = ["rhn_type", "rhn_url", "rhn_environment", "rhn_ca_cert", "rhn_username",
         "rhn_profile", "rhn_activationkey", "rhn_org",
         "rhn_proxy", "rhn_proxyuser"]
 
 keys_to_model = {"rhn_type": "rhn.rhntype",
                  "rhn_url": "rhn.url",
+                 "rhn_environment": "rhn.environment",
                  "rhn_ca_cert": "rhn.ca_cert",
                  "rhn_username": "rhn.username",
                  "rhn_profile": "rhn.profile",
@@ -64,6 +65,7 @@
     effective_model = Changeset({
         "rhn.rhntype": cfg['rhntype'],
         "rhn.url": cfg['url'],
+        "rhn.environment": cfg['environment'],
         "rhn.ca_cert": cfg['ca_cert'],
         "rhn.username": cfg['username'],
         "rhn.profile": cfg['profile'],
diff --git a/src/ovirt/node/config/migrate.py b/src/ovirt/node/config/migrate.py
index b30eec7..153a40c 100644
--- a/src/ovirt/node/config/migrate.py
+++ b/src/ovirt/node/config/migrate.py
@@ -238,6 +238,7 @@
             rhn_org = None
             rhn_proxyurl = None
             rhn_proxyuser = None
+            rhn_environment = None
 
             rhn_conf = rhn.get_rhn_config()
             status, rhn_type = rhn.get_rhn_status()
@@ -279,6 +280,8 @@
                          rhn_type.lower() if rhn_type else "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_URL",
                          rhn_url or "")
+            self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_ENVIRONMENT",
+                         rhn_environment or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_CA_CERT",
                          rhn_ca or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_USERNAME",


-- 
To view, visit https://gerrit.ovirt.org/70176
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic322f71a2be33bad3b4a7b007a2a249b47093706
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>

From gerrit at ovirt.org  Thu Jan 12 22:21:21 2017
From: gerrit at ovirt.org (Code Review)
Date: Thu, 12 Jan 2017 17:21:21 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: rhn: Add
	environment into rhn missing bits
In-Reply-To: <gerrit.1484258491959.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>
References: <gerrit.1484258491959.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>
Message-ID: <201701122221.v0CMLLmL019288@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rhn: Add environment into rhn missing bits
......................................................................


Patch Set 1: Verified+1

strange my flake8 src/ovirt/node/setup/rhn/rhn_model.py  doesn't complain but in jenkins it complains. Need to verify which version is running in the server. Backport only.

-- 
To view, visit https://gerrit.ovirt.org/70176
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic322f71a2be33bad3b4a7b007a2a249b47093706
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Fri Jan 13 21:03:35 2017
From: gerrit at ovirt.org (Code Review)
Date: Fri, 13 Jan 2017 16:03:35 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn_model: fix pep8
	complains
Message-ID: <gerrit.1484341415371.Ie4fb03f3e5c798653ef42883231f91431c4fbf31@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: rhn_model: fix pep8 complains
......................................................................

rhn_model: fix pep8 complains

Change-Id: Ie4fb03f3e5c798653ef42883231f91431c4fbf31
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M src/ovirt/node/setup/rhn/rhn_model.py
1 file changed, 16 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/92/70392/1

diff --git a/src/ovirt/node/setup/rhn/rhn_model.py b/src/ovirt/node/setup/rhn/rhn_model.py
index c12b8c0..c0974d4 100755
--- a/src/ovirt/node/setup/rhn/rhn_model.py
+++ b/src/ovirt/node/setup/rhn/rhn_model.py
@@ -520,40 +520,36 @@
                 if cfg["activationkey"]:
                     if not cfg["org"]:
                         del tx[0]
-                        tx.extend([RaiseError(
-                                        "Registration to Satellite "
-                                        "6 with activation key requires "
-                                        "an organization to be set")])
+                        tx.extend([RaiseError("Registration to Satellite "
+                                              "6 with activation key requires"
+                                              " an organization to be set")])
                         return tx
                     if cfg["environment"]:
                         del tx[0]
-                        tx.extend([RaiseError(
-                                        "Registration to Satellite 6 with "
-                                        "activation key do not allow "
-                                        "environments to be specified")])
+                        tx.extend([RaiseError("Registration to Satellite 6 "
+                                              "with activation key do not "
+                                              "allow environments to be"
+                                              "specified")])
                         return tx
                     if cfg["username"] or password:
                         del tx[0]
-                        tx.extend([RaiseError(
-                                        "Registration to Satellite 6 with an "
-                                        "activation key do not require "
-                                        "credentials")])
+                        tx.extend([RaiseError("Registration to Satellite 6 "
+                                              "with an activation key do not"
+                                              " require credentials")])
                         return tx
                 else:
                     if not cfg["org"] or not cfg["environment"]:
                         del tx[0]
-                        tx.extend([RaiseError(
-                                        "Registration to Satellite 6 requires "
-                                        "an organization and environment to "
-                                        "be set")])
+                        tx.extend([RaiseError("Registration to Satellite 6 "
+                                              "requires an organization and"
+                                              "environment to be set")])
                         return tx
 
                     if not cfg["username"] or not password:
                         del tx[0]
-                        tx.extend([RaiseError(
-                                        "Registration to Satellite 6 without "
-                                        "an activation key requires user "
-                                        "credentials")])
+                        tx.extend([RaiseError("Registration to Satellite 6 "
+                                              "without an activation key "
+                                              "requires user credentials")])
                         return tx
 
             if cfg["proxy"]:


-- 
To view, visit https://gerrit.ovirt.org/70392
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4fb03f3e5c798653ef42883231f91431c4fbf31
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>

From gerrit at ovirt.org  Fri Jan 13 21:03:48 2017
From: gerrit at ovirt.org (Code Review)
Date: Fri, 13 Jan 2017 16:03:48 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: rhn_model: fix pep8
	complains
Message-ID: <gerrit.1484341428016.Ie4fb03f3e5c798653ef42883231f91431c4fbf31@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: rhn_model: fix pep8 complains
......................................................................

rhn_model: fix pep8 complains

Change-Id: Ie4fb03f3e5c798653ef42883231f91431c4fbf31
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M src/ovirt/node/setup/rhn/rhn_model.py
1 file changed, 16 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/93/70393/1

diff --git a/src/ovirt/node/setup/rhn/rhn_model.py b/src/ovirt/node/setup/rhn/rhn_model.py
index c12b8c0..c0974d4 100755
--- a/src/ovirt/node/setup/rhn/rhn_model.py
+++ b/src/ovirt/node/setup/rhn/rhn_model.py
@@ -520,40 +520,36 @@
                 if cfg["activationkey"]:
                     if not cfg["org"]:
                         del tx[0]
-                        tx.extend([RaiseError(
-                                        "Registration to Satellite "
-                                        "6 with activation key requires "
-                                        "an organization to be set")])
+                        tx.extend([RaiseError("Registration to Satellite "
+                                              "6 with activation key requires"
+                                              " an organization to be set")])
                         return tx
                     if cfg["environment"]:
                         del tx[0]
-                        tx.extend([RaiseError(
-                                        "Registration to Satellite 6 with "
-                                        "activation key do not allow "
-                                        "environments to be specified")])
+                        tx.extend([RaiseError("Registration to Satellite 6 "
+                                              "with activation key do not "
+                                              "allow environments to be"
+                                              "specified")])
                         return tx
                     if cfg["username"] or password:
                         del tx[0]
-                        tx.extend([RaiseError(
-                                        "Registration to Satellite 6 with an "
-                                        "activation key do not require "
-                                        "credentials")])
+                        tx.extend([RaiseError("Registration to Satellite 6 "
+                                              "with an activation key do not"
+                                              " require credentials")])
                         return tx
                 else:
                     if not cfg["org"] or not cfg["environment"]:
                         del tx[0]
-                        tx.extend([RaiseError(
-                                        "Registration to Satellite 6 requires "
-                                        "an organization and environment to "
-                                        "be set")])
+                        tx.extend([RaiseError("Registration to Satellite 6 "
+                                              "requires an organization and"
+                                              "environment to be set")])
                         return tx
 
                     if not cfg["username"] or not password:
                         del tx[0]
-                        tx.extend([RaiseError(
-                                        "Registration to Satellite 6 without "
-                                        "an activation key requires user "
-                                        "credentials")])
+                        tx.extend([RaiseError("Registration to Satellite 6 "
+                                              "without an activation key "
+                                              "requires user credentials")])
                         return tx
 
             if cfg["proxy"]:


-- 
To view, visit https://gerrit.ovirt.org/70393
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4fb03f3e5c798653ef42883231f91431c4fbf31
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>

From gerrit at ovirt.org  Fri Jan 13 22:24:43 2017
From: gerrit at ovirt.org (Code Review)
Date: Fri, 13 Jan 2017 17:24:43 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn_model: Add
	validation for vars
Message-ID: <gerrit.1484346283556.I5bd187d52e84ddcc1096f2d842884614106ff2d7@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: rhn_model: Add validation for vars
......................................................................

rhn_model: Add validation for vars

For support RHN autoinstall we need to increase the validation
of variables we use.

Change-Id: I5bd187d52e84ddcc1096f2d842884614106ff2d7
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1412619
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M src/ovirt/node/setup/rhn/rhn_model.py
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/03/70403/1

diff --git a/src/ovirt/node/setup/rhn/rhn_model.py b/src/ovirt/node/setup/rhn/rhn_model.py
index c0974d4..91e1c96 100755
--- a/src/ovirt/node/setup/rhn/rhn_model.py
+++ b/src/ovirt/node/setup/rhn/rhn_model.py
@@ -338,8 +338,9 @@
                     host, port, prefix = RHN().parse_host_uri(cfg["url"])
 
                     # Default to /rhsm for Satellite 6
-                    if DEFAULT_CA_SAT6 in cfg["ca_cert"] and \
-                       cfg["rhntype"] == "satellite":
+                    if cfg["ca_cert"] and \
+                            DEFAULT_CA_SAT6 in cfg["ca_cert"] and \
+                            cfg["rhntype"] == "satellite":
                         prefix = "/rhsm"
 
                 else:
@@ -357,7 +358,7 @@
                 # Figure out what other arguments need to be set
                 # If there's a ca certificate or it's satellite, it's sat6
                 if cfg["ca_cert"] and DEFAULT_CA_SAT6 in cfg["ca_cert"] and \
-                   cfg["rhntype"] == "satellite":
+                   cfg["rhntype"] and cfg["rhntype"] == "satellite":
                     mapping["--server.prefix"] = prefix
                 else:
                     prefix = "%s/%s" % (host, prefix) if prefix else \


-- 
To view, visit https://gerrit.ovirt.org/70403
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bd187d52e84ddcc1096f2d842884614106ff2d7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>

From gerrit at ovirt.org  Sat Jan 14 16:10:25 2017
From: gerrit at ovirt.org (Code Review)
Date: Sat, 14 Jan 2017 11:10:25 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn_model: fix pep8
	complains
In-Reply-To: <gerrit.1484341415371.Ie4fb03f3e5c798653ef42883231f91431c4fbf31@gerrit.ovirt.org>
References: <gerrit.1484341415371.Ie4fb03f3e5c798653ef42883231f91431c4fbf31@gerrit.ovirt.org>
Message-ID: <201701141610.v0EGAPQQ022893@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: rhn_model: fix pep8 complains
......................................................................


rhn_model: fix pep8 complains

Change-Id: Ie4fb03f3e5c798653ef42883231f91431c4fbf31
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M src/ovirt/node/setup/rhn/rhn_model.py
1 file changed, 16 insertions(+), 20 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests
  Sandro Bonazzola: Looks good to me, but someone else must approve



-- 
To view, visit https://gerrit.ovirt.org/70392
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4fb03f3e5c798653ef42883231f91431c4fbf31
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>

From gerrit at ovirt.org  Sat Jan 14 16:10:19 2017
From: gerrit at ovirt.org (Code Review)
Date: Sat, 14 Jan 2017 11:10:19 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn_model: fix pep8
	complains
In-Reply-To: <gerrit.1484341415371.Ie4fb03f3e5c798653ef42883231f91431c4fbf31@gerrit.ovirt.org>
References: <gerrit.1484341415371.Ie4fb03f3e5c798653ef42883231f91431c4fbf31@gerrit.ovirt.org>
Message-ID: <201701141610.v0EGAJra022881@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rhn_model: fix pep8 complains
......................................................................


Patch Set 1: Code-Review+2 Continuous-Integration+1 Verified+1

-- 
To view, visit https://gerrit.ovirt.org/70392
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie4fb03f3e5c798653ef42883231f91431c4fbf31
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Marcelo Moreira de Mello <mdemello at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Sat Jan 14 16:10:40 2017
From: gerrit at ovirt.org (Code Review)
Date: Sat, 14 Jan 2017 11:10:40 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: rhn_model: fix pep8
	complains
In-Reply-To: <gerrit.1484341428016.Ie4fb03f3e5c798653ef42883231f91431c4fbf31@gerrit.ovirt.org>
References: <gerrit.1484341428016.Ie4fb03f3e5c798653ef42883231f91431c4fbf31@gerrit.ovirt.org>
Message-ID: <201701141610.v0EGAehT022911@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rhn_model: fix pep8 complains
......................................................................


Patch Set 1: Code-Review+2 Continuous-Integration+1 Verified+1

-- 
To view, visit https://gerrit.ovirt.org/70393
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ie4fb03f3e5c798653ef42883231f91431c4fbf31
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marcelo Moreira de Mello <mdemello at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Sat Jan 14 16:10:46 2017
From: gerrit at ovirt.org (Code Review)
Date: Sat, 14 Jan 2017 11:10:46 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: rhn_model: fix pep8
	complains
In-Reply-To: <gerrit.1484341428016.Ie4fb03f3e5c798653ef42883231f91431c4fbf31@gerrit.ovirt.org>
References: <gerrit.1484341428016.Ie4fb03f3e5c798653ef42883231f91431c4fbf31@gerrit.ovirt.org>
Message-ID: <201701141610.v0EGAkYN022919@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: rhn_model: fix pep8 complains
......................................................................


rhn_model: fix pep8 complains

Change-Id: Ie4fb03f3e5c798653ef42883231f91431c4fbf31
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M src/ovirt/node/setup/rhn/rhn_model.py
1 file changed, 16 insertions(+), 20 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests
  Sandro Bonazzola: Looks good to me, but someone else must approve
  Jenkins CI: Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/70393
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4fb03f3e5c798653ef42883231f91431c4fbf31
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>

From gerrit at ovirt.org  Mon Jan 16 01:07:27 2017
From: gerrit at ovirt.org (Code Review)
Date: Sun, 15 Jan 2017 20:07:27 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: rhn: Add
	environment into rhn missing bits
In-Reply-To: <gerrit.1484258491959.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>
References: <gerrit.1484258491959.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>
Message-ID: <201701160107.v0G17RPo012061@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rhn: Add environment into rhn missing bits
......................................................................


Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.ovirt.org/70176
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ic322f71a2be33bad3b4a7b007a2a249b47093706
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Mon Jan 16 01:07:31 2017
From: gerrit at ovirt.org (Code Review)
Date: Sun, 15 Jan 2017 20:07:31 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: rhn: Add
	environment into rhn missing bits
In-Reply-To: <gerrit.1484258491959.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>
References: <gerrit.1484258491959.Ic322f71a2be33bad3b4a7b007a2a249b47093706@gerrit.ovirt.org>
Message-ID: <201701160107.v0G17V6p012066@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: rhn: Add environment into rhn missing bits
......................................................................


rhn: Add environment into rhn missing bits

In the commit 0189cbb86 we improved rhn bits
to support sat6.2. However, we have new variable
environment which should be included in the
autoinstall and migrate script too.

Change-Id: Ic322f71a2be33bad3b4a7b007a2a249b47093706
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1412619
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
(cherry picked from commit 611f9ec148158ac989486e69148778064de6f846)
---
M plugins/rhn_autoinstall.py
M src/ovirt/node/config/migrate.py
2 files changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved
  Jenkins CI: Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/70176
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic322f71a2be33bad3b4a7b007a2a249b47093706
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>

From gerrit at ovirt.org  Mon Jan 16 04:10:19 2017
From: gerrit at ovirt.org (Code Review)
Date: Sun, 15 Jan 2017 23:10:19 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn: fix args order
Message-ID: <gerrit.1484539819640.I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: rhn: fix args order
......................................................................

rhn: fix args order

The module is restrict to the order of args.

Change-Id: I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1412619
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M plugins/rhn_autoinstall.py
M src/ovirt/node/config/migrate.py
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/62/70462/1

diff --git a/plugins/rhn_autoinstall.py b/plugins/rhn_autoinstall.py
index 9cde8a7..168508a 100644
--- a/plugins/rhn_autoinstall.py
+++ b/plugins/rhn_autoinstall.py
@@ -30,18 +30,18 @@
 SYSTEMID = "/etc/sysconfig/rhn/systemid"
 
 args = _functions.get_cmdline_args()
-keys = ["rhn_type", "rhn_url", "rhn_environment", "rhn_ca_cert", "rhn_username",
-        "rhn_profile", "rhn_activationkey", "rhn_org",
+keys = ["rhn_type", "rhn_url", "rhn_ca_cert", "rhn_username",
+        "rhn_profile", "rhn_activationkey", "rhn_org", "rhn_environment",
         "rhn_proxy", "rhn_proxyuser"]
 
 keys_to_model = {"rhn_type": "rhn.rhntype",
                  "rhn_url": "rhn.url",
-                 "rhn_environment": "rhn.environment",
                  "rhn_ca_cert": "rhn.ca_cert",
                  "rhn_username": "rhn.username",
                  "rhn_profile": "rhn.profile",
                  "rhn_activationkey": "rhn.activationkey",
                  "rhn_org": "rhn.org",
+                 "rhn_environment": "rhn.environment",
                  "rhn_proxy": "rhn.proxy",
                  "rhn_proxyuser": "rhn.proxyuser",
                  }
@@ -65,12 +65,12 @@
     effective_model = Changeset({
         "rhn.rhntype": cfg['rhntype'],
         "rhn.url": cfg['url'],
-        "rhn.environment": cfg['environment'],
         "rhn.ca_cert": cfg['ca_cert'],
         "rhn.username": cfg['username'],
         "rhn.profile": cfg['profile'],
         "rhn.activationkey": cfg['activationkey'],
         "rhn.org": cfg['org'],
+        "rhn.environment": cfg['environment'],
         "rhn.proxy": cfg['proxy'],
         "rhn.proxyuser": cfg['proxyuser'],
     })
diff --git a/src/ovirt/node/config/migrate.py b/src/ovirt/node/config/migrate.py
index 153a40c..e23e247 100644
--- a/src/ovirt/node/config/migrate.py
+++ b/src/ovirt/node/config/migrate.py
@@ -280,8 +280,6 @@
                          rhn_type.lower() if rhn_type else "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_URL",
                          rhn_url or "")
-            self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_ENVIRONMENT",
-                         rhn_environment or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_CA_CERT",
                          rhn_ca or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_USERNAME",
@@ -292,6 +290,8 @@
                          rhn_activationkey or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_ORG",
                          rhn_org or "")
+            self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_ENVIRONMENT",
+                         rhn_environment or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_PROXY",
                          rhn_proxyurl or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_PROXYUSER",


-- 
To view, visit https://gerrit.ovirt.org/70462
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>

From gerrit at ovirt.org  Mon Jan 16 04:11:11 2017
From: gerrit at ovirt.org (Code Review)
Date: Sun, 15 Jan 2017 23:11:11 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn_model: Add
	validation for vars
In-Reply-To: <gerrit.1484346283556.I5bd187d52e84ddcc1096f2d842884614106ff2d7@gerrit.ovirt.org>
References: <gerrit.1484346283556.I5bd187d52e84ddcc1096f2d842884614106ff2d7@gerrit.ovirt.org>
Message-ID: <201701160411.v0G4BBnT020222@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rhn_model: Add validation for vars
......................................................................


Patch Set 1: Verified+1

from my tests it worked.

-- 
To view, visit https://gerrit.ovirt.org/70403
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I5bd187d52e84ddcc1096f2d842884614106ff2d7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Marcelo Moreira de Mello <mdemello at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Mon Jan 16 04:11:18 2017
From: gerrit at ovirt.org (Code Review)
Date: Sun, 15 Jan 2017 23:11:18 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn: fix args order
In-Reply-To: <gerrit.1484539819640.I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125@gerrit.ovirt.org>
References: <gerrit.1484539819640.I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125@gerrit.ovirt.org>
Message-ID: <201701160411.v0G4BIue020227@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rhn: fix args order
......................................................................


Patch Set 1:

from my tests it worked.

-- 
To view, visit https://gerrit.ovirt.org/70462
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Marcelo Moreira de Mello <mdemello at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Tue Jan 17 03:58:57 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 16 Jan 2017 22:58:57 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn_model: Add
	validation for vars
In-Reply-To: <gerrit.1484346283556.I5bd187d52e84ddcc1096f2d842884614106ff2d7@gerrit.ovirt.org>
References: <gerrit.1484346283556.I5bd187d52e84ddcc1096f2d842884614106ff2d7@gerrit.ovirt.org>
Message-ID: <201701170358.v0H3wv4H013756@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rhn_model: Add validation for vars
......................................................................


Patch Set 1: Code-Review+2 Continuous-Integration+1

-- 
To view, visit https://gerrit.ovirt.org/70403
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I5bd187d52e84ddcc1096f2d842884614106ff2d7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Marcelo Moreira de Mello <mdemello at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Tue Jan 17 03:59:02 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 16 Jan 2017 22:59:02 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn_model: Add
	validation for vars
In-Reply-To: <gerrit.1484346283556.I5bd187d52e84ddcc1096f2d842884614106ff2d7@gerrit.ovirt.org>
References: <gerrit.1484346283556.I5bd187d52e84ddcc1096f2d842884614106ff2d7@gerrit.ovirt.org>
Message-ID: <201701170359.v0H3x2Su013766@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: rhn_model: Add validation for vars
......................................................................


rhn_model: Add validation for vars

For support RHN autoinstall we need to increase the validation
of variables we use.

Change-Id: I5bd187d52e84ddcc1096f2d842884614106ff2d7
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1412619
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M src/ovirt/node/setup/rhn/rhn_model.py
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/70403
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5bd187d52e84ddcc1096f2d842884614106ff2d7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>

From gerrit at ovirt.org  Tue Jan 17 03:59:11 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 16 Jan 2017 22:59:11 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn: fix args order
In-Reply-To: <gerrit.1484539819640.I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125@gerrit.ovirt.org>
References: <gerrit.1484539819640.I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125@gerrit.ovirt.org>
Message-ID: <201701170359.v0H3xBKT013791@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rhn: fix args order
......................................................................


Patch Set 1: Code-Review+2 Continuous-Integration+1 Verified+1

-- 
To view, visit https://gerrit.ovirt.org/70462
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Marcelo Moreira de Mello <mdemello at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Tue Jan 17 03:59:13 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 16 Jan 2017 22:59:13 -0500
Subject: [node-patches] Change in ovirt-node[master]: rhn: fix args order
In-Reply-To: <gerrit.1484539819640.I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125@gerrit.ovirt.org>
References: <gerrit.1484539819640.I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125@gerrit.ovirt.org>
Message-ID: <201701170359.v0H3xDxp013801@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: rhn: fix args order
......................................................................


rhn: fix args order

The module is restrict to the order of args.

Change-Id: I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1412619
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
---
M plugins/rhn_autoinstall.py
M src/ovirt/node/config/migrate.py
2 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/70462
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>

From gerrit at ovirt.org  Tue Jan 17 03:59:54 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 16 Jan 2017 22:59:54 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: rhn_model: Add
	validation for vars
Message-ID: <gerrit.1484625594155.I5bd187d52e84ddcc1096f2d842884614106ff2d7@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: rhn_model: Add validation for vars
......................................................................

rhn_model: Add validation for vars

For support RHN autoinstall we need to increase the validation
of variables we use.

Change-Id: I5bd187d52e84ddcc1096f2d842884614106ff2d7
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1412619
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
(cherry picked from commit d8c0772dbcf6f8facbdf66a23dceaa42dce6e172)
---
M src/ovirt/node/setup/rhn/rhn_model.py
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/97/70597/1

diff --git a/src/ovirt/node/setup/rhn/rhn_model.py b/src/ovirt/node/setup/rhn/rhn_model.py
index c0974d4..91e1c96 100755
--- a/src/ovirt/node/setup/rhn/rhn_model.py
+++ b/src/ovirt/node/setup/rhn/rhn_model.py
@@ -338,8 +338,9 @@
                     host, port, prefix = RHN().parse_host_uri(cfg["url"])
 
                     # Default to /rhsm for Satellite 6
-                    if DEFAULT_CA_SAT6 in cfg["ca_cert"] and \
-                       cfg["rhntype"] == "satellite":
+                    if cfg["ca_cert"] and \
+                            DEFAULT_CA_SAT6 in cfg["ca_cert"] and \
+                            cfg["rhntype"] == "satellite":
                         prefix = "/rhsm"
 
                 else:
@@ -357,7 +358,7 @@
                 # Figure out what other arguments need to be set
                 # If there's a ca certificate or it's satellite, it's sat6
                 if cfg["ca_cert"] and DEFAULT_CA_SAT6 in cfg["ca_cert"] and \
-                   cfg["rhntype"] == "satellite":
+                   cfg["rhntype"] and cfg["rhntype"] == "satellite":
                     mapping["--server.prefix"] = prefix
                 else:
                     prefix = "%s/%s" % (host, prefix) if prefix else \


-- 
To view, visit https://gerrit.ovirt.org/70597
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bd187d52e84ddcc1096f2d842884614106ff2d7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>

From gerrit at ovirt.org  Tue Jan 17 04:05:32 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 16 Jan 2017 23:05:32 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: rhn_model: Add
	validation for vars
In-Reply-To: <gerrit.1484625594155.I5bd187d52e84ddcc1096f2d842884614106ff2d7@gerrit.ovirt.org>
References: <gerrit.1484625594155.I5bd187d52e84ddcc1096f2d842884614106ff2d7@gerrit.ovirt.org>
Message-ID: <201701170405.v0H45WWp014148@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rhn_model: Add validation for vars
......................................................................


Patch Set 1: Code-Review+2 Continuous-Integration+1 Verified+1

-- 
To view, visit https://gerrit.ovirt.org/70597
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I5bd187d52e84ddcc1096f2d842884614106ff2d7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Tue Jan 17 04:05:34 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 16 Jan 2017 23:05:34 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: rhn_model: Add
	validation for vars
In-Reply-To: <gerrit.1484625594155.I5bd187d52e84ddcc1096f2d842884614106ff2d7@gerrit.ovirt.org>
References: <gerrit.1484625594155.I5bd187d52e84ddcc1096f2d842884614106ff2d7@gerrit.ovirt.org>
Message-ID: <201701170405.v0H45Ylr014154@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: rhn_model: Add validation for vars
......................................................................


rhn_model: Add validation for vars

For support RHN autoinstall we need to increase the validation
of variables we use.

Change-Id: I5bd187d52e84ddcc1096f2d842884614106ff2d7
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1412619
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
(cherry picked from commit d8c0772dbcf6f8facbdf66a23dceaa42dce6e172)
---
M src/ovirt/node/setup/rhn/rhn_model.py
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests
  Jenkins CI: Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/70597
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5bd187d52e84ddcc1096f2d842884614106ff2d7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>

From gerrit at ovirt.org  Tue Jan 17 04:05:48 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 16 Jan 2017 23:05:48 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: rhn: fix args order
Message-ID: <gerrit.1484625948726.I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: rhn: fix args order
......................................................................

rhn: fix args order

The module is restrict to the order of args.

Change-Id: I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1412619
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
(cherry picked from commit 7878325914e04fcd772132e1506da8f65a0b7a2d)
---
M plugins/rhn_autoinstall.py
M src/ovirt/node/config/migrate.py
2 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/98/70598/1

diff --git a/plugins/rhn_autoinstall.py b/plugins/rhn_autoinstall.py
index 9cde8a7..168508a 100644
--- a/plugins/rhn_autoinstall.py
+++ b/plugins/rhn_autoinstall.py
@@ -30,18 +30,18 @@
 SYSTEMID = "/etc/sysconfig/rhn/systemid"
 
 args = _functions.get_cmdline_args()
-keys = ["rhn_type", "rhn_url", "rhn_environment", "rhn_ca_cert", "rhn_username",
-        "rhn_profile", "rhn_activationkey", "rhn_org",
+keys = ["rhn_type", "rhn_url", "rhn_ca_cert", "rhn_username",
+        "rhn_profile", "rhn_activationkey", "rhn_org", "rhn_environment",
         "rhn_proxy", "rhn_proxyuser"]
 
 keys_to_model = {"rhn_type": "rhn.rhntype",
                  "rhn_url": "rhn.url",
-                 "rhn_environment": "rhn.environment",
                  "rhn_ca_cert": "rhn.ca_cert",
                  "rhn_username": "rhn.username",
                  "rhn_profile": "rhn.profile",
                  "rhn_activationkey": "rhn.activationkey",
                  "rhn_org": "rhn.org",
+                 "rhn_environment": "rhn.environment",
                  "rhn_proxy": "rhn.proxy",
                  "rhn_proxyuser": "rhn.proxyuser",
                  }
@@ -65,12 +65,12 @@
     effective_model = Changeset({
         "rhn.rhntype": cfg['rhntype'],
         "rhn.url": cfg['url'],
-        "rhn.environment": cfg['environment'],
         "rhn.ca_cert": cfg['ca_cert'],
         "rhn.username": cfg['username'],
         "rhn.profile": cfg['profile'],
         "rhn.activationkey": cfg['activationkey'],
         "rhn.org": cfg['org'],
+        "rhn.environment": cfg['environment'],
         "rhn.proxy": cfg['proxy'],
         "rhn.proxyuser": cfg['proxyuser'],
     })
diff --git a/src/ovirt/node/config/migrate.py b/src/ovirt/node/config/migrate.py
index 153a40c..e23e247 100644
--- a/src/ovirt/node/config/migrate.py
+++ b/src/ovirt/node/config/migrate.py
@@ -280,8 +280,6 @@
                          rhn_type.lower() if rhn_type else "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_URL",
                          rhn_url or "")
-            self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_ENVIRONMENT",
-                         rhn_environment or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_CA_CERT",
                          rhn_ca or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_USERNAME",
@@ -292,6 +290,8 @@
                          rhn_activationkey or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_ORG",
                          rhn_org or "")
+            self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_ENVIRONMENT",
+                         rhn_environment or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_PROXY",
                          rhn_proxyurl or "")
             self.aug.set("/files/etc/default/ovirt/OVIRT_RHN_PROXYUSER",


-- 
To view, visit https://gerrit.ovirt.org/70598
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>

From gerrit at ovirt.org  Tue Jan 17 04:11:29 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 16 Jan 2017 23:11:29 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: rhn: fix args order
In-Reply-To: <gerrit.1484625948726.I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125@gerrit.ovirt.org>
References: <gerrit.1484625948726.I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125@gerrit.ovirt.org>
Message-ID: <201701170411.v0H4BT8Q014702@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has posted comments on this change.

Change subject: rhn: fix args order
......................................................................


Patch Set 1: Code-Review+2 Continuous-Integration+1 Verified+1

-- 
To view, visit https://gerrit.ovirt.org/70598
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
Gerrit-HasComments: No

From gerrit at ovirt.org  Tue Jan 17 04:11:31 2017
From: gerrit at ovirt.org (Code Review)
Date: Mon, 16 Jan 2017 23:11:31 -0500
Subject: [node-patches] Change in ovirt-node[ovirt-3.6]: rhn: fix args order
In-Reply-To: <gerrit.1484625948726.I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125@gerrit.ovirt.org>
References: <gerrit.1484625948726.I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125@gerrit.ovirt.org>
Message-ID: <201701170411.v0H4BV4u014709@gerrit.ovirt.org>

>From Douglas Schilling Landgraf <dougsland at redhat.com>:

Douglas Schilling Landgraf has submitted this change and it was merged.

Change subject: rhn: fix args order
......................................................................


rhn: fix args order

The module is restrict to the order of args.

Change-Id: I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1412619
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
(cherry picked from commit 7878325914e04fcd772132e1506da8f65a0b7a2d)
---
M plugins/rhn_autoinstall.py
M src/ovirt/node/config/migrate.py
2 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Douglas Schilling Landgraf: Verified; Looks good to me, approved; Passed CI tests
  Jenkins CI: Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/70598
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2100b3030d6bc3dd669dcdcb5f4fc83284a0c125
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.6
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>