summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/src
diff options
context:
space:
mode:
Diffstat (limited to 'roles/lib_openshift/src')
-rw-r--r--roles/lib_openshift/src/class/oadm_manage_node.py2
-rw-r--r--roles/lib_openshift/src/class/oc_edit.py5
-rw-r--r--roles/lib_openshift/src/class/oc_env.py5
-rw-r--r--roles/lib_openshift/src/class/oc_label.py4
-rw-r--r--roles/lib_openshift/src/class/oc_obj.py5
-rw-r--r--roles/lib_openshift/src/class/oc_process.py5
-rw-r--r--roles/lib_openshift/src/class/oc_route.py3
-rw-r--r--roles/lib_openshift/src/class/oc_scale.py5
-rw-r--r--roles/lib_openshift/src/class/oc_secret.py5
-rw-r--r--roles/lib_openshift/src/class/oc_serviceaccount.py3
-rw-r--r--roles/lib_openshift/src/class/oc_serviceaccount_secret.py2
11 files changed, 11 insertions, 33 deletions
diff --git a/roles/lib_openshift/src/class/oadm_manage_node.py b/roles/lib_openshift/src/class/oadm_manage_node.py
index 61b6a5ebe..c07320477 100644
--- a/roles/lib_openshift/src/class/oadm_manage_node.py
+++ b/roles/lib_openshift/src/class/oadm_manage_node.py
@@ -23,7 +23,7 @@ class ManageNode(OpenShiftCLI):
config,
verbose=False):
''' Constructor for ManageNode '''
- super(ManageNode, self).__init__(None, config.kubeconfig)
+ super(ManageNode, self).__init__(None, kubeconfig=config.kubeconfig, verbose=verbose)
self.config = config
def evacuate(self):
diff --git a/roles/lib_openshift/src/class/oc_edit.py b/roles/lib_openshift/src/class/oc_edit.py
index 0734e2085..629e5a007 100644
--- a/roles/lib_openshift/src/class/oc_edit.py
+++ b/roles/lib_openshift/src/class/oc_edit.py
@@ -13,13 +13,10 @@ class Edit(OpenShiftCLI):
separator='.',
verbose=False):
''' Constructor for OpenshiftOC '''
- super(Edit, self).__init__(namespace, kubeconfig)
- self.namespace = namespace
+ super(Edit, self).__init__(namespace, kubeconfig=kubeconfig, verbose=verbose)
self.kind = kind
self.name = resource_name
- self.kubeconfig = kubeconfig
self.separator = separator
- self.verbose = verbose
def get(self):
'''return a secret by name '''
diff --git a/roles/lib_openshift/src/class/oc_env.py b/roles/lib_openshift/src/class/oc_env.py
index d34c8234e..748b46cb5 100644
--- a/roles/lib_openshift/src/class/oc_env.py
+++ b/roles/lib_openshift/src/class/oc_env.py
@@ -21,13 +21,10 @@ class OCEnv(OpenShiftCLI):
kubeconfig='/etc/origin/master/admin.kubeconfig',
verbose=False):
''' Constructor for OpenshiftOC '''
- super(OCEnv, self).__init__(namespace, kubeconfig)
+ super(OCEnv, self).__init__(namespace, kubeconfig=kubeconfig, verbose=verbose)
self.kind = kind
self.name = resource_name
- self.namespace = namespace
self.env_vars = env_vars
- self.kubeconfig = kubeconfig
- self.verbose = verbose
self._resource = None
@property
diff --git a/roles/lib_openshift/src/class/oc_label.py b/roles/lib_openshift/src/class/oc_label.py
index 8e1ba9ceb..bd312c170 100644
--- a/roles/lib_openshift/src/class/oc_label.py
+++ b/roles/lib_openshift/src/class/oc_label.py
@@ -17,11 +17,9 @@ class OCLabel(OpenShiftCLI):
selector=None,
verbose=False):
''' Constructor for OCLabel '''
- super(OCLabel, self).__init__(namespace, kubeconfig)
+ super(OCLabel, self).__init__(namespace, kubeconfig=kubeconfig, verbose=verbose)
self.name = name
- self.namespace = namespace
self.kind = kind
- self.kubeconfig = kubeconfig
self.labels = labels
self._curr_labels = None
self.selector = selector
diff --git a/roles/lib_openshift/src/class/oc_obj.py b/roles/lib_openshift/src/class/oc_obj.py
index 2ec20e72c..21129a50c 100644
--- a/roles/lib_openshift/src/class/oc_obj.py
+++ b/roles/lib_openshift/src/class/oc_obj.py
@@ -16,14 +16,11 @@ class OCObject(OpenShiftCLI):
verbose=False,
all_namespaces=False):
''' Constructor for OpenshiftOC '''
- super(OCObject, self).__init__(namespace, kubeconfig,
+ super(OCObject, self).__init__(namespace, kubeconfig=kubeconfig, verbose=verbose,
all_namespaces=all_namespaces)
self.kind = kind
- self.namespace = namespace
self.name = rname
self.selector = selector
- self.kubeconfig = kubeconfig
- self.verbose = verbose
def get(self):
'''return a kind by name '''
diff --git a/roles/lib_openshift/src/class/oc_process.py b/roles/lib_openshift/src/class/oc_process.py
index 80d81448d..9d29938aa 100644
--- a/roles/lib_openshift/src/class/oc_process.py
+++ b/roles/lib_openshift/src/class/oc_process.py
@@ -17,14 +17,11 @@ class OCProcess(OpenShiftCLI):
tdata=None,
verbose=False):
''' Constructor for OpenshiftOC '''
- super(OCProcess, self).__init__(namespace, kubeconfig)
- self.namespace = namespace
+ super(OCProcess, self).__init__(namespace, kubeconfig=kubeconfig, verbose=verbose)
self.name = tname
self.data = tdata
self.params = params
self.create = create
- self.kubeconfig = kubeconfig
- self.verbose = verbose
self._template = None
@property
diff --git a/roles/lib_openshift/src/class/oc_route.py b/roles/lib_openshift/src/class/oc_route.py
index 42388ad0b..cb743e19d 100644
--- a/roles/lib_openshift/src/class/oc_route.py
+++ b/roles/lib_openshift/src/class/oc_route.py
@@ -11,9 +11,8 @@ class OCRoute(OpenShiftCLI):
config,
verbose=False):
''' Constructor for OCVolume '''
- super(OCRoute, self).__init__(config.namespace, config.kubeconfig)
+ super(OCRoute, self).__init__(config.namespace, kubeconfig=config.kubeconfig, verbose=verbose)
self.config = config
- self.namespace = config.namespace
self._route = None
@property
diff --git a/roles/lib_openshift/src/class/oc_scale.py b/roles/lib_openshift/src/class/oc_scale.py
index 16255688b..6c3ceb8cf 100644
--- a/roles/lib_openshift/src/class/oc_scale.py
+++ b/roles/lib_openshift/src/class/oc_scale.py
@@ -15,13 +15,10 @@ class OCScale(OpenShiftCLI):
kubeconfig='/etc/origin/master/admin.kubeconfig',
verbose=False):
''' Constructor for OCScale '''
- super(OCScale, self).__init__(namespace, kubeconfig)
+ super(OCScale, self).__init__(namespace, kubeconfig=kubeconfig, verbose=verbose)
self.kind = kind
self.replicas = replicas
self.name = resource_name
- self.namespace = namespace
- self.kubeconfig = kubeconfig
- self.verbose = verbose
self._resource = None
@property
diff --git a/roles/lib_openshift/src/class/oc_secret.py b/roles/lib_openshift/src/class/oc_secret.py
index e99999c37..5eac27572 100644
--- a/roles/lib_openshift/src/class/oc_secret.py
+++ b/roles/lib_openshift/src/class/oc_secret.py
@@ -17,12 +17,9 @@ class OCSecret(OpenShiftCLI):
kubeconfig='/etc/origin/master/admin.kubeconfig',
verbose=False):
''' Constructor for OpenshiftOC '''
- super(OCSecret, self).__init__(namespace, kubeconfig)
- self.namespace = namespace
+ super(OCSecret, self).__init__(namespace, kubeconfig=kubeconfig, verbose=verbose)
self.name = secret_name
- self.kubeconfig = kubeconfig
self.decode = decode
- self.verbose = verbose
def get(self):
'''return a secret by name '''
diff --git a/roles/lib_openshift/src/class/oc_serviceaccount.py b/roles/lib_openshift/src/class/oc_serviceaccount.py
index 47c7b5c94..d6777afc1 100644
--- a/roles/lib_openshift/src/class/oc_serviceaccount.py
+++ b/roles/lib_openshift/src/class/oc_serviceaccount.py
@@ -12,9 +12,8 @@ class OCServiceAccount(OpenShiftCLI):
config,
verbose=False):
''' Constructor for OCVolume '''
- super(OCServiceAccount, self).__init__(config.namespace, config.kubeconfig)
+ super(OCServiceAccount, self).__init__(config.namespace, kubeconfig=config.kubeconfig, verbose=verbose)
self.config = config
- self.namespace = config.namespace
self.service_account = None
def exists(self):
diff --git a/roles/lib_openshift/src/class/oc_serviceaccount_secret.py b/roles/lib_openshift/src/class/oc_serviceaccount_secret.py
index 750a74d33..4f1c8c926 100644
--- a/roles/lib_openshift/src/class/oc_serviceaccount_secret.py
+++ b/roles/lib_openshift/src/class/oc_serviceaccount_secret.py
@@ -7,7 +7,7 @@ class OCServiceAccountSecret(OpenShiftCLI):
kind = 'sa'
def __init__(self, config, verbose=False):
''' Constructor for OpenshiftOC '''
- super(OCServiceAccountSecret, self).__init__(config.namespace, config.kubeconfig)
+ super(OCServiceAccountSecret, self).__init__(config.namespace, kubeconfig=config.kubeconfig, verbose=verbose)
self.config = config
self.verbose = verbose
self._service_account = None
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 05:10:16 +0000