incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject svn commit: r1395430 [1/13] - in /incubator/ambari/branches/AMBARI-666: ./ ambari-agent/src/main/puppet/manifestloader/ ambari-agent/src/main/puppet/modules/configgenerator/manifests/ ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/ ambari-ag...
Date Mon, 08 Oct 2012 01:38:08 GMT
Author: mahadev
Date: Mon Oct  8 01:37:59 2012
New Revision: 1395430

URL: http://svn.apache.org/viewvc?rev=1395430&view=rev
Log:
Committing AMBARI-812, AMBARI-820, AMBARI-812

Added:
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/manifestGenerator/
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/manifestGenerator/imports.txt
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/manifestGenerator/manifestGenerator.py
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/ProviderModule.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/internal/DefaultProviderModule.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/internal/PropertyPredicateVisitor.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/jdbc/JDBCProviderModule.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/jdbc/JDBCResourceProvider.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/handlers/CreateHandler.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/handlers/DeleteHandler.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/handlers/ReadHandler.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/handlers/UpdateHandler.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/ResultPostProcessor.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/ResultPostProcessorImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/serializers/
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/serializers/JsonSerializer.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/serializers/ResultSerializer.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/util/
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/util/TreeNode.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/util/TreeNodeImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/handlers/ReadHandlerTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/resources/data.db   (with props)
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentJackSonJsonProvider.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/AndPredicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/ArrayPredicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/BasePredicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/Comparables.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/ComparisonPredicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/EqualsPredicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/GreaterEqualsPredicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/GreaterPredicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/LessEqualsPredicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/LessPredicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/NotPredicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/OrPredicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/PredicateVisitor.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/PredicateVisitorAcceptor.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/PropertyPredicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/predicate/UnaryPredicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ClusterController.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Predicate.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/PropertyId.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/PropertyProvider.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Request.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ResourceProvider.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Schema.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterFactory.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/host/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostHealthyHeartbeatEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostHeartbeatLostEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostRegistrationRequestEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostStatusUpdatesReceivedEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostUnhealthyHeartbeatEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/job/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/job/Job.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/job/JobCompletedEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/job/JobEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/job/JobEventType.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/job/JobFailedEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/job/JobId.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/job/JobImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/job/JobProgressUpdateEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/job/JobState.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/job/JobType.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/job/NewJobEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostInstallEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostOpFailedEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostOpInProgressEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostOpRestartedEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostOpSucceededEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostStartEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostStopEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostUninstallEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostWipeoutEvent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/python/org/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/python/org/apache/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/python/org/apache/ambari/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/python/org/apache/ambari/serverstate/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/python/org/apache/ambari/serverstate/Configuration.py
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/python/org/apache/ambari/serverstate/ConsoleManager.py
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/python/org/apache/ambari/serverstate/Main.py
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/python/org/apache/ambari/serverstate/__init__.py
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/AndPredicateTest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/EqualsPredicateTest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/GreaterEqualsPredicateTest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/GreaterPredicateTest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/LessEqualsPredicateTest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/LessPredicateTest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/NotPredicateTest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/OrPredicateTest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/PredicateVisitorTest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/PropertyIdImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/controller/predicate/ResourceImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/TestClusterImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/TestClustersImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/host/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/host/TestHostImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/job/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/job/TestJobImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/TestServiceComponentHostImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/utils/
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java
Modified:
    incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/manifestloader/site.pp
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/configgenerator/manifests/configfile.pp
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hcat-old/manifests/init.pp
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Controller.py
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Hardware.py
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/security.py
    incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/shell.py
    incubator/ambari/branches/AMBARI-666/ambari-api/pom.xml
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/ganglia/GangliaPropertyProvider.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/internal/ClusterControllerImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/internal/PropertyIdImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/internal/RequestImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/internal/ResourceImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/internal/ResourceProviderImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/internal/SchemaImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/jdbc/ConnectionFactory.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/jdbc/JDBCManagementController.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/jdbc/SQLPredicateVisitor.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/jdbc/SQLiteConnectionFactory.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/jmx/JMXPropertyProvider.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/utilities/ClusterControllerHelper.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/utilities/DBHelper.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/utilities/PredicateBuilder.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/utilities/PredicateHelper.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/controller/utilities/Properties.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/handlers/DelegatingRequestHandler.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/handlers/RequestHandler.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/handlers/RequestHandlerFactory.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/query/Query.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/query/QueryImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/resource/BaseResourceDefinition.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/resource/ClusterResourceDefinition.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/resource/ComponentResourceDefinition.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/resource/HostComponentResourceDefinition.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/resource/HostResourceDefinition.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/resource/ResourceDefinition.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/resource/ServiceResourceDefinition.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/BaseService.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/ClusterService.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/ComponentService.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/HostComponentService.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/HostService.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/Request.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/RequestFactory.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/RequestImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/ResponseFactory.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/Result.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/ResultImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/main/java/org/apache/ambari/api/services/ServiceService.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/TestSuite.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/controller/internal/ClusterControllerImplTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/controller/internal/PropertyIdImplTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/controller/internal/RequestImplTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/controller/internal/ResourceImplTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/controller/internal/SchemaImplTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/controller/jdbc/JDBCManagementControllerTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/controller/utilities/PredicateBuilderTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/controller/utilities/PropertiesTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/handlers/DelegatingRequestHandlerTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/query/QueryImplTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/services/ClusterServiceTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/services/ComponentServiceTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/services/HostComponentServiceTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/services/HostServiceTest.java
    incubator/ambari/branches/AMBARI-666/ambari-api/src/test/java/org/apache/ambari/api/services/ServiceServiceTest.java
    incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml
    incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/assemblies/server.xml
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentHostNotFoundException.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBInMemoryImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostAction.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleCommand.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentCommand.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandReport.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/ComponentStatus.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/DiskInfo.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/HostStatus.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/Register.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationStatus.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ClusterRequest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ClusterResponse.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationRequest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationResponse.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/HostRequest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/HostResponse.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentRequest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/TrackActionRequest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/controller/TrackActionResponse.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RoleDAO.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/UserDAO.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UserEntity.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/Clusters.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/Host.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponent.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentHost.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/state/State.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyListAdapter.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyMap.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyMapAdapter.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyVal.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyValAdapter.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/python/ambari-server.py
    incubator/ambari/branches/AMBARI-666/ambari-server/src/main/resources/webapp/WEB-INF/spring-security.xml
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/agent/AgentResourceTest.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
    incubator/ambari/branches/AMBARI-666/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java

Modified: incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt?rev=1395430&r1=1395429&r2=1395430&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt (original)
+++ incubator/ambari/branches/AMBARI-666/AMBARI-666-CHANGES.txt Mon Oct  8 01:37:59 2012
@@ -12,11 +12,22 @@ AMBARI-666 branch (unreleased changes)
 
   NEW FEATURES
 
-  AMBARI-816. Update Cluster Management -> Services pages to use a left nav 
-  rather than tabs for service selection. (yusaku)
+  AMBARI-812. In API , improve partial response support to drill down n levels
+  (John Spiedel)
 
-  AMBARI-815. Ensure data persistence during navigation, refresh and
-  ensure necessary restrictions. (Jaimin Jetly via yusaku)
+  AMBARI-791. Add unit tests and java docs for SPI code. (Tom Beerbower)
+
+  AMBARI-820. Remove JAXB dependencies in Server Agent protocol and move to
+  POJO based jackson serializer. (mahadev)
+
+  AMBARI-819. Management controller implemenation work. (hitesh)
+
+  AMBARI-811. Bug fix in jaxb serialization for maps. (jitendra)
+
+  AMBARI-810. Controller layer implementation part 1. (hitesh)
+
+  AMBARI-807. Fix Action scheduler tests because of fsm interface changes.
+  (jitendra)
 
   AMBARI-806. Remove State object as configs/stack version/running state are
   handled as standalone entities. (hitesh)
@@ -25,10 +36,8 @@ AMBARI-666 branch (unreleased changes)
 
   AMBARI-803. FSM initial refactoring for eventual live/desired objects. (hitesh)
 
-  AMBARI-802. Enhance Cluster Management pages. (yusaku)
-
   AMBARI-800. Hack to add a stage for testing in in-memory db. (jitendra)
-
+  
   AMBARI-801. Fix heartbeat message from the agent which is causing NPE at the
   server. (mahadev)
 
@@ -48,10 +57,8 @@ AMBARI-666 branch (unreleased changes)
 
   AMBARI-790. OK in registration response. (jitendra)
 
-  AMBARI-789. Prototype for management spi interface. (hitesh)
-
   AMBARI-787. Registration throws HostNotFoundException for new hosts. (jitendra)
-
+  
   AMBARI-788. Fix server and agent startup for end to end testing. (mahadev)
 
   AMBARI-785. Action response unit test. (jitendra)
@@ -65,32 +72,11 @@ AMBARI-666 branch (unreleased changes)
   AMBARI-754. Heartbeat handler: Registration response should query component 
   status. (jitendra)
 
-  AMBARI-779. Introduce ManagementController interface. (Tom Beerbower via hitesh)
-
-  AMBARI-755. Heartbeat handler: Update state as reported in heartbeat.
+  AMBARI-755. Heartbeat handler: Update state as reported in heartbeat. 
   (jitendra)
 
-  AMBARI-777. Add NOTICE file for copyright of stdlib from puppetlabs.
-  (mahadev)
-
-  AMBARI-776. Puppet scripts for all the modules to install/configure the
-  stack. (mahadev)
-
   AMBARI-756. Heartbeat handler: Handle heartbeat timeout. (jitendra)
 
-  AMBARI-772. Stylize main nav. (yusaku)
-
-  AMBARI-771. Add security between the server and agent and authentication for
-  the API. (mahadev)
-
-  AMBARI-770. Cluster Management pages for Ambari Web. (yusaku)
-
-  AMBARI-769. Implement step 9 (Install,start and test) of installer wizard.
-  (Jaimin Jetly via yusaku)
-
-  AMBARI-768. Implement step 5 of installer wizard (Assign Masters).
-  (Ananya Sen via yusaku)
-
   AMBARI-767. Add bootstrap script to ssh in parallel and setup agents on a
   list of hosts. (mahadev)
 
@@ -115,41 +101,16 @@ AMBARI-666 branch (unreleased changes)
 
   AMBARI-751. Re-structure servicecomponenthost fsm layout. (hitesh)
 
-  AMBARI-747. Add unit tests for step2 (Install option page) of installer.
-  (Jaimin Jetly via yusaku)
-
-  AMBARI-746. Integrate configuration properties and custom configuration 
-  file overrides in Customize Services page. (yusaku)
-
   AMBARI-732. Action scheduler unit tests. (jitendra)
 
   AMBARI-739. Cluster fsm implementation. (hitesh)
 
-  AMBARI-745. Add unit tests for Installer Step 1 (Welcome page). (yusaku)
-
-  AMBARI-744. Add definition for service config properties. (yusaku)
-
-  AMBARI-743. Add unit testing framework for Ambari Web. (yusaku)
-
-  AMBARI-742. Implement running a bootstrap api, keep a fifo queue and logic
-  for getting a request. (mahadev)
-
-  AMBARI-741. Use ember-i18n to externalize string resources in Ambari Web.
-  (yusaku)
-
-  AMBARI-735. Clean up Installer Welcome page and Install Options page.
-  (Jaimin Jetly via yusaku)
-
   AMBARI-738. s/Node/Host/g. (hitesh)
 
   AMBARI-737. ServiceComponentNode FSM implementation. (hitesh)
 
-  AMBARI-734. Initial work for adding DataNode/TaskTracker/RegionServer
-  configuration overrides on groups of hosts in Installer Customize Services
-  page. (yusaku)
-
-  AMBARI-736. Initial work on Cluster Management pages. (yusaku)
-
+  AMBARI-722. Action scheduler implementation. (jitendra)
+  
   AMBARI-733. Add Jersey Resource for BootStrapping and JAXB elements for API
   entities. (mahadev)
 
@@ -235,11 +196,6 @@ AMBARI-666 branch (unreleased changes)
 
   BUG FIXES
 
-  AMBARI-817. Fix import dependencies so that unit test suites can be run
-  again for Ambari Web. (yusaku)
-
-  AMBARI-804. Fix routing issues with Admin pages. (yusaku)
-
   AMBARI-798. Fix import issue due to move of Predicate class. (hitesh)
 
   AMBARI-780. Make FSM related changes for heartbeat handler. (hitesh)
@@ -248,14 +204,10 @@ AMBARI-666 branch (unreleased changes)
 
   AMBARI-773. Change Host FSM as per new requirements of heartbeat handler. (hitesh)
 
-  AMBARI-761. Fix broken build for adding guice servlet dependency. (mahadev)
-
   AMBARI-753. Fix broken compile as a result of re-factor of FSM layout. (hitesh)
 
   AMBARI-752. Add missing license header to TestServiceComponentHostState. (hitesh)
 
-  AMBARI-750. Fix build compilation issue. (mahadev)
-
   AMBARI-718. Fix installer navigation. (yusaku)
 
   AMBARI-684. Remove non-required dependencies from pom files (hitesh via jitendra)

Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/manifestloader/site.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/manifestloader/site.pp?rev=1395430&r1=1395429&r2=1395430&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/manifestloader/site.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/manifestloader/site.pp Mon Oct  8 01:37:59 2012
@@ -19,250 +19,290 @@
 #
 #
 
-$hdp_hadoop_mapred_queue_acls_props => {'mapred.queue.default.acl-submit-job' => '*',
-  'mapred.queue.default.acl-administer-jobs' => '*',}
-
-$hdp_hadoop_policy_props => {'security.client.protocol.acl' => '*',
-  'security.client.datanode.protocol.acl' => '*',
-  'security.datanode.protocol.acl' => '*',
-  'security.inter.datanode.protocol.acl' => '*',
-  'security.namenode.protocol.acl' => '*',
-  'security.inter.tracker.protocol.acl' => '*',
-  'security.job.submission.protocol.acl' => '*',
-  'security.task.umbilical.protocol.acl' => '*',
-  'security.admin.operations.protocol.acl' => '',
-  'security.refresh.usertogroups.mappings.protocol.acl' => '',
-  'security.refresh.policy.protocol.acl' => '',}
-
-$hdp_hadoop_core_site_props => {'io.file.buffer.size' => '131072',
-  'io.serializations' => 'org.apache.hadoop.io.serializer.WritableSerialization',
-  'io.compression.codecs' => '',
-  'io.compression.codec.lzo.class' => 'com.hadoop.compression.lzo.LzoCodec',
-  'fs.default.name' => '',
-  'fs.trash.interval' => '360',
-  'fs.checkpoint.dir' => '',
-  'fs.checkpoint.edits.dir' => '',
-  'fs.checkpoint.period' => '21600',
-  'fs.checkpoint.size' => '536870912',
-  'ipc.client.idlethreshold' => '8000',
-  'ipc.client.connection.maxidletime' => '30000',
-  'ipc.client.connect.max.retries' => '50',
-  'webinterface.private.actions' => 'false',
-  'hadoop.security.authentication' => '',
-  'hadoop.security.authorization' => '',
-  'hadoop.security.auth_to_local' => '',}
-
-$hdp_hadoop_mapred_site_props => {'io.sort.mb' => '',
-  'io.sort.record.percent' => '.2',
-  'io.sort.spill.percent' => '',
-  'io.sort.factor' => '100',
-  'mapred.tasktracker.tasks.sleeptime-before-sigkill' => '250',
-  'mapred.job.tracker.handler.count' => '50',
-  'mapred.system.dir' => '',
-  'mapred.job.tracker' => '',
-  'mapred.job.tracker.http.address' => '',
-  'mapred.local.dir' => '',
-  'mapreduce.cluster.administrators' => ' hadoop',
-  'mapred.reduce.parallel.copies' => '30',
-  'mapred.tasktracker.map.tasks.maximum' => '',
-  'mapred.tasktracker.reduce.tasks.maximum' => '',
-  'tasktracker.http.threads' => '50',
-  'mapred.map.tasks.speculative.execution' => 'false',
-  'mapred.reduce.tasks.speculative.execution' => 'false',
-  'mapred.reduce.slowstart.completed.maps' => '0.05',
-  'mapred.inmem.merge.threshold' => '1000',
-  'mapred.job.shuffle.merge.percent' => '0.66',
-  'mapred.job.shuffle.input.buffer.percent'  => '0.7',
-  'mapred.map.output.compression.codec' => '',
-  'mapred.output.compression.type' => 'BLOCK',
-  'mapred.jobtracker.completeuserjobs.maximum' => '0',
-  'mapred.jobtracker.taskScheduler' => '',
-  'mapred.jobtracker.restart.recover' => 'false',
-  'mapred.job.reduce.input.buffer.percent' => '0.0',
-  'mapreduce.reduce.input.limit' => '10737418240',
-  'mapred.compress.map.output' => '',
-  'mapred.task.timeout' => '600000',
-  'jetty.connector' => 'org.mortbay.jetty.nio.SelectChannelConnector',
-  'mapred.task.tracker.task-controller' => '',
-  'mapred.child.root.logger' => 'INFO,TLA',
-  'mapred.child.java.opts' => '',
-  'mapred.cluster.map.memory.mb' => '',
-  'mapred.cluster.reduce.memory.mb' => '',
-  'mapred.job.map.memory.mb' => '',
-  'mapred.job.reduce.memory.mb' => '',
-  'mapred.cluster.max.map.memory.mb' => '',
-  'mapred.cluster.max.reduce.memory.mb' => '',
-  'mapred.hosts' => '',
-  'mapred.hosts.exclude' => '',
-  'mapred.max.tracker.blacklists' => '16',
-  'mapred.healthChecker.script.path' => '',
-  'mapred.healthChecker.interval' => '135000',
-  'mapred.healthChecker.script.timeout' => '60000',
-  'mapred.job.tracker.persist.jobstatus.active' => 'false',
-  'mapred.job.tracker.persist.jobstatus.hours' => '1',
-  'mapred.job.tracker.persist.jobstatus.dir' => '',
-  'mapred.jobtracker.retirejob.check' => '10000',
-  'mapred.jobtracker.retirejob.interval' => '0',
-  'mapred.job.tracker.history.completed.location' => '/mapred/history/done',
-  'mapred.task.maxvmem' => '',
-  'mapred.jobtracker.maxtasks.per.job' => '',
-  'mapreduce.fileoutputcommitter.marksuccessfuljobs' => 'false',
-  'mapred.userlog.retain.hours' => '',
-  'mapred.job.reuse.jvm.num.tasks' => '1',
-  'mapreduce.jobtracker.kerberos.principal' => '',
-  'mapreduce.tasktracker.kerberos.principal' => '',
-  'hadoop.job.history.user.location' => 'none',
-  'mapreduce.jobtracker.keytab.file' => '',
-  'mapreduce.tasktracker.keytab.file' => '',
-  'mapreduce.jobtracker.staging.root.dir' => '/user',
-  'mapreduce.tasktracker.group' => 'hadoop',
-  'mapreduce.jobtracker.split.metainfo.maxsize' => '50000000',
-  'mapreduce.history.server.embedded' => 'false',
-  'mapreduce.history.server.http.address' => '',
-  'mapreduce.jobhistory.kerberos.principal' => '',
-  'mapreduce.jobhistory.keytab.file' => '',
-  'mapred.jobtracker.blacklist.fault-timeout-window' => '180',
-  'mapred.jobtracker.blacklist.fault-bucket-width' => '15',
-  'mapred.queue.names' => 'default',}
-
-$hdp_hadoop_capacity_scheduler_props => {'mapred.capacity-scheduler.queue.default.capacity' => '100',
-  'mapred.capacity-scheduler.queue.default.supports-priority' => 'false',
-  'mapred.capacity-scheduler.queue.default.minimum-user-limit-percent' => '100',
-  'mapred.capacity-scheduler.queue.default.maximum-initialized-jobs-per-user' => '25',}
-
-$hdp_hadoop_hdfs_site_props => {'dfs.name.dir' => '',
-  'dfs.support.append' => '',
-  'dfs.webhdfs.enabled' => '',
-  'dfs.datanode.failed.volumes.tolerated' => '',
-  'dfs.block.local-path-access.user' => '',
-  'dfs.data.dir' => '',
-  'dfs.hosts.exclude' => '',
-  'dfs.hosts' => '',
-  'dfs.replication.max' => '50',
-  'dfs.replication' => '',
-  'dfs.heartbeat.interval' => '3',
-  'dfs.safemode.threshold.pct' => '1.0f',
-  'dfs.balance.bandwidthPerSec' => '6250000',
-  'dfs.datanode.address' => '',
-  'dfs.datanode.http.address' => '',
-  'dfs.block.size' => '134217728',
-  'dfs.http.address' => '',
-  'dfs.datanode.du.reserved' => '',
-  'dfs.datanode.ipc.address' => '0.0.0.0:8010',
-  'dfs.blockreport.initialDelay' => '120',
-  'dfs.datanode.du.pct' => '0.85f',
-  'dfs.namenode.handler.count' => '40',
-  'dfs.datanode.max.xcievers' => '1024',
-  'dfs.umaskmode' => '077',
-  'dfs.web.ugi' => 'gopher,gopher',
-  'dfs.permissions' => 'true',
-  'dfs.permissions.supergroup' => 'hdfs',
-  'dfs.namenode.handler.count' => '100',
-  'ipc.server.max.response.size' => '5242880',
-  'dfs.block.access.token.enable' => 'true',
-  'dfs.namenode.kerberos.principal' => '',
-  'dfs.secondary.namenode.kerberos.principal' => '',
-  'dfs.namenode.kerberos.https.principal' => '',
-  'dfs.secondary.namenode.kerberos.https.principal' => '',
-  'dfs.secondary.http.address' => '',
-  'dfs.secondary.https.port' => '50490',
-  'dfs.web.authentication.kerberos.principal' => '',
-  'dfs.web.authentication.kerberos.keytab' => '',
-  'dfs.datanode.kerberos.principal' => '',
-  'dfs.namenode.keytab.file' => '',
-  'dfs.secondary.namenode.keytab.file' => '',
-  'dfs.datanode.keytab.file' => '',
-  'dfs.https.port' => '50470',
-  'dfs.https.address' => '',
-  'dfs.datanode.data.dir.perm' => '',
-  'dfs.access.time.precision' => '0',
-  'dfs.cluster.administrators' => ' hdfs',
-  'ipc.server.read.threadpool.size' => '5',
-  'dfs.namenode.kerberos.internal.spnego.principal' => '',
-  'dfs.secondary.namenode.kerberos.internal.spnego.principal' => '',}
-
-$hdp_hcat_old_hive_site_props => {'hive.metastore.local' => 'false',
-  'javax.jdo.option.ConnectionURL' => '',
-  'javax.jdo.option.ConnectionDriverName' => 'com.mysql.jdbc.Driver',
-  'javax.jdo.option.ConnectionUserName' => '',
-  'javax.jdo.option.ConnectionPassword' => '',
-  'hive.metastore.warehouse.dir' => '/apps/hive/warehouse',
-  'hive.metastore.sasl.enabled' => '',
-  'hive.metastore.kerberos.keytab.file'  => '',
-  'hive.metastore.kerberos.principal' => '',
-  'hive.metastore.cache.pinobjtypes' => 'Table,Database,Type,FieldSchema,Order',
-  'hive.metastore.uris' => '',
-  'hive.semantic.analyzer.factory.impl' => 'org.apache.hcatalog.cli.HCatSemanticAnalyzerFactory',
-  'hadoop.clientside.fs.operations',
-  'hive.metastore.client.socket.timeout' => '60',
-  'hive.metastore.execute.setugi' => 'true',}
-
-$hdp_hive_hive_site_props => {'hive.metastore.local' => 'false',
-  'javax.jdo.option.ConnectionURL' => '',
-  'javax.jdo.option.ConnectionDriverName' => 'com.mysql.jdbc.Driver',
-  'javax.jdo.option.ConnectionUserName' => '',
-  'javax.jdo.option.ConnectionPassword' => '',
-  'hive.metastore.warehouse.dir' => '/apps/hive/warehouse',
-  'hive.metastore.sasl.enabled' => '',
-  'hive.metastore.kerberos.keytab.file' => '',
-  'hive.metastore.kerberos.principal' => '',
-  'hive.metastore.cache.pinobjtypes' => 'Table,Database,Type,FieldSchema,Order',
-  'hive.metastore.uris' => '',
-  'hive.semantic.analyzer.factory.impl' => 'org.apache.hivealog.cli.HCatSemanticAnalyzerFactory',
-  'hadoop.clientside.fs.operations' => 'true',
-  'hive.metastore.client.socket.timeout' => '60',
-  'hive.metastore.execute.setugi' => 'true',
-  'hive.security.authorization.enabled' => 'true',
-  'hive.security.authorization.manager' => 'org.apache.hcatalog.security.HdfsAuthorizationProvider',}
+configgenerator::configfile::configuration {'hdp_hadoop__mapred_queue_acls':
+  filename => 'mapred-queue-acls.xml',
+  module => 'hdp-hadoop',
+  properties => {'mapred.queue.default.acl-submit-job' => '*',
+    'mapred.queue.default.acl-administer-jobs' => '*',}
+  }
+
+configgenerator::configfile::configuration {'hdp_hadoop__hadoop_policy':
+  filename => 'hadoop-policy.xml',
+  module => 'hdp-hadoop',
+  properties=> {'security.client.protocol.acl' => '*',
+    'security.client.datanode.protocol.acl' => '*',
+    'security.datanode.protocol.acl' => '*',
+    'security.inter.datanode.protocol.acl' => '*',
+    'security.namenode.protocol.acl' => '*',
+    'security.inter.tracker.protocol.acl' => '*',
+    'security.job.submission.protocol.acl' => '*',
+    'security.task.umbilical.protocol.acl' => '*',
+    'security.admin.operations.protocol.acl' => '',
+    'security.refresh.usertogroups.mappings.protocol.acl' => '',
+    'security.refresh.policy.protocol.acl' => '',}
+   }
+
+configgenerator::configfile::configuration {'hdp_hadoop__core_site':
+  filename => 'core-site.xml',
+  module => 'hdp-hadoop',
+  properties => {'io.file.buffer.size' => '131072',
+    'io.serializations' => 'org.apache.hadoop.io.serializer.WritableSerialization',
+    'io.compression.codecs' => '',
+    'io.compression.codec.lzo.class' => 'com.hadoop.compression.lzo.LzoCodec',
+    'fs.default.name' => '',
+    'fs.trash.interval' => '360',
+    'fs.checkpoint.dir' => '',
+    'fs.checkpoint.edits.dir' => '',
+    'fs.checkpoint.period' => '21600',
+    'fs.checkpoint.size' => '536870912',
+    'ipc.client.idlethreshold' => '8000',
+    'ipc.client.connection.maxidletime' => '30000',
+    'ipc.client.connect.max.retries' => '50',
+    'webinterface.private.actions' => 'false',
+    'hadoop.security.authentication' => '',
+    'hadoop.security.authorization' => '',
+    'hadoop.security.auth_to_local' => '',}
+  }
+
+configgenerator::configfile::configuration {'hdp_hadoop__mapred_site':
+  filename => 'mapred-site.xml',
+  module => 'hdp-hadoop',
+  properties => {'io.sort.mb' => '',
+    'io.sort.record.percent' => '.2',
+    'io.sort.spill.percent' => '',
+    'io.sort.factor' => '100',
+    'mapred.tasktracker.tasks.sleeptime-before-sigkill' => '250',
+    'mapred.job.tracker.handler.count' => '50',
+    'mapred.system.dir' => '',
+    'mapred.job.tracker' => '',
+    'mapred.job.tracker.http.address' => '',
+    'mapred.local.dir' => '',
+    'mapreduce.cluster.administrators' => ' hadoop',
+    'mapred.reduce.parallel.copies' => '30',
+    'mapred.tasktracker.map.tasks.maximum' => '',
+    'mapred.tasktracker.reduce.tasks.maximum' => '',
+    'tasktracker.http.threads' => '50',
+    'mapred.map.tasks.speculative.execution' => 'false',
+    'mapred.reduce.tasks.speculative.execution' => 'false',
+    'mapred.reduce.slowstart.completed.maps' => '0.05',
+    'mapred.inmem.merge.threshold' => '1000',
+    'mapred.job.shuffle.merge.percent' => '0.66',
+    'mapred.job.shuffle.input.buffer.percent'  => '0.7',
+    'mapred.map.output.compression.codec' => '',
+    'mapred.output.compression.type' => 'BLOCK',
+    'mapred.jobtracker.completeuserjobs.maximum' => '0',
+    'mapred.jobtracker.taskScheduler' => '',
+    'mapred.jobtracker.restart.recover' => 'false',
+    'mapred.job.reduce.input.buffer.percent' => '0.0',
+    'mapreduce.reduce.input.limit' => '10737418240',
+    'mapred.compress.map.output' => '',
+    'mapred.task.timeout' => '600000',
+    'jetty.connector' => 'org.mortbay.jetty.nio.SelectChannelConnector',
+    'mapred.task.tracker.task-controller' => '',
+    'mapred.child.root.logger' => 'INFO,TLA',
+    'mapred.child.java.opts' => '',
+    'mapred.cluster.map.memory.mb' => '',
+    'mapred.cluster.reduce.memory.mb' => '',
+    'mapred.job.map.memory.mb' => '',
+    'mapred.job.reduce.memory.mb' => '',
+    'mapred.cluster.max.map.memory.mb' => '',
+    'mapred.cluster.max.reduce.memory.mb' => '',
+    'mapred.hosts' => '',
+    'mapred.hosts.exclude' => '',
+    'mapred.max.tracker.blacklists' => '16',
+    'mapred.healthChecker.script.path' => '',
+    'mapred.healthChecker.interval' => '135000',
+    'mapred.healthChecker.script.timeout' => '60000',
+    'mapred.job.tracker.persist.jobstatus.active' => 'false',
+    'mapred.job.tracker.persist.jobstatus.hours' => '1',
+    'mapred.job.tracker.persist.jobstatus.dir' => '',
+    'mapred.jobtracker.retirejob.check' => '10000',
+    'mapred.jobtracker.retirejob.interval' => '0',
+    'mapred.job.tracker.history.completed.location' => '/mapred/history/done',
+    'mapred.task.maxvmem' => '',
+    'mapred.jobtracker.maxtasks.per.job' => '',
+    'mapreduce.fileoutputcommitter.marksuccessfuljobs' => 'false',
+    'mapred.userlog.retain.hours' => '',
+    'mapred.job.reuse.jvm.num.tasks' => '1',
+    'mapreduce.jobtracker.kerberos.principal' => '',
+    'mapreduce.tasktracker.kerberos.principal' => '',
+    'hadoop.job.history.user.location' => 'none',
+    'mapreduce.jobtracker.keytab.file' => '',
+    'mapreduce.tasktracker.keytab.file' => '',
+    'mapreduce.jobtracker.staging.root.dir' => '/user',
+    'mapreduce.tasktracker.group' => 'hadoop',
+    'mapreduce.jobtracker.split.metainfo.maxsize' => '50000000',
+    'mapreduce.history.server.embedded' => 'false',
+    'mapreduce.history.server.http.address' => '',
+    'mapreduce.jobhistory.kerberos.principal' => '',
+    'mapreduce.jobhistory.keytab.file' => '',
+    'mapred.jobtracker.blacklist.fault-timeout-window' => '180',
+    'mapred.jobtracker.blacklist.fault-bucket-width' => '15',
+    'mapred.queue.names' => 'default',}
+  }
+
+configgenerator::configfile::configuration {'hdp_hadoop__capacity_scheduler':
+  filename => 'capacity-scheduler.xml',
+  module => 'hdp-hadoop',
+  properties => {'mapred.capacity-scheduler.queue.default.capacity' => '100',
+    'mapred.capacity-scheduler.queue.default.supports-priority' => 'false',
+    'mapred.capacity-scheduler.queue.default.minimum-user-limit-percent' => '100',
+    'mapred.capacity-scheduler.queue.default.maximum-initialized-jobs-per-user' => '25',}
+  }
+
+configgenerator::configfile::configuration {'hdp_hadoop__hdfs_site':
+  filename => 'hdfs-site.xml',
+  module => 'hdp-hadoop',
+  properties => {'dfs.name.dir' => '',
+    'dfs.support.append' => '',
+    'dfs.webhdfs.enabled' => '',
+    'dfs.datanode.failed.volumes.tolerated' => '',
+    'dfs.block.local-path-access.user' => '',
+    'dfs.data.dir' => '',
+    'dfs.hosts.exclude' => '',
+    'dfs.hosts' => '',
+    'dfs.replication.max' => '50',
+    'dfs.replication' => '',
+    'dfs.heartbeat.interval' => '3',
+    'dfs.safemode.threshold.pct' => '1.0f',
+    'dfs.balance.bandwidthPerSec' => '6250000',
+    'dfs.datanode.address' => '',
+    'dfs.datanode.http.address' => '',
+    'dfs.block.size' => '134217728',
+    'dfs.http.address' => '',
+    'dfs.datanode.du.reserved' => '',
+    'dfs.datanode.ipc.address' => '0.0.0.0:8010',
+    'dfs.blockreport.initialDelay' => '120',
+    'dfs.datanode.du.pct' => '0.85f',
+    'dfs.namenode.handler.count' => '40',
+    'dfs.datanode.max.xcievers' => '1024',
+    'dfs.umaskmode' => '077',
+    'dfs.web.ugi' => 'gopher,gopher',
+    'dfs.permissions' => 'true',
+    'dfs.permissions.supergroup' => 'hdfs',
+    'dfs.namenode.handler.count' => '100',
+    'ipc.server.max.response.size' => '5242880',
+    'dfs.block.access.token.enable' => 'true',
+    'dfs.namenode.kerberos.principal' => '',
+    'dfs.secondary.namenode.kerberos.principal' => '',
+    'dfs.namenode.kerberos.https.principal' => '',
+    'dfs.secondary.namenode.kerberos.https.principal' => '',
+    'dfs.secondary.http.address' => '',
+    'dfs.secondary.https.port' => '50490',
+    'dfs.web.authentication.kerberos.principal' => '',
+    'dfs.web.authentication.kerberos.keytab' => '',
+    'dfs.datanode.kerberos.principal' => '',
+    'dfs.namenode.keytab.file' => '',
+    'dfs.secondary.namenode.keytab.file' => '',
+    'dfs.datanode.keytab.file' => '',
+    'dfs.https.port' => '50470',
+    'dfs.https.address' => '',
+    'dfs.datanode.data.dir.perm' => '',
+    'dfs.access.time.precision' => '0',
+    'dfs.cluster.administrators' => ' hdfs',
+    'ipc.server.read.threadpool.size' => '5',
+    'dfs.namenode.kerberos.internal.spnego.principal' => '',
+    'dfs.secondary.namenode.kerberos.internal.spnego.principal' => '',}
+  }
+
+configgenerator::configfile::configuration {'hdp_hcat_old__hive_site':
+  filename => 'hive-site.xml',
+  module => 'hdp-hcat-old',
+  properties => {'hive.metastore.local' => 'false',
+    'javax.jdo.option.ConnectionURL' => '',
+    'javax.jdo.option.ConnectionDriverName' => 'com.mysql.jdbc.Driver',
+    'javax.jdo.option.ConnectionUserName' => '',
+    'javax.jdo.option.ConnectionPassword' => '',
+    'hive.metastore.warehouse.dir' => '/apps/hive/warehouse',
+    'hive.metastore.sasl.enabled' => '',
+    'hive.metastore.kerberos.keytab.file'  => '',
+    'hive.metastore.kerberos.principal' => '',
+    'hive.metastore.cache.pinobjtypes' => 'Table,Database,Type,FieldSchema,Order',
+    'hive.metastore.uris' => '',
+    'hive.semantic.analyzer.factory.impl' => 'org.apache.hcatalog.cli.HCatSemanticAnalyzerFactory',
+    'hadoop.clientside.fs.operations',
+    'hive.metastore.client.socket.timeout' => '60',
+    'hive.metastore.execute.setugi' => 'true',}
+  }
+
+configgenerator::configfile::configuration {'hdp_hive__hive_site':
+  filename => 'hive-site.xml',
+  module => 'hdp-hive',
+  properties => {'hive.metastore.local' => 'false',
+    'javax.jdo.option.ConnectionURL' => '',
+    'javax.jdo.option.ConnectionDriverName' => 'com.mysql.jdbc.Driver',
+    'javax.jdo.option.ConnectionUserName' => '',
+    'javax.jdo.option.ConnectionPassword' => '',
+    'hive.metastore.warehouse.dir' => '/apps/hive/warehouse',
+    'hive.metastore.sasl.enabled' => '',
+    'hive.metastore.kerberos.keytab.file' => '',
+    'hive.metastore.kerberos.principal' => '',
+    'hive.metastore.cache.pinobjtypes' => 'Table,Database,Type,FieldSchema,Order',
+    'hive.metastore.uris' => '',
+    'hive.semantic.analyzer.factory.impl' => 'org.apache.hivealog.cli.HCatSemanticAnalyzerFactory',
+    'hadoop.clientside.fs.operations' => 'true',
+    'hive.metastore.client.socket.timeout' => '60',
+    'hive.metastore.execute.setugi' => 'true',
+    'hive.security.authorization.enabled' => 'true',
+    'hive.security.authorization.manager' => 'org.apache.hcatalog.security.HdfsAuthorizationProvider',}
+  }
 		
-$hdp_oozie_oozie_site_props => {'oozie.base.url' => '',
-  'oozie.system.id' => '',
-  'oozie.systemmode' => 'NORMAL',
-  'oozie.service.AuthorizationService.security.enabled' => 'true',
-  'oozie.service.PurgeService.older.than' => '30',
-  'oozie.service.PurgeService.purge.interval' => '3600',
-  'oozie.service.CallableQueueService.queue.size' => '1000',
-  'oozie.service.CallableQueueService.threads' => '10',
-  'oozie.service.CallableQueueService.callable.concurrency' => '3',
-  'oozie.service.coord.normal.default.timeout' => '120',
-  'oozie.db.schema.name' => 'oozie',
-  'oozie.service.StoreService.create.db.schema' => 'true',
-  'oozie.service.StoreService.jdbc.driver' => 'org.apache.derby.jdbc.EmbeddedDriver',
-  'oozie.service.StoreService.jdbc.url' => '',
-  'oozie.service.StoreService.jdbc.username' => 'sa',
-  'oozie.service.StoreService.jdbc.password' => ' ',
-  'oozie.service.StoreService.pool.max.active.conn' => '10',
-  'oozie.service.HadoopAccessorService.kerberos.enabled' => '',
-  'local.realm' => '',
-  'oozie.service.HadoopAccessorService.keytab.file' => '',
-  'oozie.service.HadoopAccessorService.kerberos.principal' => '',
-  'oozie.service.HadoopAccessorService.jobTracker.whitelist' => ' ',
-  'oozie.authentication.type' => '',
-  'oozie.authentication.kerberos.principal' => '',
-  'oozie.authentication.kerberos.keytab' => '',
-  'oozie.service.HadoopAccessorService.nameNode.whitelist' => ' ',
-  'oozie.service.WorkflowAppService.system.libpath' => '',
-  'use.system.libpath.for.mapreduce.and.pig.jobs' => 'false',
-  'oozie.authentication.kerberos.name.rules' => '',}
-
-$hdp_templeton_templeton_site_props => {'templeton.port' => '50111',
-  'templeton.hadoop.conf.dir' => '',
-  'templeton.jar' => '',
-  'templeton.libjars' => '',
-  'templeton.hadoop' => '',
-  'templeton.pig.archive' => '',
-  'templeton.pig.path' => '',
-  'templeton.hcat' => '',
-  'templeton.hive.archive' => '',
-  'templeton.hive.path' => '',
-  'templeton.hive.properties' => '',
-  'templeton.zookeeper.hosts' => '',
-  'templeton.storage.class' => 'org.apache.hcatalog.templeton.tool.ZooKeeperStorage',
-  'templeton.override.enabled' => 'false',
-  'templeton.streaming.jar' => 'hdfs:///apps/templeton/hadoop-streaming.jar',
-  'templeton.kerberos.principal' => '',
-  'templeton.kerberos.keytab' => '',
-  'templeton.kerberos.secret' => 'secret',}
+configgenerator::configfile::configuration {'hdp_oozie__oozie_site':
+  filename => 'oozie-site.xml',
+  module => 'hdp-oozie',
+  properties => {'oozie.base.url' => '',
+    'oozie.system.id' => '',
+    'oozie.systemmode' => 'NORMAL',
+    'oozie.service.AuthorizationService.security.enabled' => 'true',
+    'oozie.service.PurgeService.older.than' => '30',
+    'oozie.service.PurgeService.purge.interval' => '3600',
+    'oozie.service.CallableQueueService.queue.size' => '1000',
+    'oozie.service.CallableQueueService.threads' => '10',
+    'oozie.service.CallableQueueService.callable.concurrency' => '3',
+    'oozie.service.coord.normal.default.timeout' => '120',
+    'oozie.db.schema.name' => 'oozie',
+    'oozie.service.StoreService.create.db.schema' => 'true',
+    'oozie.service.StoreService.jdbc.driver' => 'org.apache.derby.jdbc.EmbeddedDriver',
+    'oozie.service.StoreService.jdbc.url' => '',
+    'oozie.service.StoreService.jdbc.username' => 'sa',
+    'oozie.service.StoreService.jdbc.password' => ' ',
+    'oozie.service.StoreService.pool.max.active.conn' => '10',
+    'oozie.service.HadoopAccessorService.kerberos.enabled' => '',
+    'local.realm' => '',
+    'oozie.service.HadoopAccessorService.keytab.file' => '',
+    'oozie.service.HadoopAccessorService.kerberos.principal' => '',
+    'oozie.service.HadoopAccessorService.jobTracker.whitelist' => ' ',
+    'oozie.authentication.type' => '',
+    'oozie.authentication.kerberos.principal' => '',
+    'oozie.authentication.kerberos.keytab' => '',
+    'oozie.service.HadoopAccessorService.nameNode.whitelist' => ' ',
+    'oozie.service.WorkflowAppService.system.libpath' => '',
+    'use.system.libpath.for.mapreduce.and.pig.jobs' => 'false',
+    'oozie.authentication.kerberos.name.rules' => '',}
+  }
+
+configgenerator::configfile::configuration {'hdp_templeton__templeton_site':
+  filename => 'templeton-site.xml',
+  module => 'hdp-templeton',
+  configuration => {'templeton.port' => '50111',
+    'templeton.hadoop.conf.dir' => '',
+    'templeton.jar' => '',
+    'templeton.libjars' => '',
+    'templeton.hadoop' => '',
+    'templeton.pig.archive' => '',
+    'templeton.pig.path' => '',
+    'templeton.hcat' => '',
+    'templeton.hive.archive' => '',
+    'templeton.hive.path' => '',
+    'templeton.hive.properties' => '',
+    'templeton.zookeeper.hosts' => '',
+    'templeton.storage.class' => 'org.apache.hcatalog.templeton.tool.ZooKeeperStorage',
+    'templeton.override.enabled' => 'false',
+    'templeton.streaming.jar' => 'hdfs:///apps/templeton/hadoop-streaming.jar',
+    'templeton.kerberos.principal' => '',
+    'templeton.kerberos.keytab' => '',
+    'templeton.kerberos.secret' => 'secret',}
+  }
     
 class manifestloader () {
     file { '/etc/puppet/agent/modules.tgz':

Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/configgenerator/manifests/configfile.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/configgenerator/manifests/configfile.pp?rev=1395430&r1=1395429&r2=1395430&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/configgenerator/manifests/configfile.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/configgenerator/manifests/configfile.pp Mon Oct  8 01:37:59 2012
@@ -43,9 +43,9 @@
 # Note: Set correct $modulespath in the configgenerator (or pass it as parameter)
 #
 
-define configgenerator::configfile ($configname=$title, $modulespath='/etc/puppet/modules', $module, $properties) {
+define configgenerator::configfile ($modulespath='/etc/puppet/modules', $configuration) {
   $configcontent = inline_template('<configuration>
-  <% properties.each do |key,value| -%>
+  <% configuration.props.each do |key,value| -%>
   <property>
     <name><%=key %></name>
     <value><%=value %></value>
@@ -56,6 +56,12 @@ define configgenerator::configfile ($con
 file {'config':
   ensure  => present,
   content => $configcontent,
-  path => "${modulespath}/${module}/templates/${configname}",
+  path => "${modulespath}/${configuration::modulename}/templates/${configuration::configfile}",
 }
 } 
+
+define configgenerator::configfile::configuration($filename, $module, $nameproperties) {
+  $configfile = $filename
+  $modulename = $module
+  $props = $properties
+}

Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp?rev=1395430&r1=1395429&r2=1395430&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp Mon Oct  8 01:37:59 2012
@@ -41,34 +41,28 @@ class hdp-hadoop::initialize()
 #Configs generation  
   include manifestloader
 
-  configgenerator::configfile{'hdfs-site.xml': 
-    module => 'hdp-hadoop',
-    properties => $manifestloader::hdp_hadoop_hdfs_site_props
-  }
-
-  configgenerator::configfile{'capacity-scheduler.xml': 
-    module => 'hdp-hadoop',
-    properties => $manifestloader::hdp_hadoop_capacity_scheduler_props
-  }
-
-  configgenerator::configfile{'mapred-site.xml': 
-    module => 'hdp-hadoop',
-    properties => $manifestloader::hdp_hadoop_mapred_site_props
-  }
-      
-  configgenerator::configfile{'core-site.xml': 
-    module => 'hdp-hadoop',
-    properties => $manifestloader::hdp_hadoop_core_site_props
-  }
-      
-  configgenerator::configfile{'hadoop-policy.xml': 
-    module => 'hdp-hadoop',
-    properties => $manifestloader::hdp_hadoop_policy_props
-  }
-      
-  configgenerator::configfile{'mapred-queue-acls.xml.erb': 
-    module => 'hdp-hadoop',
-    properties => $manifestloader::hdp_hadoop_mapred_queue_acls_props
+  configgenerator::configfile{'mapred_queue_acls_xml': 
+    configuration => $manifestloader::Hdp_hadoop__mapred_queue_acls
+  }
+  
+  configgenerator::configfile{'hadoop_policy_xml': 
+    configuration => $manifestloader::Hdp_hadoop__hadoop_policy
+  }
+  
+  configgenerator::configfile{'core_site_xml': 
+    configuration => $manifestloader::Hdp_hadoop__core_site
+  }
+
+  configgenerator::configfile{'mapred_site_xml': 
+    configuration => $manifestloader::Hdp_hadoop__mapred_site
+  }
+  
+  configgenerator::configfile{'capacity_scheduler_xml': 
+    configuration => $manifestloader::Hdp_hadoop__capacity_scheduler
+  }
+
+  configgenerator::configfile{'hdfs_site_xml': 
+    configuration => $manifestloader::Hdp_hadoop__hdfs_site
   }
 }
 

Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hcat-old/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hcat-old/manifests/init.pp?rev=1395430&r1=1395429&r2=1395430&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hcat-old/manifests/init.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hcat-old/manifests/init.pp Mon Oct  8 01:37:59 2012
@@ -27,9 +27,8 @@ class hdp-hcat(
 
 #Configs generation  
 
-  configgenerator::configfile{'hive-site.xml': 
-    module => 'hdp-hcat-old',
-    properties => $manifestloader::hdp_hcat_old_hive_site_props
+  configgenerator::configfile{'hive_site_xml': 
+    configuration => $manifestloader::Hdp_hcat_old__hive_site
   }
 
   $hcat_user = $hdp::params::hcat_user

Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp?rev=1395430&r1=1395429&r2=1395430&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp Mon Oct  8 01:37:59 2012
@@ -29,9 +29,8 @@ class hdp-hive(
   $hive_user = $hdp-hive::params::hive_user
   $hive_config_dir = $hdp-hive::params::hive_conf_dir
 
-  configgenerator::configfile{'hive-site.xml.erb': 
-    module => 'hdp-hive',
-    properties => $manifestloader::hdp_hive_hive_site_props
+  configgenerator::configfile{'hive_site_xml': 
+    configuration => $manifestloader::Hdp_hive__hive_site
   }
 
   anchor { 'hdp-hive::begin': }

Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp?rev=1395430&r1=1395429&r2=1395430&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/init.pp Mon Oct  8 01:37:59 2012
@@ -27,12 +27,11 @@ class hdp-oozie(
   include hdp-oozie::params 
   include manifestloader
  
-   configgenerator::configfile{'oozie-site.xml': 
-    module => 'hdp-oozie',
-    properties => $manifestloader::hdp_oozie_oozie_site_props
+  configgenerator::configfile{'oozie_site_xml': 
+    configuration => $manifestloader::Hdp_oozie__oozie_site
   }
 
- $oozie_user = $hdp-oozie::params::oozie_user
+  $oozie_user = $hdp-oozie::params::oozie_user
   $oozie_config_dir = $hdp-oozie::params::conf_dir
   
   if ($service_state == 'uninstalled') {

Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp?rev=1395430&r1=1395429&r2=1395430&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/puppet/modules/hdp-templeton/manifests/init.pp Mon Oct  8 01:37:59 2012
@@ -25,9 +25,8 @@ class hdp-templeton(
 {
   include manifestloader
   
-  configgenerator::configfile{'templeton-site.xml: 
-    module => 'hdp-templeton',
-    properties => $manifestloader::hdp_templeton_templeton_site_props
+  configgenerator::configfile{'templeton_site_xml': 
+    configuration => $manifestloader::Hdp_templeton__templeton_site
   }
 
  include hdp-templeton::params 

Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/ActionQueue.py?rev=1395430&r1=1395429&r2=1395430&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/ActionQueue.py (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/ActionQueue.py Mon Oct  8 01:37:59 2012
@@ -28,6 +28,7 @@ from shell import shellRunner
 from FileUtil import writeFile, createStructure, deleteStructure, getFilePath, appendToFile
 from shell import shellRunner
 import json
+import pprint
 import os
 import time
 import subprocess
@@ -37,14 +38,11 @@ logger = logging.getLogger()
 installScriptHash = -1
 
 class ActionQueue(threading.Thread):
-  global q, r, clusterId, clusterDefinitionRevision
-  q = Queue.Queue()
-  r = Queue.Queue()
-  clusterId = 'unknown'
-  clusterDefinitionRevision = 0
-
+  global commandQueue, resultQueue
+  commandQueue = Queue.Queue()
+  resultQueue = Queue.Queue()
+ 
   def __init__(self, config):
-    global clusterId, clusterDefinitionRevision 
     super(ActionQueue, self).__init__()
     #threading.Thread.__init__(self)
     self.config = config
@@ -59,219 +57,80 @@ class ActionQueue(threading.Thread):
   def stopped(self):
     return self._stop.isSet()
 
-  #For unittest
   def getshellinstance(self):
+    """ For Testing purpose only.""" 
     return self.sh
 
-  def put(self, response):
-    if 'actions' in response:
-      actions = response['actions']
-      logger.debug(actions)
-      # for the servers, take a diff of what's running, and what the controller
-      # asked the agent to start. Kill all those servers that the controller
-      # didn't ask us to start
-      sh = shellRunner()
-      runningServers = sh.getServerTracker()
-
-      # get the list of servers the controller wants running
-      serversToRun = {}
-      for action in actions:
-        if action['kind'] == 'START_ACTION':
-          processKey = sh.getServerKey(action['clusterId'],action['clusterDefinitionRevision'],
-            action['component'], action['role'])
-          serversToRun[processKey] = 1
-
-      # create stop actions for the servers that the controller wants stopped
-      for server in runningServers.keys():
-        if server not in serversToRun:
-          sh.stopProcess(server)
-      # now put all the actions in the queue. The ordering is important (we stopped
-      # all unneeded servers first)
-      for action in actions:
-        q.put(action)
+  def put(self, command):
+    logger.info("The command from the server is \n" + pprint.pformat(command))
+    commandQueue.put(command)
+    pass
 
   def run(self):
-    global clusterId, clusterDefinitionRevision
+    result = []
     while not self.stopped():
-      while not q.empty():
-        action = q.get()
-        switches = {
-                     'START_ACTION'              : self.startAction,
-                     'RUN_ACTION'                : self.runAction,
-                     'CREATE_STRUCTURE_ACTION'   : self.createStructureAction,
-                     'DELETE_STRUCTURE_ACTION'   : self.deleteStructureAction,
-                     'WRITE_FILE_ACTION'         : self.writeFileAction,
-                     'INSTALL_AND_CONFIG_ACTION' : self.installAndConfigAction,
-                     'NO_OP_ACTION'              : self.noOpAction
-                   }
-        
-        exitCode = 1
-        retryCount = 1
-        while (exitCode != 0 and retryCount <= self.maxRetries):
-          result={}
-          try:
-            #pass a copy of action since we don't want anything to change in the 
-            #action dict 
-            actionCopy = copy.copy(action)
-            result = switches.get(action['kind'], self.unknownAction)(actionCopy)
-            if ('commandResult' in result):
-              commandResult = result['commandResult']
-              exitCode = commandResult['exitCode']
-              if (exitCode == 0):
-                break
-              else:
-                logger.warn(str(action) + " exited with code " + str(exitCode))
-            else:
-              #Really, no commandResult? Is this possible?
-              #TODO: check
-              exitCode = 0
-              break
-          except Exception, err:
-            traceback.print_exc()  
-            logger.warn(err)
-            if ('commandResult' in result):
-              commandResult = result['commandResult']
-              if ('exitCode' in commandResult):
-                exitCode = commandResult['exitCode']
-              else:
-                exitCode = 1
-            else:
-              result['commandResult'] = {'exitCode': 1, 'output':"", 'error':""}
-
-          #retry in some time  
-          logger.warn("Retrying %s in %d seconds" % (str(action),self.sleepInterval))
-          time.sleep(self.sleepInterval)
-          retryCount += 1
+      while not commandQueue.empty():
+        command = commandQueue.get()
+        try:
+          #pass a copy of action since we don't want anything to change in the 
+          #action dict 
+          commandCopy = copy.copy(command)
+          result = self.executeCommand(commandCopy)
           
-        if (exitCode != 0):
-          result['exitCode']=exitCode
-          result['retryActionCount'] = retryCount - 1
-        else:
-          result['retryActionCount'] = retryCount
-        # Update the result
-        r.put(result)
+        except Exception, err:
+          traceback.print_exc()  
+          logger.warn(err)
+          pass
+        
+        for entry in result:
+          resultQueue.put(entry)
+        pass
       if not self.stopped():
         time.sleep(5)
 
   # Store action result to agent response queue
   def result(self):
     result = []
-    while not r.empty():
-      result.append(r.get())
+    while not resultQueue.empty():
+      result.append(resultQueue.get())
     return result
 
-  # Generate default action response
-  def genResult(self, action):
-    result={}
-    if (action['kind'] == 'INSTALL_AND_CONFIG_ACTION' or action['kind'] == 'NO_OP_ACTION'):
-      result = {
-               'id'                        : action['id'],
-               'kind'                      : action['kind'],
-             }
-    else:
-      result = { 
-               'id'                        : action['id'],
-               'clusterId'                 : action['clusterId'],
-               'kind'                      : action['kind'],
-               'clusterDefinitionRevision' : action['clusterDefinitionRevision'],
-               'componentName'             : action['component'],
-               'role'                      : action['role']
-             }
+  def registerCommand(self, command):
+    return {}
+  
+  def statusCommand(self, command):
+    return {}
+  
+  def executeCommand(self, command):
+    logger.info("Executing command \n" + pprint.pformat(command))
+    clusterName = command['clusterName']
+    commandId = command['commandId']
+    hostname = command['hostname']
+    params = command['params']
+    clusterHostInfo = command['clusterHostInfo']
+    roleCommands = command['roleCommands']
+    configurations = command['configurations']
+    result = []
+    for roleCommand in roleCommands:
+      # assume some puppet pluing to run these commands
+      roleResult = {'role' : roleCommand['role'],
+                    'actionId' : commandId,
+                    'stdout' : "DONE",
+                    'stderr' : "DONE",
+                    'exitCode' : 0,
+                    'status' : "COMPLETED"}
+      result.append(roleResult)
+      pass
     return result
 
-  # Run start action, start a server process and
-  # track the liveness of the children process
-  def startAction(self, action):
-    result = self.genResult(action)
-    return self.sh.startProcess(action['clusterId'],
-      action['clusterDefinitionRevision'],
-      action['component'], 
-      action['role'], 
-      action['command'], 
-      action['user'], result)
-
-  # Write file action
-  def writeFileAction(self, action, fileName=""):
-    result = self.genResult(action)
-    return writeFile(action, result, fileName)
-
-  # get the install file
-  def getInstallFilename(self,id):
-    return "ambari-install-file-"+id
-
-  # Install and configure action
-  def installAndConfigAction(self, action):
-    global installScriptHash
-    r=self.genResult(action)
-    w = self.writeFileAction(action,self.getInstallFilename(action['id']))
-    commandResult = {}
-    if w['exitCode']!=0:
-      commandResult['error'] = w['stderr'] 
-      commandResult['exitCode'] = w['exitCode']
-      r['commandResult'] = commandResult
-      return r
-     
-    if 'command' not in action:
-      # this is hardcoded to do puppet specific stuff for now
-      # append the content of the puppet file to the file written above
-      filepath = getFilePath(action,self.getInstallFilename(action['id'])) 
-      logger.info("File path for puppet top level script: " + filepath)
-      p = self.sh.run(['/bin/cat',AmbariConfig.config.get('puppet','driver')])
-      if p['exitCode']!=0:
-        commandResult['error'] = p['error']
-        commandResult['exitCode'] = p['exitCode']
-        r['commandResult'] = commandResult
-        return r
-      logger.debug("The contents of the static file " + p['output'])
-      appendToFile(p['output'],filepath) 
-      arr = [AmbariConfig.config.get('puppet','commandpath') , filepath]
-      logger.debug(arr)
-      action['command'] = arr
-    logger.debug(action['command'])
-    commandResult = self.sh.run(action['command'])
-    logger.debug("PUPPET COMMAND OUTPUT: " + commandResult['output'])
-    logger.debug("PUPPET COMMAND ERROR: " + commandResult['error'])
-    if commandResult['exitCode'] == 0:
-      installScriptHash = action['id'] 
-    r['commandResult'] = commandResult
-    return r
-
-  # Run command action
-  def runAction(self, action):
-    result = self.genResult(action)
-    return self.sh.runAction(action['clusterId'], 
-      action['component'],
-      action['role'],
-      action['user'], 
-      action['command'], 
-      action['cleanUpCommand'], result)
-
-  # Create directory structure for cluster
-  def createStructureAction(self, action):
-    result = self.genResult(action)
-    result['exitCode'] = 0
-    return createStructure(action, result)
-
-  # Delete directory structure for cluster
-  def deleteStructureAction(self, action):
-    result = self.genResult(action)
-    result['exitCode'] = 0
-    return deleteStructure(action, result)
-
-  def noOpAction(self, action):
-    r = {'id' : action['id']}
-    return r
+  def noOpCommand(self, command):
+    result = {'commandId' : command['Id']}
+    return result
 
-  # Handle unknown action
   def unknownAction(self, action):
     logger.error('Unknown action: %s' % action['id'])
     result = { 'id': action['id'] }
     return result
 
-  # Discover agent idle state
   def isIdle(self):
-    return q.empty()
-
-  # Get the hash of the script currently used for install/config
-  def getInstallScriptHash(self):
-    return installScriptHash
+    return commandQueue.empty()

Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Controller.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Controller.py?rev=1395430&r1=1395429&r2=1395430&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Controller.py (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Controller.py Mon Oct  8 01:37:59 2012
@@ -51,11 +51,6 @@ class Controller(threading.Thread):
     self.safeMode = True
     self.credential = None
     self.config = config
-    #Disabled security until we have fix for AMBARI-157
-    #if(config.get('controller', 'user')!=None and config.get('controller', 'password')!=None):
-    #  self.credential = { 'user' : config.get('controller', 'user'),
-    #                      'password' : config.get('controller', 'password')
-    #  }
     self.hostname = socket.gethostname()
     self.registerUrl = config.get('server', 'secured_url') + \
       '/agent/register/' + self.hostname
@@ -82,6 +77,7 @@ class Controller(threading.Thread):
     while registered == False:
       try:
         data = json.dumps(self.register.build(id))
+        logger.info("Registering with the server " + pprint.pformat(data))
         req = urllib2.Request(self.registerUrl, data, {'Content-Type': 
                                                       'application/json'})
         stream = security.secured_url_open(req)
@@ -99,6 +95,23 @@ class Controller(threading.Thread):
       pass  
     return ret
   
+  
+  def addToQueue(self, commands):
+    """Add to the queue for running the commands """
+    """ Put the required actions into the Queue """ 
+    """ Verify if the action is to reboot or not """
+    if not commands:
+      logger.info("No commands from the server.")
+    else:
+      """Only add to the queue if not empty list """
+      for command in commands:
+        logger.info("Adding command to the action queue: \n" +
+                     pprint.pformat(command)) 
+        self.actionQueue.put(command)
+        pass
+      pass
+    pass
+  
   def heartbeatWithServer(self):
     retry = False
     #TODO make sure the response id is monotonically increasing
@@ -109,29 +122,33 @@ class Controller(threading.Thread):
           data = json.dumps(self.heartbeat.build(id))
           pass
         logger.info("Sending HeartBeat " + pprint.pformat(data))
-        req = urllib2.Request(self.heartbeatUrl, data, {'Content-Type': 'application/json'})
-        
-        logger.info(data)
-        
+        req = urllib2.Request(self.heartbeatUrl, data, {'Content-Type': 
+                                                        'application/json'})
         f = security.secured_url_open(req)
         response = f.read()
         f.close()
-        data = json.loads(response)
-        id=int(data['responseId'])
-        logger.info("HeartBeat Response from Server: \n" + pprint.pformat(data))
+        response = json.loads(response)
+        id=int(response['responseId'])
+        
+        if 'executionCommands' in response.keys():
+          self.addToQueue(response['executionCommands'])
+          pass
+        else:
+          logger.info("No commands sent from the Server.")
+          pass
         retry=False
       except Exception, err:
         retry=True
         if "code" in err:
           logger.error(err.code)
         else:
-          logger.error("Unable to connect to: "+self.heartbeatUrl,exc_info=True)
+          logger.error("Unable to connect to: "+ 
+                       self.heartbeatUrl,exc_info=True)
       if self.actionQueue.isIdle():
-        time.sleep(30)
+        time.sleep(3)
       else:
         time.sleep(1) 
     pass
-  
 
   def run(self):
     opener = urllib2.build_opener()
@@ -148,7 +165,8 @@ def main(argv=None):
   signal.signal(signal.SIGINT, signal.SIG_DFL)
 
   logger.setLevel(logging.INFO)
-  formatter = logging.Formatter("%(asctime)s %(filename)s:%(lineno)d - %(message)s")
+  formatter = logging.Formatter("%(asctime)s %(filename)s:%(lineno)d - \
+    %(message)s")
   stream_handler = logging.StreamHandler()
   stream_handler.setFormatter(formatter)
   logger.addHandler(stream_handler)

Modified: incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Hardware.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Hardware.py?rev=1395430&r1=1395429&r2=1395430&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Hardware.py (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/main/python/ambari_agent/Hardware.py Mon Oct  8 01:37:59 2012
@@ -96,6 +96,14 @@ class Hardware:
           pass
         pass
       pass
+    """ Convert the needed types to the true values """
+    if 'physicalprocessorcount' in retDict.keys():
+      retDict['physicalprocessorcount'] = int(retDict['physicalprocessorcount'])
+      pass
+    if 'is_virtual' in retDict.keys():
+      retDict['is_virtual'] = ("true" == retDict['is_virtual'])
+      pass
+    
     logger.info("Facter info : \n" + pprint.pformat(retDict))
     return retDict
   



Mime
View raw message