"auth_strategy"
equal to "keystone"
@X
"keystone_authtoken.auth_host"
in "$X"
diff --git a/config-validator-ui-concept/js/controllers/validate_controller.js b/config-validator-ui-concept/js/controllers/validate_controller.js index b53604d..3b0d795 100644 --- a/config-validator-ui-concept/js/controllers/validate_controller.js +++ b/config-validator-ui-concept/js/controllers/validate_controller.js @@ -1,9 +1,8 @@ -'use strict'; /* Controllers */ angular.module('rubick.controllers', []). - controller('ValidateCtrl', ['$scope', function($scope) { + controller('ValidateCtrl', ['$scope', '$http', function($scope, $http) { $scope.currentStep = "cluster"; $scope.ruleGroup = "valid"; @@ -22,24 +21,13 @@ angular.module('rubick.controllers', []). $('#add-cluster-modal').modal('show'); } - $scope.clusters = [ - { - name: "Kirill's DevStack", - description: "Grizzly-based devstack with Quantum and oVS, deployed on Kirill's laptop", - sshKey: "beasdfahsldjhfsadg", - nodesCount: 2, - status: "Available", - lastChecked: moment().startOf('hour').fromNow() - }, - { - name: "Peter's DevStack", - description: "Grizzly-based devstack deployed on Peter Lomakin's workstation with nova-network and FlatDHCP manager", - sshKey: "beasdfahsldjhfsadg", - nodesCount: 5, - status: "Broken", - lastChecked: moment().startOf('day').fromNow() - } - ] + $http.get('/clusters').success(function(data) { + $scope.clusters = data; + }); + + $http.get('/rules').success(function(data) { + $scope.rules = data; + }); $scope.addCluster = function() { $scope.newCluster.nodesCount = 20; @@ -48,5 +36,4 @@ angular.module('rubick.controllers', []). $scope.newCluster = undefined; $('#add-cluster-modal').modal('hide'); } - }]) diff --git a/config-validator-ui-concept/partials/main.html b/config-validator-ui-concept/partials/main.html index a297d48..fe44c91 100644 --- a/config-validator-ui-concept/partials/main.html +++ b/config-validator-ui-concept/partials/main.html @@ -92,7 +92,7 @@ ng-class="{'active' : ruleGroup == 'valid'}"> Validty -
"auth_strategy"
equal to "keystone"
@X
"keystone_authtoken.auth_host"
in "$X"
"auth_strategy"
equal to "keystone"
@X
"keystone_authtoken.auth_host"
in "$X"