osbs-master: be sure to have htpasswd file in place before starting origin-master

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

playbooks/groups/osbs-master.yml

@@ -53,6 +53,16 @@
         src: "{{private}}/files/osbs/{{env}}/osbs-internal.key"
         dest: "/etc/origin/master/named_certificates/{{osbs_url}}.key"
 
+    - name: ensure origin conf dir exists
+      file:
+        path: "/etc/origin"
+        state: "directory"
+
+    - name: place htpasswd file
+      copy:
+        src: "{{private}}/files/httpd/osbs.htpasswd"
+        dest: /etc/origin/htpasswd
+
 - name: setup osbs
   hosts: osbs:osbs-stg
   vars_files:
@@ -179,11 +189,6 @@
 
 
   handlers:
-    - name: place htpasswd file
-      copy:
-        src: "{{private}}/files/httpd/osbs.htpasswd"
-        dest: /etc/origin/htpasswd
-
     - name: buildroot container
       shell: atomic-reactor create-build-image --reactor-tarball-path /usr/share/atomic-reactor/atomic-reactor.tar.gz /etc/osbs/buildroot/ buildroot