Skip to content

Commit

Permalink
Rename ansibleworks to awx.
Browse files Browse the repository at this point in the history
  • Loading branch information
cchurch committed Jun 23, 2013
1 parent 2da6966 commit 0765792
Show file tree
Hide file tree
Showing 306 changed files with 418 additions and 314 deletions.
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ansibleworks/settings/local_settings.py*
ansibleworks/*.sqlite3
ansibleworks/projects
ansibleworks/public/media
ansibleworks/public/static
awx/settings/local_settings.py*
awx/*.sqlite3
awx/projects
awx/public/media
awx/public/static
env/*
build
dist
Expand Down
5 changes: 2 additions & 3 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
AnsibleWorks is commercial software licensed to you under
an annual agreement from AnsibleWorks.
AWX is commercial software licensed to you under an annual agreement from
AnsibleWorks.

It is free for use for up to five managed servers or virtual instances,
after which you must purchase a license.

21 changes: 11 additions & 10 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
recursive-include ansibleworks *.py
recursive-include ansibleworks/static *.ico
recursive-include ansibleworks/templates *.html
recursive-include ansibleworks/ui *.html *.js
recursive-include ansibleworks/ui/static *.css *.ico *.png *.gif *.jpg
recursive-include ansibleworks/ui/static *.eot *.svg *.ttf *.woff *.otf
recursive-include awx *.py
recursive-include awx/static *.ico
recursive-include awx/templates *.html
recursive-include awx/ui *.html *.js
recursive-include awx/ui/static *.css *.ico *.png *.gif *.jpg
recursive-include awx/ui/static *.eot *.svg *.ttf *.woff *.otf
recursive-include config *
recursive-exclude ansibleworks/settings local_settings.py
recursive-exclude awx devonly.py
recursive-exclude awx/settings local_settings.py*
include *.py *.txt *.md
include MANIFEST.in
include COPYING
prune ansibleworks/public
prune ansibleworks/projects
prune ansibleworks/ui/static/lib/jstree/_*
prune awx/public
prune awx/projects
prune awx/ui/static/lib/jstree/_*
16 changes: 7 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PYTHON=python
SITELIB=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
RELEASE=ansibleworks-1.2b2
RELEASE=awx-1.2b2

.PHONY: clean rebase push setup requirements requirements_pypi develop refresh \
adduser syncdb migrate dbchange dbshell runserver celeryd test \
Expand All @@ -20,7 +20,7 @@ rebase:
push:
git push origin master

# Use Ansible to setup AnsibleWorks development environment.
# Use Ansible to setup AWX development environment.
setup:
ansible-playbook app_setup/setup.yml --verbose -i "127.0.0.1," -c local -e working_dir=`pwd`

Expand All @@ -34,8 +34,8 @@ requirements:
requirements_pypi:
pip install -r requirements/dev.txt

# "Install" ansibleworks package in development mode. Creates link to working
# copy in site-packages and installs ansibleworks-manage command.
# "Install" awx package in development mode. Creates link to working
# copy in site-packages and installs awx-manage command.
develop:
python setup.py develop

Expand All @@ -60,10 +60,9 @@ migrate: syncdb
dbchange:
python manage.py schemamigration main v12b2_changes --auto

# access database shell
# asks for password # PYTHON_PATH=./acom python acom/manage.py dbshell
# access database shell, asks for password
dbshell:
sudo -u postgres psql -d acom
sudo -u postgres psql -d awx

# Run the built-in development webserver (by default on http://localhost:8013).
runserver:
Expand Down Expand Up @@ -122,5 +121,4 @@ rpm: sdist
--define "_specdir %{_topdir}" \
--define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \
--define "_sourcedir %{_topdir}" \
-ba packaging/rpm/ansibleworks.spec

-ba packaging/rpm/awx.spec
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
AnsibleWorks
============
AWX
===

Formerly known as ansible-commander, AnsibleWorks provides a web-based user
interface and REST API built on top of Ansible.
Formerly known as ansible-commander and AnsibleWorks, AWX provides a web-based
user interface, REST API and task engine built on top of Ansible.

The current version under development is 1.2-b2.

Resources
---------

Refer to `CONTRIBUTING.md` to get started developing, testing and building
AnsibleWorks.
Refer to `CONTRIBUTING.md` to get started developing, testing and building AWX.

Refer to `setup/README.md` to get started deploying AnsibleWorks.
Refer to `setup/README.md` to get started deploying AWX.
20 changes: 0 additions & 20 deletions ansibleworks/__init__.py

This file was deleted.

11 changes: 0 additions & 11 deletions ansibleworks/main/tests/__init__.py

This file was deleted.

26 changes: 0 additions & 26 deletions ansibleworks/settings/development.py

This file was deleted.

43 changes: 0 additions & 43 deletions ansibleworks/settings/production.py

This file was deleted.

Empty file removed ansibleworks/ui/__init__.py
Empty file.
6 changes: 3 additions & 3 deletions app_setup/setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
# took out parameter... db=acom priv=ALL
- name: setup the postgresql user
postgresql_user: >
name=ansible_commander
name=awx
password=${database_password}
login_user=postgres
sudo_user: postgres

- name: create the database
postgresql_db: name=acom state=present
postgresql_db: name=awx state=present

- name: configure the database authentication for runtime mode
template: src=templates/pg_hba.j2 dest=/var/lib/pgsql/data/pg_hba.conf owner=postgres
Expand All @@ -59,7 +59,7 @@
service: name=postgresql state=restarted

- name: configure python settings (with database password)
template: src=templates/local_settings.py.j2 dest=${working_dir}/ansibleworks/settings/local_settings.py
template: src=templates/local_settings.py.j2 dest=${working_dir}/awx/settings/local_settings.py

- name: sync django database
command: python ${working_dir}/manage.py syncdb --noinput
Expand Down
26 changes: 26 additions & 0 deletions awx/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Copyright (c) 2013 AnsibleWorks, Inc.
# All Rights Reserved.

__version__ = '1.2-b2'

import os
import sys

__all__ = ['__version__']

# Check for the presence/absence of "devonly" module to determine if running
# from a source code checkout or release packaage.
try:
import awx.devonly
MODE = 'development'
except ImportError:
MODE = 'production'

def manage():
# Update the default settings environment variable based on current mode.
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'awx.settings.%s' % MODE)
from django.core.management import execute_from_command_line
if len(sys.argv) >= 2 and sys.argv[1] in ('version', '--version'):
sys.stdout.write('awx-%s\n' % __version__)
else:
execute_from_command_line(sys.argv)
6 changes: 6 additions & 0 deletions awx/devonly.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Copyright (c) 2013 AnsibleWorks, Inc.
# All Rights Reserved.

# This file should only be present in a source checkout, and never in a release
# package, to allow us to determine whether we're running in a development or
# production mode.
File renamed without changes.
4 changes: 2 additions & 2 deletions ansibleworks/main/access.py → awx/main/access.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import logging
from django.db.models import Q
from django.contrib.auth.models import User
from ansibleworks.main.models import *
from awx.main.models import *

__all__ = ['get_user_queryset', 'check_user_access']

logger = logging.getLogger('ansibleworks.main.access')
logger = logging.getLogger('awx.main.access')

access_registry = {
# <model_class>: [<access_class>, ...],
Expand Down
6 changes: 3 additions & 3 deletions ansibleworks/main/admin.py → awx/main/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
from django.contrib.auth.models import User
from django.contrib.auth.admin import UserAdmin

from ansibleworks.main.compat import format_html
from ansibleworks.main.models import *
from ansibleworks.main.forms import *
from awx.main.compat import format_html
from awx.main.models import *
from awx.main.forms import *


class UserAdmin(UserAdmin):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from rest_framework import authentication
from rest_framework import exceptions

# AnsibleWorks
from ansibleworks.main.models import Job
# AWX
from awx.main.models import Job

class JobCallbackAuthentication(authentication.BaseAuthentication):
'''
Expand Down
14 changes: 7 additions & 7 deletions ansibleworks/main/base_views.py → awx/main/base_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

from django.http import HttpResponse, Http404
from django.views.decorators.csrf import csrf_exempt
from ansibleworks.main.models import *
from awx.main.models import *
from django.contrib.auth.models import User
from ansibleworks.main.serializers import *
from ansibleworks.main.rbac import *
from ansibleworks.main.access import *
from awx.main.serializers import *
from awx.main.rbac import *
from awx.main.access import *
from rest_framework.exceptions import PermissionDenied
from rest_framework import mixins
from rest_framework import generics
Expand Down Expand Up @@ -141,10 +141,10 @@ def post(self, request, *args, **kwargs):

if self.__class__.parent_model == Organization:
organization = Organization.objects.get(pk=data[inject_primary_key])
import ansibleworks.main.views
if self.__class__ == ansibleworks.main.views.OrganizationUsersList:
import awx.main.views
if self.__class__ == awx.main.views.OrganizationUsersList:
organization.users.add(obj)
elif self.__class__ == ansibleworks.main.views.OrganizationAdminsList:
elif self.__class__ == awx.main.views.OrganizationAdminsList:
organization.admins.add(obj)

else:
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions ansibleworks/main/forms.py → awx/main/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
from django import forms
from django.utils.translation import ugettext_lazy as _

# AnsibleWorks
from ansibleworks.main.models import *
# AWX
from awx.main.models import *

EMPTY_CHOICE = ('', '---------')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


class Migration(SchemaMigration):
'''Complete initial migration for AnsibleWorks 1.2-b1 release.'''
'''Complete initial migration for AWX 1.2-b1 release.'''

def forwards(self, orm):
# Adding model 'Tag'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class Migration(SchemaMigration):
'''
Schema migration for AnsibleWorks 1.2-b2 release.
Schema migration for AWX 1.2-b2 release.
- Adds variables field on Host and Group models.
- Adds job_tags and host_config_key fields on JobTemplate.
- Adds job_tags, job_args, job_cwd, job_env fields on Job.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class Migration(DataMigration):
'''
Data migration for AnsibleWorks 1.2-b2 release.
Data migration for AWX 1.2-b2 release.
- Update variables from VariableData.data for Host and Group models.
- Update new char/text field values to be empty string if they are null.
- Update failed flag for existing JobHostSummary models.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class Migration(SchemaMigration):
'''
Schema migration for AnsibleWorks 1.2-b2 release.
Schema migration for AWX 1.2-b2 release.
- Remove variable_data field on Host and Group models.
- Remove VariableData model.
- Remove null=True on new char fields previously added.
Expand Down
Loading

0 comments on commit 0765792

Please sign in to comment.