summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-18 18:43:08 +0000
committerGerrit Code Review <review@openstack.org>2019-01-18 18:43:08 +0000
commit1edeb2fe3b5c3e16dd78b78f171f634608fc5b66 (patch)
tree37052a32ddbb7af075fd3a13277255891e11267d
parente459ffa0fd74d26cd3f2cde3f226da71d6796b3b (diff)
parent301101d06c554765fde552e8d58801614f2ffdce (diff)
Merge "Fix OpenShift driver typo"
-rw-r--r--doc/source/configuration.rst18
-rw-r--r--nodepool/driver/openshift/handler.py2
2 files changed, 13 insertions, 7 deletions
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 961e529..4e772fa 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -1125,7 +1125,7 @@ Selecting the kubernetes driver adds the following options to the
1125 .. value:: namespace 1125 .. value:: namespace
1126 1126
1127 Namespace labels provide an empty namespace configured 1127 Namespace labels provide an empty namespace configured
1128 with a service account that can creates pods, services, 1128 with a service account that can create pods, services,
1129 configmaps, etc. 1129 configmaps, etc.
1130 1130
1131 .. value:: pod 1131 .. value:: pod
@@ -1193,7 +1193,7 @@ Selecting the openshift driver adds the following options to the
1193 1193
1194 Before using the driver, Nodepool services need a ``kube/config`` file 1194 Before using the driver, Nodepool services need a ``kube/config`` file
1195 manually installed with self-provisioner (the service account needs to 1195 manually installed with self-provisioner (the service account needs to
1196 be able to create project) context. 1196 be able to create projects) context.
1197 Make sure the context is present in ``oc config get-contexts`` command 1197 Make sure the context is present in ``oc config get-contexts`` command
1198 output. 1198 output.
1199 1199
@@ -1240,13 +1240,13 @@ Selecting the openshift driver adds the following options to the
1240 .. value:: project 1240 .. value:: project
1241 1241
1242 Project labels provide an empty project configured 1242 Project labels provide an empty project configured
1243 with a service account that can creates pods, services, 1243 with a service account that can create pods, services,
1244 configmaps, etc. 1244 configmaps, etc.
1245 1245
1246 .. value:: pod 1246 .. value:: pod
1247 1247
1248 Pod labels provide a dedicated project with a single pod 1248 Pod labels provide a new dedicated project with a single
1249 created using the 1249 pod created using the
1250 :attr:`providers.[openshift].labels.image` parameter and it 1250 :attr:`providers.[openshift].labels.image` parameter and it
1251 is configured with a service account that can exec and get 1251 is configured with a service account that can exec and get
1252 the logs of the pod. 1252 the logs of the pod.
@@ -1257,12 +1257,18 @@ Selecting the openshift driver adds the following options to the
1257 :value:`providers.[openshift].labels.type.pod` label type; 1257 :value:`providers.[openshift].labels.type.pod` label type;
1258 specifies the image name used by the pod. 1258 specifies the image name used by the pod.
1259 1259
1260 .. attr:: image-pull
1261 :default: IfNotPresent
1262 :type: str
1263
1264 The ImagePullPolicy, can be IfNotPresent, Always or Never.
1265
1260 .. attr:: cpu 1266 .. attr:: cpu
1261 :type: int 1267 :type: int
1262 1268
1263 Only used by the 1269 Only used by the
1264 :value:`providers.[openshift].labels.type.pod` label type; 1270 :value:`providers.[openshift].labels.type.pod` label type;
1265 specifies the amount of cpu to request for the pod. 1271 specifies the number of cpu to request for the pod.
1266 1272
1267 .. attr:: memory 1273 .. attr:: memory
1268 :type: int 1274 :type: int
diff --git a/nodepool/driver/openshift/handler.py b/nodepool/driver/openshift/handler.py
index 2de3a40..b7edfa8 100644
--- a/nodepool/driver/openshift/handler.py
+++ b/nodepool/driver/openshift/handler.py
@@ -118,7 +118,7 @@ class OpenshiftNodeRequestHandler(NodeRequestHandler):
118 118
119 node_states = [node.state for node in self.nodeset] 119 node_states = [node.state for node in self.nodeset]
120 120
121 # NOTE: It very important that NodeLauncher always sets one of 121 # NOTE: It's very important that NodeLauncher always sets one of
122 # these states, no matter what. 122 # these states, no matter what.
123 if not all(s in (zk.READY, zk.FAILED, zk.ABORTED) 123 if not all(s in (zk.READY, zk.FAILED, zk.ABORTED)
124 for s in node_states): 124 for s in node_states):