fix yet another recursive var definition in osbs-orchestrotor

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

inventory/group_vars/osbs-stg

@@ -19,7 +19,6 @@ koji_builder_user: dockerbuilder
 
 osbs_client_conf_path: /etc/osbs.conf
 
-openshift_htpasswd_file: /etc/origin/htpasswd
 
 # openshift-ansible variables
 oa_version: openshift-ansible-3.5.97-1
@@ -27,8 +26,9 @@ oa_ssh_user: root
 oa_install_examples: false
 oa_containerized_deploy: false
 oa_auth_profile: osbs
-origin_release: v1.5.1
 oa_debug_level: 2
+oa_htpasswd_file: /etc/origin/htpasswd
+origin_release: v1.5.1
 
 osbs_namespace: "osbs"
 osbs_koji_username: "kojibuilder_stg"

playbooks/groups/osbs-orchestrator-cluster.yml

@@ -98,7 +98,7 @@
     - name: place htpasswd file
       copy:
         src: "{{private}}/files/httpd/osbs-{{env}}.htpasswd"
-        dest: "{{ openshift_htpasswd_file }}"
+        dest: "{{ oa_htpasswd_file }}"
 
 
 # This installs required pre-reqs and deploys the Controler's public key to all
@@ -206,7 +206,7 @@
   roles:
   - role: ansible-ansible-openshift-ansible
     cluster_inventory_filename: "orchestrator-cluster-inventory-stg"
-    openshift_htpasswd_file: "{{ openshift_htpasswd_file }}"
+    openshift_htpasswd_file: "{{ oa_htpasswd_file }}"
     openshift_master_public_api_url: "https://{{ osbs_url }}:8443"
     openshift_release: "{{ origin_release }}"
     openshift_ansible_path: "/root/openshift-ansible"
@@ -230,7 +230,7 @@
 
   - role: ansible-ansible-openshift-ansible
     cluster_inventory_filename: "x86-64-worker-cluster-inventory-stg"
-    openshift_htpasswd_file: "{{ openshift_htpasswd_file }}"
+    openshift_htpasswd_file: "{{ oa_htpasswd_file }}"
     openshift_master_public_api_url: "https://{{ osbsworker_x86_64_url }}:8443"
     openshift_release: "{{ origin_release }}"
     openshift_ansible_path: "/root/openshift-ansible"