Welcome to Ansible Tower! Please complete the steps below to acquire a license.
-
- 1
-
-
- Please click the button below to visit Ansible's website to get a Tower license key.
-
+
Welcome to Ansible Tower! Please complete the steps below to acquire a license.
+
-
-
- Request License
-
-
-
-
- 2
-
-
- Choose your license file, agree to the End User License Agreement, and click submit.
-
+
+ *
+ End User License Agreement
-
-
+
diff --git a/awx/ui/client/src/license/license.route.js b/awx/ui/client/src/license/license.route.js
index 98ba25d79c..4c1251ca6a 100644
--- a/awx/ui/client/src/license/license.route.js
+++ b/awx/ui/client/src/license/license.route.js
@@ -17,30 +17,49 @@ export default {
ncyBreadcrumb: {
label: N_('LICENSE')
},
- onEnter: ['$state', 'ConfigService', (state, configService) => {
- return configService.getConfig()
- .then(config => {
- if (_.get(config, 'license_info.license_type') === 'open') {
- return state.go('setup');
- }
- });
- }],
+ onEnter: ['$state', 'ConfigService', (state, configService) => {
+ return configService.getConfig()
+ .then(config => {
+ if (_.get(config, 'license_info.license_type') === 'open') {
+ return state.go('setup');
+ }
+ });
+ }],
resolve: {
features: ['CheckLicense', '$rootScope',
function(CheckLicense, $rootScope) {
if($rootScope.licenseMissing === undefined){
return CheckLicense.notify();
}
-
- }],
+ }
+ ],
config: ['ConfigService', 'CheckLicense', '$rootScope',
function(ConfigService, CheckLicense, $rootScope) {
ConfigService.delete();
- return ConfigService.getConfig()
- .then(function(config){
- $rootScope.licenseMissing = (CheckLicense.valid(config.license_info) === false) ? true : false;
- return config;
+ return ConfigService.getConfig()
+ .then(function(config){
+ $rootScope.licenseMissing = (CheckLicense.valid(config.license_info) === false) ? true : false;
+ return config;
+ });
+ }
+ ],
+ rhCreds: ['Rest', 'GetBasePath', function(Rest, GetBasePath) {
+ Rest.setUrl(`${GetBasePath('settings')}system/`);
+ return Rest.get()
+ .then(({data}) => {
+ const rhCreds = {};
+ if (data.REDHAT_USERNAME && data.REDHAT_USERNAME !== "") {
+ rhCreds.REDHAT_USERNAME = data.REDHAT_USERNAME;
+ }
+
+ if (data.REDHAT_PASSWORD && data.REDHAT_PASSWORD !== "") {
+ rhCreds.REDHAT_PASSWORD = data.REDHAT_PASSWORD;
+ }
+
+ return rhCreds;
+ }).catch(() => {
+ return {};
});
- }]
+ }]
},
};
diff --git a/awx/ui/client/src/shared/Utilities.js b/awx/ui/client/src/shared/Utilities.js
index 8c3a2b9d7b..c731a54bba 100644
--- a/awx/ui/client/src/shared/Utilities.js
+++ b/awx/ui/client/src/shared/Utilities.js
@@ -238,9 +238,9 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
msg = "";
_.forOwn(data, function(value, key) {
if (Array.isArray(data[key])) {
- msg += `${key}: ${data[key][0]}`;
+ msg += `${key.toUpperCase()}: ${data[key][0]}`;
} else {
- msg += `${key} : ${value} `;
+ msg += `${key.toUpperCase()}: ${value} `;
}
});
Alert(defaultMsg.hdr, msg);
diff --git a/awx/ui/client/src/shared/config/config.service.js b/awx/ui/client/src/shared/config/config.service.js
index 910e89c9e4..8432303f8e 100644
--- a/awx/ui/client/src/shared/config/config.service.js
+++ b/awx/ui/client/src/shared/config/config.service.js
@@ -58,6 +58,11 @@ export default
deferred.reject('Config not found.');
}
return deferred.promise;
+ },
+
+ getSubscriptions: function(username, password) {
+ Rest.setUrl(`${GetBasePath('config')}subscriptions`);
+ return Rest.post({ rh_username: username, rh_password: password} );
}
};
}
diff --git a/awx/ui/test/spec/license/license.controller-test.js b/awx/ui/test/spec/license/license.controller-test.js
index eb013776b4..660e918e79 100644
--- a/awx/ui/test/spec/license/license.controller-test.js
+++ b/awx/ui/test/spec/license/license.controller-test.js
@@ -6,7 +6,8 @@ describe('Controller: LicenseController', () => {
LicenseController,
ConfigService,
ProcessErrors,
- config;
+ config,
+ rhCreds;
beforeEach(angular.mock.module('awApp'));
beforeEach(angular.mock.module('license', ($provide) => {
@@ -22,23 +23,31 @@ describe('Controller: LicenseController', () => {
version: '3.1.0-devel'
};
+ rhCreds = {
+ password: '$encrypted$',
+ username: 'foo',
+ }
+
ProcessErrors = jasmine.createSpy('ProcessErrors');
$provide.value('ConfigService', ConfigService);
$provide.value('ProcessErrors', ProcessErrors);
$provide.value('config', config);
+ $provide.value('rhCreds', rhCreds);
}));
- beforeEach(angular.mock.inject( ($rootScope, $controller, _ConfigService_, _ProcessErrors_, _config_) => {
+ beforeEach(angular.mock.inject( ($rootScope, $controller, _ConfigService_, _ProcessErrors_, _config_, _rhCreds_) => {
scope = $rootScope.$new();
ConfigService = _ConfigService_;
ProcessErrors = _ProcessErrors_;
config = _config_;
+ rhCreds = _rhCreds_;
LicenseController = $controller('licenseController', {
$scope: scope,
ConfigService: ConfigService,
ProcessErrors: ProcessErrors,
- config: config
+ config: config,
+ rhCreds: rhCreds
});
}));
diff --git a/awxkit/awxkit/api/pages/__init__.py b/awxkit/awxkit/api/pages/__init__.py
index 19cf7323ca..fafe5dc08f 100644
--- a/awxkit/awxkit/api/pages/__init__.py
+++ b/awxkit/awxkit/api/pages/__init__.py
@@ -38,3 +38,4 @@ from .instances import * # NOQA
from .instance_groups import * # NOQA
from .credential_input_sources import * # NOQA
from .metrics import * # NOQA
+from .subscriptions import * # NOQA
diff --git a/awxkit/awxkit/api/pages/subscriptions.py b/awxkit/awxkit/api/pages/subscriptions.py
new file mode 100644
index 0000000000..749776c000
--- /dev/null
+++ b/awxkit/awxkit/api/pages/subscriptions.py
@@ -0,0 +1,11 @@
+from awxkit.api.resources import resources
+from . import page
+
+
+class Subscriptions(page.Page):
+
+ def get_possible_licenses(self, **kwargs):
+ return self.post(json=kwargs).json
+
+
+page.register_page(resources.subscriptions, Subscriptions)
diff --git a/awxkit/awxkit/api/resources.py b/awxkit/awxkit/api/resources.py
index 657a41b7f3..d317bcc55d 100644
--- a/awxkit/awxkit/api/resources.py
+++ b/awxkit/awxkit/api/resources.py
@@ -265,6 +265,7 @@ class Resources(object):
_workflow_job_template_workflow_nodes = r'workflow_job_templates/\d+/workflow_nodes/'
_workflow_job_templates = 'workflow_job_templates/'
_workflow_job_workflow_nodes = r'workflow_jobs/\d+/workflow_nodes/'
+ _subscriptions = 'config/subscriptions/'
_workflow_jobs = 'workflow_jobs/'
api = '/api/'
common = api + r'v\d+/'