Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
configuration
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
configuration
Commits
9789df89
Commit
9789df89
authored
Dec 21, 2015
by
Calen Pennington
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update the django IDA template to match the latest Docker changes
parent
69813d45
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
playbooks/roles/ansible-role-django-ida/templates/docker/build/ROLE_NAME/Dockerfile.j2
+4
-5
playbooks/roles/ansible-role-django-ida/templates/meta/main.yml.j2
+2
-1
No files found.
playbooks/roles/ansible-role-django-ida/templates/docker/build/ROLE_NAME/Dockerfile.j2
View file @
9789df89
...
...
@@ -7,19 +7,18 @@
# This allows the dockerfile to update /edx/app/edx_ansible/edx_ansible
# with the currently checked-out configuration repo.
FROM edxops/trusty-common
FROM edxops/trusty-common
:latest
MAINTAINER edxops
ARG
{{ role_name|upper }}_VERSION=master
ARG
REPO_OWNER=edx
ENV
{{ role_name|upper }}_VERSION=master
ENV
REPO_OWNER=edx
ADD . /edx/app/edx_ansible/edx_ansible
USER docker
WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
COPY docker/build/{{ role_name|replace("_","-") }}/ansible_overrides.yml /
RUN sudo ansible-playbook {{ role_name }}.yml \
RUN sudo
/edx/app/edx_ansible/venvs/edx_ansible/bin/
ansible-playbook {{ role_name }}.yml \
-c local -i '127.0.0.1,' \
-t 'install,assets,devstack:install' \
--extra-vars="@/ansible_overrides.yml" \
...
...
playbooks/roles/ansible-role-django-ida/templates/meta/main.yml.j2
View file @
9789df89
...
...
@@ -12,6 +12,8 @@
# my_role_var1: "bar"
# }
dependencies:
- common
- supervisor
- role: edx_service
edx_service_name: "{{ '{{' }} {{ role_name }}_service_name }}"
edx_service_config: "{{ '{{' }} {{ role_name|upper }}_SERVICE_CONFIG }}"
...
...
@@ -21,4 +23,3 @@ dependencies:
edx_service_packages:
debian: "{{ '{{' }} {{ role_name }}_debian_pkgs }}"
redhat: "{{ '{{' }} {{ role_name }}_redhat_pkgs }}"
- supervisor
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment