Merge branch 'master' of https://github.com/openshift/openshift-ansible-contrib

Merge upstream commits

playbooks/provisioning/openstack/pre_tasks.yml

@@ -7,7 +7,7 @@
 
 - name: Set default Environment ID
   set_fact:
-    default_env_id: "casl-{{ lookup('env','OS_USERNAME') }}-{{ env_random_id }}"
+    default_env_id: "openshift-{{ lookup('env','OS_USERNAME') }}-{{ env_random_id }}"
   delegate_to: localhost
 
 - name: Setting Common Facts

roles/openstack-stack/README.md

@@ -5,5 +5,5 @@ Role for spinning up instances using OpenStack Heat.
 ## To Test
 
 ```
-ansible-playbook casl-ansible/roles/openstack-stack/test/stack-create-test.yml
+ansible-playbook openshift-ansible-contrib/roles/openstack-stack/test/stack-create-test.yml
 ```

roles/openstack-stack/tasks/generate-templates.yml

@@ -3,7 +3,7 @@
   register: stack_template_pre
   tempfile:
     state: directory
-    prefix: casl-ansible
+    prefix: openshift-ansible
 
 - name: set template paths
   set_fact: