oo_option fixed, some clean up

4 files changed, 3 insertions, 31 deletions

diff --git a/bin/cluster b/bin/cluster
index e72ce547c..0e305141f 100755
--- a/bin/cluster
+++ b/bin/cluster
@@ -197,7 +197,7 @@ class Cluster(object):
         if args.option:
             for opt in args.option:
                 k, v = opt.split('=', 1)
-                env[k] = v
+                env['cli_' + k] = v
 
         ansible_env = '-e \'{}\''.format(
             ' '.join(['%s=%s' % (key, value) for (key, value) in env.items()])
diff --git a/inventory/gce/hosts/gce.py b/inventory/gce/hosts/gce.py
index bf018f1fe..6ed12e011 100755
--- a/inventory/gce/hosts/gce.py
+++ b/inventory/gce/hosts/gce.py
@@ -120,7 +120,6 @@ class GceInventory(object):
             os.path.dirname(os.path.realpath(__file__)), "gce.ini")
         gce_ini_path = os.environ.get('GCE_INI_PATH', gce_ini_default_path)
 
-	print "GCE INI PATH :: "+gce_ini_path
 
         # Create a ConfigParser.
         # This provides empty defaults to each key, so that environment
@@ -175,10 +174,7 @@ class GceInventory(object):
         args[1] = os.environ.get('GCE_PEM_FILE_PATH', args[1])
         kwargs['project'] = os.environ.get('GCE_PROJECT', kwargs['project'])
 
-	sys.stderr.write("GCE_EMAIL : "+args[0]+"\n")
-	sys.stderr.write("GCE_PEM_FILE_PATH : "+args[1]+"\n")
-	sys.stderr.write("GCE_PROJECT : "+kwargs['project']+"\n")
-
+        
         # Retrieve and return the GCE driver.
         gce = get_driver(Provider.GCE)(*args, **kwargs)
         gce.connection.user_agent_append(
@@ -291,5 +287,4 @@ class GceInventory(object):
 
 
 # Run the script
-print "Hello world"
 GceInventory()
diff --git a/playbooks/gce/openshift-cluster/join_node.yml b/playbooks/gce/openshift-cluster/join_node.yml
index 613bbb34f..0dfa3e9d7 100644
--- a/playbooks/gce/openshift-cluster/join_node.yml
+++ b/playbooks/gce/openshift-cluster/join_node.yml
@@ -27,22 +27,6 @@
       ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
       groups: oo_nodes_to_config
 
-  - name: Add to preemptible group if needed
-    add_host:
-      name: "{{ node_ip }}"
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
-      groups: oo_preemptible_nodes
-    when: preemptible is defined and preemptible == "true"
-  
-  - name: Add to not preemptible group if needed
-    add_host:
-      name: "{{ node_ip }}"
-      ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
-      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
-      groups: oo_non_preemptible_nodes
-    when: preemptible is defined and  preemptible == "false"
-  
   - name: Evaluate oo_first_master
     add_host:
       name: "{{ groups['tag_env-host-type-' ~ cluster_id ~ '-openshift-master'][0] }}"
@@ -59,6 +43,7 @@
     openshift_deployment_type: "{{ deployment_type }}"
     openshift_hostname: "{{ ansible_default_ipv4.address }}"
     openshift_use_openshift_sdn: true
+    openshift_node_labels: "{{ lookup('oo_option', 'openshift_node_labels') }} "
     os_sdn_network_plugin_name: "redhat/openshift-ovs-subnet"
     osn_cluster_dns_domain: "{{ hostvars[groups.oo_first_master.0].openshift.dns.domain }}"
     osn_cluster_dns_ip: "{{ hostvars[groups.oo_first_master.0].openshift.dns.ip }}"
diff --git a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
index e3e2b6872..cd2636c9c 100644
--- a/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
+++ b/playbooks/openstack/openshift-cluster/files/heat_stack.yaml
@@ -256,14 +256,6 @@ resources:
           port_range_max: 10250
           remote_mode: remote_group_id
           remote_group_id: { get_resource: master-secgrp }
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 30001 
-          port_range_max: 30001
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 30850 
-          port_range_max: 30850
 
   infra-secgrp:
     type: OS::Neutron::SecurityGroup