Fix error with multiple nodepool providers

An indentation error caused the operator to only create the last
provider listed in the nodepool config.

Additionally, add the nodepool provider to the nodepool launcher
deployment spec.

This is needed to separate the pods for different nodepool launchers
(otherwise, the deployments may consider pods for one launcher to
belong to another).

Change-Id: I76bbae948d1a633028b3565d512fb48d68111dd7

zuul_operator/templates/nodepool-launcher.yaml

@@ -17,6 +17,7 @@ spec:
       app.kubernetes.io/instance: {{ instance_name }}
       app.kubernetes.io/part-of: zuul
       app.kubernetes.io/component: nodepool-launcher
+      operator.zuul-ci.org/nodepool-provider: {{ provider_name }}
   template:
     metadata:
       labels:
@@ -24,6 +25,7 @@ spec:
         app.kubernetes.io/instance: {{ instance_name }}
         app.kubernetes.io/part-of: zuul
         app.kubernetes.io/component: nodepool-launcher
+        operator.zuul-ci.org/nodepool-provider: {{ provider_name }}
     spec:
       containers:
       - name: launcher

zuul_operator/zuul.py

@@ -304,8 +304,8 @@ class Zuul:
                 'external_config': self.spec.get('externalConfig', {}),
                 'spec': self.spec,
             }
-        utils.apply_file(self.api, 'nodepool-launcher.yaml',
-                         namespace=self.namespace, **kw)
+            utils.apply_file(self.api, 'nodepool-launcher.yaml',
+                             namespace=self.namespace, **kw)
 
         # Get current providers
         providers = objects.Deployment.objects(self.api).filter(