fix osbs-stg host_vars for instantiation of osbs-namespace role

Signed-off-by: Adam Miller <admiller@redhat.com>

inventory/group_vars/osbs-orchestrators-stg

@@ -6,9 +6,6 @@ osbs_kubeconfig_path: /etc/origin/master/admin.kubeconfig
 osbs_environment:
   HOME: "{{ lookup('env', 'HOME') }}"
   KUBECONFIG: "{{ osbs_kubeconfig_path }}"
-osbs_service_accounts:
-- koji
-- metrics
 osbs_readonly_users:
 - "system:serviceaccount:{{ osbs_namespace }}:metrics"
 osbs_readonly_groups:

inventory/group_vars/osbs-stg

@@ -30,44 +30,32 @@ oa_debug_level: 2
 oa_htpasswd_file: /etc/origin/htpasswd
 origin_release: v1.5.1
 
-osbs_namespace: "osbs"
 osbs_koji_username: "kojibuilder_stg"
 
-osbs_openshift_home: /var/lib/origin
+openshift_home: /var/lib/origin
-osbs_kubeconfig_path: /etc/origin/master/admin.kubeconfig
+generated_config_path: /tmp
-osbs_generated_config_path: /tmp
 
-osbs_environment:
+osbs_admin: true
-  KUBECONFIG: "{{ osbs_kubeconfig_path }}"
 
-osbs_is_admin: true
+osbs_orchestrator_service_accounts:
-
-osbs_service_accounts:
 - worker
 - orchestrator
 - metrics
 
-osbs_cpu_limitrange: '200m'
+os_cpu_limitrange: '200m'
 
 # FIXME
-# I'm not sure who all should be admins and we might want some read-only user
-# for the purpose of monitoring
-osbs_admin_groups: []
-osbs_admin_users: []
-osbs_readonly_groups: []
-osbs_readonly_users: []
-osbs_readwrite_groups: []
-osbs_readwrite_users: []
 
 osbs_orchestrator: false
 
 osbs_worker_namespace: "worker"
+osbs_orchestrator_namespace: "osbs"
 
 osbs_worker_service_accounts:
 - worker
 - orchestrator
 
-osbs_worker_clusters:
+worker_clusters:
   x86_64:
   - name: osbsworker-x86-64
     max_concurrent_builds: 12
@@ -77,8 +65,8 @@ osbs_worker_clusters:
     - "{{stable_registry}}"
     - "{{candidate_registry}}"
 
-osbs_koji_hub: "https://{{koji_url}}/kojihub"
+koji_hub: "https://{{koji_url}}/kojihub"
-osbs_koji_root: "https://{{koji_url}}/koji"
+koji_root: "https://{{koji_url}}/koji"
 
 osbs_pulp_registry_name: brew-prod
 
@@ -86,18 +74,47 @@ osbs_registry_uri: "https://{{candidate_registry}}/v2"
 
 osbs_source_registry_uri: http://brew-pulp-docker01.web.prod.ext.phx2.redhat.com:8888
 
-osbs_koji_secret_name: koji
+koji_secret_name: kojisecret
-osbs_distribution_scope: public
+distribution_scope: public
-osbs_authoritative_registry: "{{ stable_registry }}"
+authoritative_registry: "{{ stable_registry }}"
-osbs_registry_api_versions:
+registry_api_versions:
 - v2
-osbs_registry_secret_name: v2-registry-dockercfg
+registry_secret_name: v2-registry-dockercfg
-osbs_build_json_dir: /usr/share/osbs
+build_json_dir: /usr/share/osbs
-osbs_sources_command: fedpkg sources
+sources_command: fedpkg sources
-osbs_vendor: Fedora Project
+vendor: Fedora Project
 
 #nodeselectors
 osbs_orchestrator_default_nodeselector: "orchestrator=true"
 osbs_worker_default_nodeselector: "worker=true"
 
+build_json_dir: /usr/share/osbs
 
+
+osbs_manage_firewalld: false
+
+kubeconfig_path: /etc/origin/master/admin.kubeconfig
+osbs_env:
+  HOME: "{{ lookup('env', 'HOME') }}"
+  KUBECONFIG: "{{ osbs_kubeconfig_path }}"
+os_readonly_users:
+- "system:serviceaccount:{{ osbs_namespace }}:metrics"
+os_readonly_groups:
+- "system:authenticated"
+os_readwrite_groups: []
+os_readwrite_users:
+- "{{ ansible_hostname }}"
+- "system:serviceaccount:{{ osbs_namespace }}:default"
+- "system:serviceaccount:{{ osbs_namespace }}:builder"
+os_admin_users:
+- kevin
+- puiterwijk
+- maxamillion
+- dgilmore
+os_admin_groups: []
+osbs_nodes: "{{ groups['osbs-orchestrator-' + env + '-nodes'] }}"
+
+
+#nodeselectors
+osbs_orchestrator_default_nodeselector: "orchestrator=true"
+osbs_worker_default_nodeselector: "worker=true"

playbooks/groups/osbs-orchestrator-cluster.yml

@@ -327,13 +327,38 @@
 
   roles:
   - role: osbs-namespace
+    osbs_namespace: "{{ osbs_orchestrator_namespace }}"
+    osbs_openshift_home: "{{ openshift_home}}"
+    osbs_kubeconfig_path: "{{ kubeconfig_path }}"
+    osbs_generated_config_path: "{{ generated_config_path }}"
+    osbs_environmnet: "{{ osbs_env }}"
+    osbs_is_admin: "{{ osbs_admin }}"
+    osbs_service_accounts: "{{ osbs_orchestrator_service_accounts }}"
+    osbs_cpu_limitrange: "{{ os_cpu_limitrange }}"
+    osbs_admin_groups: "{{ os_admin_groups }}"
+    osbs_admin_users: "{{ os_admin_users }}"
+    osbs_readonly_groups: "{{ os_readonly_groups }}"
+    osbs_readonly_users: "{{ os_readonly_users }}"
+    osbs_readwrite_groups: "{{ os_readwrite_groups }}"
+    osbs_readwrite_users: "{{ os_readwrite_users }}"
     osbs_orchestrator: true
-    osbs_cpu_limitrange: "{{ osbs_orchestrator_cpu_limitrange }}"
+    osbs_worker_clusters: "{{ worker_clusters }}"
+    osbs_koji_secret_name: "{{ koji_secret_name }}"
+    osbs_distribution_scope: "{{ distribution_scope }}"
+    osbs_authoritative_registry: "{{ authoritative_registry }}"
+    osbs_koji_hub: "{{ koji_hub }}"
+    osbs_koji_root: "{{ koji_root }}"
+    osbs_registry_api_versions: "{{ registry_api_versions }}"
+    osbs_registry_uri: "{{ candidate_registry }}"
+    osbs_source_registry_uri: "{{ stable_registry }}"
+    osbs_build_json_dir: "{{ build_json_dir }}"
+    osbs_sources_command: "fedpkg sources"
+    osbs_cpu_limitrange: "{{ os_cpu_limitrange }}"
     osbs_nodeselector: "{{ osbs_orchestrator_default_nodeselector|default('') }}"
 
   - role: osbs-secret
     osbs_namespace: "{{ osbs_worker_namespace }}"
-    osbs_secret_name: kojisecret
+    osbs_secret_name: "{{ koji_secret_name }}"
     osbs_secret_files:
     - source: "{{ secret_repo }}/groups/osbs-{{ env }}/koji/cert"
       dest: cert
@@ -371,8 +396,33 @@
   roles:
   - role: osbs-namespace
     osbs_namespace: "{{ osbs_worker_namespace }}"
+    osbs_openshift_home: "{{ openshift_home}}"
+    osbs_kubeconfig_path: "{{ kubeconfig_path }}"
+    osbs_generated_config_path: "{{ generated_config_path }}"
+    osbs_environmnet: "{{ osbs_env }}"
+    osbs_is_admin: "{{ osbs_admin }}"
     osbs_service_accounts: "{{ osbs_worker_service_accounts }}"
-    osbs_nodeselector: "{{ osbs_worker_default_nodeselector|default('') }}"
+    osbs_cpu_limitrange: "{{ os_cpu_limitrange }}"
+    osbs_admin_groups: "{{ os_admin_groups }}"
+    osbs_admin_users: "{{ os_admin_users }}"
+    osbs_readonly_groups: "{{ os_readonly_groups }}"
+    osbs_readonly_users: "{{ os_readonly_users }}"
+    osbs_readwrite_groups: "{{ os_readwrite_groups }}"
+    osbs_readwrite_users: "{{ os_readwrite_users }}"
+    osbs_orchestrator: false
+    osbs_worker_clusters: "{{ worker_clusters }}"
+    osbs_koji_secret_name: "{{ koji_secret_name }}"
+    osbs_distribution_scope: "{{ distribution_scope }}"
+    osbs_authoritative_registry: "{{ authoritative_registry }}"
+    osbs_koji_hub: "{{ koji_hub }}"
+    osbs_koji_root: "{{ koji_root }}"
+    osbs_registry_api_versions: "{{ registry_api_versions }}"
+    osbs_registry_uri: "{{ candidate_registry }}"
+    osbs_source_registry_uri: "{{ stable_registry }}"
+    osbs_build_json_dir: "{{ build_json_dir }}"
+    osbs_sources_command: "fedpkg sources"
+    osbs_cpu_limitrange: "{{ os_cpu_limitrange }}"
+    osbs_nodeselector: "{{ osbs_orchestrator_default_nodeselector|default('') }}"
 
   - role: osbs-secret
     osbs_namespace: "{{ osbs_worker_namespace }}"
@@ -506,8 +556,8 @@
           registry_uri: 'https://{{candidate_registry}}/v2',
           source_registry_uri: 'https://{{stable_registry}}/v2',
           build_host: '{{osbs_url}}',
-          koji_root: '{{osbs_koji_root}}',
+          koji_root: '{{koji_root}}',
-          koji_hub: '{{osbs_koji_hub}}',
+          koji_hub: '{{koji_hub}}',
           sources_command: 'fedpkg sources',
           build_type: 'prod',
           authoritative_registry: '{{stable_registry}}',