Rename docker course_discovery to course-discovery for consistency with the dockerhub repo

docker/build/course_discovery/Dockerfile → docker/build/course-discovery/Dockerfile

@@ -2,7 +2,7 @@
 #
 # From the root of configuration:
 #
-# docker build -f docker/build/course_discovery/Dockerfile .
+# docker build -f docker/build/course-discovery/Dockerfile .
 #
 # This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible
 # with the currently checked-out configuration repo.
@@ -18,7 +18,7 @@ ADD . /edx/app/edx_ansible/edx_ansible
 USER docker
 WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
 
-COPY docker/build/course_discovery/ansible_overrides.yml /
+COPY docker/build/course-discovery/ansible_overrides.yml /
 RUN sudo ansible-playbook course_discovery.yml \
     -c local -i '127.0.0.1,' \
     -t 'install,assets,devstack:install' \

playbooks/roles/ansible-role-django-ida/tasks/main.yml

@@ -34,9 +34,9 @@
 - name: update docker templates
   template: src=docker/{{ item.src }} dest=../docker/{{ item.dest }}
   with_items:
-    - { src: 'build/ROLE_NAME/Dockerfile.j2', dest: 'build/{{ role_name }}/Dockerfile'}
-    - { src: 'build/ROLE_NAME/ansible_overrides.yml.j2', dest: 'build/{{ role_name }}/ansible_overrides.yml'}
-    - { src: 'build/ROLE_NAME/inventory', dest: 'build/{{ role_name }}/inventory'}
+    - { src: 'build/ROLE_NAME/Dockerfile.j2', dest: 'build/{{ role_name|replace("_","-") }}/Dockerfile'}
+    - { src: 'build/ROLE_NAME/ansible_overrides.yml.j2', dest: 'build/{{ role_name|replace("_","-") }}/ansible_overrides.yml'}
+    - { src: 'build/ROLE_NAME/inventory', dest: 'build/{{ role_name|replace("_","-") }}/inventory'}
     - { src: 'plays/ROLE_NAME.yml.j2', dest: 'plays/{{ role_name }}.yml'}
 
 - name: update role templates

playbooks/roles/ansible-role-django-ida/templates/docker/build/ROLE_NAME/Dockerfile.j2

@@ -2,7 +2,7 @@
 #
 # From the root of configuration:
 #
-# docker build -f docker/build/{{ role_name }}/Dockerfile .
+# docker build -f docker/build/{{ role_name|replace("_","-") }}/Dockerfile .
 #
 # This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible
 # with the currently checked-out configuration repo.
@@ -18,7 +18,7 @@ ADD . /edx/app/edx_ansible/edx_ansible
 USER docker
 WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
 
-COPY docker/build/{{ role_name }}/ansible_overrides.yml /
+COPY docker/build/{{ role_name|replace("_","-") }}/ansible_overrides.yml /
 RUN sudo ansible-playbook {{ role_name }}.yml \
     -c local -i '127.0.0.1,' \
     -t 'install,assets,devstack:install' \