ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alejan...@apache.org
Subject ambari git commit: AMBARI-12679. Agent Simulator - Improve documentation and remove sudo when starting ambari-server (Pengcheng Xu via alejandro)
Date Fri, 07 Aug 2015 22:16:53 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk ba3a2caa5 -> 6baeac536


AMBARI-12679. Agent Simulator - Improve documentation and remove sudo when starting ambari-server (Pengcheng Xu via alejandro)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6baeac53
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6baeac53
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6baeac53

Branch: refs/heads/trunk
Commit: 6baeac53634ebdc63190b4a1e4b12061594b4d50
Parents: ba3a2ca
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Fri Aug 7 15:02:00 2015 -0700
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Fri Aug 7 15:15:32 2015 -0700

----------------------------------------------------------------------
 contrib/agent-simulator/README.md               | 413 +++++++++++++------
 contrib/agent-simulator/cluster.py              |  24 +-
 contrib/agent-simulator/config/cluster.txt      |   4 +
 .../agent-simulator/docker_image/Yum_Dockerfile |   9 +-
 .../docker_image/ambari_agent_install.sh        |   4 +-
 .../docker_image/ambari_agent_start.sh          |   3 +-
 contrib/agent-simulator/example/config.ini      |  24 +-
 contrib/agent-simulator/launcher_cluster.py     |   9 +-
 contrib/agent-simulator/launcher_docker.py      |  11 +-
 contrib/agent-simulator/network/DNS_editor.py   |  53 ---
 contrib/agent-simulator/network/dns_edit.py     |  53 +++
 .../network/set_ambari_server_network.sh        |   2 +-
 .../agent-simulator/network/set_host_network.sh |   2 +-
 .../network/set_ui_port_forward.sh              |  46 +++
 .../server/ambari_server_install.sh             |  10 +-
 .../server/ambari_server_start.sh               |   2 +-
 contrib/agent-simulator/vm.py                   |  17 +-
 pom.xml                                         |   1 +
 18 files changed, 465 insertions(+), 222 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/README.md
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/README.md b/contrib/agent-simulator/README.md
index b8f9d17..ce822c5 100644
--- a/contrib/agent-simulator/README.md
+++ b/contrib/agent-simulator/README.md
@@ -13,199 +13,354 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-Ambari-agent Simulator
+Ambari Cluster Provision with Docker
 ============
-This project provides a tool to create a large Ambari-agent cluster in a convenient way.
+This project presents a tool to quickly provide a large Ambari cluster on a cloud environment, 
+with all Ambari-Agents running inside Docker containers. 
+And each Virtual Machine is used to hold many Docker containers running Ambari-Agents.
+It's supposed to be a complementary to the work of Cloudbreak.
+
+All of the Docker containers and VMs are part of the same Weave network, 
+so they can all communicate with each other. SSH service is provided to log into Docker containers from the
+VMs inside the cluster.
+All of the master services are on VMs with a public IP, 
+so that you can still use the UIs for services like NameNode, ResourceManager, etc.
+
+Because of multiple Docker containers in one VM, we end up saving a lot of resources on cloud environments. 
+And the Docker image can be pre-installed with HDP bits to save space and time during the Ambari installation 
+(which can be done via UI or blueprints).
 
 ## Usage:
+Only the command "request" depends on Google Compute Engine. Other parts of this tool are platform independent.
+See section "[Extend to Any Other Platform](#extend)" for more information
 Run python launcher_cluster.py to see usage
 
-python launcher_cluster.py request    
+python launcher_cluster.py request
 
-    request a cluster from GCE, generate the configuration for the cluster. Parameters:
-	<the name of the cluster>, suggestion: {yourname}-group-a)
+    --request a cluster from GCE, generate the configuration for the cluster. Parameters:
+	<the name of the cluster>, suggestion: {yourname}-group-a
 	<number of VMs>
 	<number of dockers each VMs>
-	<number of service servers inside VM>
+	<number of service servers>, directly install Ambari-Agent, not inside Dockers
 	<number of ambari-server>, either 0 or 1
 		
 python launcher_cluster.py up
         
-    run one cluster, and add to another cluster. Parameters:
+    --run all Ambari-agents and Ambari-server of the cluster. Parameters:
 	<the name of the cluster>
-		
+
 python launcher_cluster.py merge    
 
-    run Docker containers with Ambari-agent in all VMs of the cluster. Parameters:
+    --run all Ambari-agents in the cluster, use the Ambari-Server in another cluster. Parameters:
 	<the name of the cluster to be merged>
 	<the name of the cluster to be extended>
 
-python launcher_cluster.py merge 
+python launcher_cluster.py merge
 
-    run Docker containers with Ambari-agent in all VMs of the cluster. Parameters:
+    --run all Ambari-agents in the cluster, providing the Ambari-Server. Parameters:
     <the name of the cluster to be merged>
     <Weave IP of the Ambari-server>
     <External IP of the Ambari-server>
 
-python launcher_cluster.py list    
+python launcher_cluster.py list
         
-    list all the cluster
+    --list all the cluster
     
 python launcher_cluster.py show
     
-    show cluster information. Parameters:
+    --show cluster information. Parameters:
     <the name of the cluster>
     
 python launcher_cluster.py help    
         
     show help info
 
+## Quick Start
+* Step 1: Download the code to your own computer, or anywhere has the access to GCE controller
+
+* Step 2: Copy example/config.ini to config/config.ini
+
+* Step 3: Modify the following values in config/config.ini
+    * output_folder
+    * gce_controller_ip
+    * gce_controller_key_file
+    * vm_key_file
+    
+* Step 4: Add SSH key and password for your Ambari-Agents in Docker
+    * open file: docker_image/Yum_Dockerfile
+    * change the two lines: {ENV AUTHORIZED_KEYS} and {ENV ROOT_PASS}
+    
+* Step 5: Use the command line to request 2 Virtual Machine from GCE, 
+each Virtual Machine is configured to have 6 Docker containers (which means 6 Ambari-Agents). 
+Also this command request 2 Virtual Machine to install Ambari-Agent directly (not in Docker), 
+these 2 Virtual Machines are supposed to hold Masters like NameNode or HBase Master. Finally this command
+request 1 Virtual Machine to install Ambari-Server
+
+        python launcher_cluster.py request {yourname}-group-a 2 6 2 1
+
+* Step 6: Run all configuration for this cluster
+
+        python launcher_cluster.py up {yourname}-group-a
+        
+* Step 7: This is supposed to be a bug, see section "[Issues](#issues)" for more information
+    * Log into your Ambari-server machine, run "ambari-server start".
+    
+* Step 8: Operate on Ambari-server web GUI
+    * Add agents: docker-[0-11]-{yourname}-group-a.weave.local
+    * Add agents: {yourname}-group-a-service-server-[1-2].weave.local
+    * Choose manual registration
+    * Choose to install HDFS, YARN, HBase, Zookeeper, Ambari-Metrics
+
+#### Add More Ambari-Agents
+* Step 9: Use the following command to request 2 Virtual Machine, each with 5 Ambari-agents.
+
+        python launcher_cluster.py request {yourname}-group-b 2 5 0 0
+
+* Step 10: Merge this new cluster to existing one
+        
+        python launcher_cluster.py merge {yourname}-group-b {yourname}-group-a
+
+* Step 11: Operate on Ambari-server web GUI
+    * Add agents: docker-[0-9]-{yourname}-group-b.weave.local
+
 ## Introduction to Weave Networking
 [Weave](https://github.com/weaveworks/weave) is a tool to connect Docker containers distributed across different hosts. 
-This project use Weave to assign each Docker container (with Ambari-agent) a unique internal IP and a domain name.
+This project uses Weave to assign each Docker container (with Ambari-agent) a unique internal IP and a domain name.
 In each VM, a special Docker container will be launched by Weave to act as a Router, 
 and to connect all the Docker containers in this VM with other Docker containers in other VMs.
 Also, another special Docker container will be launched by Weave to act as a DNS for this VM.
 Each Docker container can connect with each other by using the internal IP, host name or domain name.
 
-All the Weave internal IP should be configured by the user. 
-In this following document, we use subnet 192.168.#.#/16, and use the IP within this subnet to configure Weave. 
-Actually, You can use any IP as you wish, even public IP, in which case, 
-it will replace the connection to the real outside connection, and redirect the connection to the internal Docker container.
+All the Weave internal IP will be configured by this tool automatically. You can also modify Weave internal IP
+by hand in the cluster.txt file, but usually you won't like to do it.
 
-## Quick Start
-With the following 6 steps, you can create a cluster with Ambari-agents, and connect them to your Ambari-server. 
-Among all the steps, the step 3 is to configure this program, the step 4 is the one which really matters, 
-and other steps act as a one-time configuration or suggestion for your Ambari-server.
+This is the networking architecture of the cluster.
 
-You can start with this guide by downloading the code to your own computer or any computers which can access the GCE controller.
+![Network Architecture](/docs/architecture.png)
 
-* Step 1: Mark down IP of the GCE VM which installed Ambari-server, Ambari_Server_IP=104.196.81.81
-* Step 2: Copy example/config.ini to config/config.ini
-* Step 3: Modify the following values in config/config.ini
-    * Output_folder
-    * GCE_controller_key_file
-    * VM_key_file
-    * cluster_info_file, use {yourname}-group-a
-* Step 4: Use the command line to run 3 VMs, each VM has 5 Ambari-agents.
+## Virtual Machine Type
+There are three types of Virtual Machines inside the cluster.
 
-        python launcher_cluster.py all {yourname}-group-a 3 5 192.168.255.1 Ambari_Server_IP
+Agent Virtual Machine installs Docker, and run multiple Docker containers to hold multiple Ambari-Agents
 
-* Step 5: Log into your Ambari-server machine, run the following command line to set up Weave internal network 
+Service Server will install Ambari-Agent directly, not inside Docker container. 
+This type of machine is supposed to hold the master of different Hadoop Service, like NameNode.
+Installing Ambari-Agent directly enables service server to have all the resource of this machine, 
+and provide a convenient way to access its web UI from the outside.
 
-        cd agent-simulator/network
-        ./set_ambari_server_network.sh 192.168.255.1 192.168.255.2 16
+Ambari Server will install Ambari-Server directly inside the machine.
 
-* Step 6: Operate on Ambari-server web GUI
-    * Add all agents: docker-[0-14]-{yourname}-group-a.weave.local
-    * Choose manual registration
-    * Choose to install HDFS, YARN, HBase, Zookeeper, Ambari-Metrics
-    
+## Request, Up and Merge
+The command "request" is very simple. It will ask for a number of Virtual Machine from GCE,
+then it will generate the information about the cluster. Up this time, we have 2 things.
+First, we have a bunch of VMs, which are ready to use and have nothing installed.
+Second, we have made a "plan" about how we are going to configure the VMs.
+This "plan" is saved into JSON file config/cluster.txt.
+You can modify the JSON cluster.txt file to change the "plan" of the cluster before using command "up" or "merge".
 
-#### More on Quick Start
-* Step 7: Add one more cluster to your Ambari-server
-    * Modify cluster_info_file in config/config.ini, use {yourname}-group-b
-    * Modify Docker_IP_base in config.config.ini, use 192.168.2.1
-    * Use the command line to run 2 VMs, each VM has 10 Ambari-agents:
+The command "request" is only used for GCE. This command is not necessary.
+As long as we have the 2 things, mentioned above, we can then use "up" command. 
+For more information, see section "[Extend to Any Other Platform](#extend)"
 
-                python launcher_cluster.py all {yourname}-group-b 2 10 192.168.255.1 Ambari_Server_IP
+The command "up" is supplied with the name of the cluster. 
+This command will fetch the information about this cluster, 
+and actually configure and install everything according to the "plan"
+The command "up" is platform independent
 
-    * On Ambari-server web GUI, add all agents: docker-[0-19]-{yourname}-group-b.weave.local
-* Step 8: Add one VM with Ambari-agent installed to your Ambari-server
-    * Log into your VM, set Ambari_Server_IP as the value of server hostname in the file /etc/ambari-agent/conf/ambari-agent.ini
-    * On the VM, Run the following command set up Weave internal network
+The command "merge" is the same as "up", except one difference. 
+The command "up" requires that the cluster defines one VM to be Ambari-Server.
+While, the command "merge" simply set the Ambari-Server of other cluster as the Ambari-Server of this cluster.
 
-                cd agent-simulator/network
-                ./set_host_network.sh 192.168.254.1 192.168.254.2 16 Ambari_Server_IP
+## Cluster Information and History
+By default, the file config/cluster.txt is used to store the information of clusters. 
+The file is in JSON format. Every time you use "request" command, 
+the information about the new cluster will be saved into this JSON file.
 
+The command "list" will list brief information about all clusters you created by simply reading this JSON file.
+The command "show" will print more detail about one cluster specified by a name.
+For more detail information, you can just open the JSON file and search, for example, when you try to
+find out which Virtual Machine hold a specific Ambari-Agent.
 
-## Detail Work Flow:
-* Step 1: Install Ambari-server
-    * Use existing Ambari-server, or, install and launch a new one
-    * agent-simulator/server/ambari_server_install.sh: this shell might help you install the Ambari-server
-    * agent-simulator/server/ambari_server-_reset_data.sh: this shell might help you set Ambari-server to initial state
-        
-* Step 2: Decide IP in your mind
-    * Mark down the IP of the Ambari-server, say {IP of Ambari-server = 104.196.81.81}
-    * Come up a subnet say, {subnet = 192.168.#.#/16} {Docker_IP_mask = 16}
-    * Pick one address closer to the END of the subnet as the Weave INTERNAL IP of Ambari-server, 
-    and another one as the Weave DNS IP of Ambari-server, 
-    say {Weave IP of Ambari-server = 192.168.255.1} {Weave DNS IP of Ambari-server = 192.168.255.2}
-    * Pick one address closer to the START of the subnet as the Weave INTERNAL IP of the FIRST Ambari-agent, 
-    say {Docker_IP_base = 192.168.1.1}
-    * Other Weave INTERNAL IP of Amari-agent will be automatically assigned based on the FIRST one (increasingly).
-    
-* Step 3: First time set up Ambari-server       
-    * Copy all the agent-simulator code base to Ambari-server
-    * cd agent-simulator/network
-    * Run set_ambari_server_network.sh
-    * In this example, use parameters: {Weave IP of Ambari-server = 192.168.255.1} {Weave DNS IP of Ambari-server = 192.168.255.2} {Docker_IP_mask = 16}
-    
-* Step 4: Modify config.ini
-    * Modify attributes: Output_folder, GCE_controller_key_file, GCE_VM_key_file, cluster_info_file
-    * Change Docker_IP_base and Docker_IP_mask, in this example {Docker_IP_base = 192.168.1.1} {Docker_IP_mask = 16}
-    
-* Step 5: Request Ambari-agent cluster
-    * Run python launcher_cluster.py request
-    * Use {your name}-group-a as the cluster name. In case you wanna add more cluster to your Ambari-server, change the last letter
-    
-* Step 6: Modify Cluster Information File
-    * A TXT file will appear under directory ./config within 1 minutes, which has the information about the cluster
-    * Typically, you would like NameNode, RegionServer, ResourceManager, etc.. to dominate one VM. 
-    * In this example, change the configuration of the first and the second VM, make each of them only have one Docker. 
-    You can install different server services only into these two Docker containers later on the Ambari-server web GUI.
-
-* Step 7: Run Ambari-agent Cluster
-    Run python launcher_cluster.py run
-    In this exmaple, use parameters: {Weave IP of Ambari-server = 192.168.255.1} {IP of Ambari-server = 104.196.81.81}
-    
-* Step 8: Operate on Ambari-server web GUI
+Remember the data in config/cluster.txt will continue to grow, 
+and all your history data will remain in the file, even if you destroy a cluster and no longer use it.
+In this case, the data in config/cluster.txt becomes stale.
+You may want to delete config/cluster.txt when you no longer need your history cluster.
 
+If there are two clusters with the same name in the JSON file config/cluster.txt, 
+only the latest one will take effect. Say, you use "up" command to run a cluster named "cluster-D",
+only the latest "cluster-D" will be run.
 
-## Expand Cluster With This Script
-Be careful if you wanna use this script to add more Ambari-agents AGAIN to your Ambari-server
+## Log into Docker Container
+Inside each Docker container, there is a SSH service running.
+You can log into the Docker container from Ambari-Server or Service-Server.
 
-* Use different Cluster Name when providing parameters to launcher_cluster.py
-* In config.ini, use the same Docker_IP_mask, make sure the same subnet
-* Change config.ini to use different Docker_IP_base, make sure that all new IPs never overlap with the existing IPs
-* Change config.ini to use different cluster_info_file, make sure the existing cluster information is not overwritten
-   
-## Expand Cluster By Adding other Hosts/VMs
-   
-## Naming Convention
-Cluster Name: the name of the cluster must be unique to make sure every VM on GCE has its unique name. The suggestion is using {your name}-group-{a-z}
-
-VM Name: each VM has a domain name assigned by GCE, its host name is {cluster name}-{index}
+Do not use "docker attach" to access the container.
 
-Docker Container Name: the domain name of Docker container is docker-{index}-{cluster name}.weave.local, 
-the prefix "docker" can be configured by value Container_hostname_fix in config/config.ini, 
-you can find out which VM has which Docker container in the cluster information file.
+## Access Server Web UI
+Use the public IP of the Service-Server to access the web UI. 
+The list of accessible ports is defined by value "server_port_list" in config/config.ini.
 
+If you want to access more ports after running the cluster, 
+you can use the script network/set_ui_port_forward.sh
 
 ## Image for Docker Container
+The Docker image can be either downloaded from Docker Hub or built alive inside Virtual Machine.
+
+With "pull_docker_hub=yes", the program will pull Docker image named by "docker_image_name" from Docker Hub.
+This Docker image has to be built in the same way as this program builds the image.
+
+Typical, use "pull_docker_hub=no" to build the image alive. You can add more yum package into file
+docker_image/package_list.txt. These packages will be pre-installed into the image, 
+and will be shared by all Docker containers inside this Virtual Machine, 
+therefore saving disk space and accelerating the actual Hadoop service installation steps.
 
 ## Use Different Partition for Docker Container
+The value "use_partition" will set the Docker to use the disk space of another partition. 
+Make sure that partition is available
 
-## The IP assign mechanism.
-Basically, you don't have to worry about IP. The maximum number of IP is limited by weave_ip_base and weave_ip_mask.
-By fault, the subnet is 192.168.#.#/16. Once you have already created 256*256 agents (the real number is smaller, 
-since the DNS on the VM also uses IP address), some address might fall out side of subnet and some fall inside,
-which causes a connection issue. The function related is cluster._increase_ip(). You might want to wrap the IP around, 
-but corner cases are always there, there is no silver bullet.
+## Naming Convention
+Cluster Name: the name of the cluster must be unique to make sure every VM on GCE has its unique name. 
+The suggestion is using {your name}-group-{a-z}
 
+VM Name: each VM has a domain name assigned by GCE, its host name is {cluster name}-{index}
 
-## Issues
-* This tool do NOT support parallel usage
+Docker Container Name: the domain name of Docker container is docker-{index}-{cluster name}.weave.local, 
+the prefix "docker" can be configured by value container_hostname_fix in config/config.ini.
+
+## The Weave Internal IP Assign Mechanism
+Basically, you don't have to worry about IP. The maximum number of IP is limited by weave_ip_base and weave_ip_mask
+in config/config.ini. The program will automatically assign and increase the IP to make sure everyone has a unique 
+Weave internal IP.
+
+By fault in the configuration file, the subnet is 192.168.#.#/16. 
+Once you have already created 256*256 agents (the real number is smaller, since the DNS on the VM also uses IP address),
+The IP assigned will continue to increase to 192.169.#.#/16.
+some address might fall into subnet 192.168.#.#/16, and others fall into subnet 192.169.#.#/16.
+This causes a connection issue. The function related is cluster._increase_ip(). 
+You might want to wrap the IP around, but corner cases are always there, there is no silver bullet.
+
+
+## <a name="extend"></a>Extend to Any Other Platform
+We can use the command "up" to set up any machines on any platform, even hybrid, 
+as long as we meet the following requirements:
+
+* A list of machines (or Virtual Machines)
+* All machines are CentOS 7
+* All machines use the same SSH key
+* All machines are accessible from where you run this program by IP
+* All machines are accessible by each other using IP
+* All machines can access the Internet
+* The information about the Ambari cluster (the "plan")
+
+The above requirements are met using command "request" on Google Compute Engine.
+On other platform, we can do it manually. 
+
+Let's go through the following example. We assume that you have 3 machines, they are:
+
+* east-1.aws.net, 111.1.1.1
+* east-2.aws.net, 122.2.2.2
+* east-3.aws.net, 133.3.3.3
+
+If these machines do not have domain names, just make up one for each of them. It is just for naming issue,
+the program will not use domain name of the machine to do connection. 
+
+First, modify the value of vm_key_file in the file config/config.ini. 
+And, of course, modify other attributes specified in "Quick Start". 
+You also need to check the value of "use_partition".
+
+Then, we decide the structure of the Ambari cluster in Docker containers, use the following JSON object
+
+    {       
+        "cluster_name": "tutorial",
+        "state": "FREE",
+        "create_time": "2015-08-06 10:35:51.913465",
+        "ambari_agent_vm_list": [
+            {
+                "external_ip": "111.1.1.1",
+                "weave_dns_ip": "192.168.1.1",
+                "weave_internal_ip": "192.168.1.2",
+                "domain_name": "east-1.aws.net",
+                "weave_domain_name": "east-1.weave.local",
+                "weave_ip_mask": "16",
+                "docker_list": [
+                    {
+                        "weave_domain_name": "docker-0-tutorial.weave.local",
+                        "weave_ip": "192.168.1.3/16"
+                    },
+                    {
+                        "weave_domain_name": "docker-1-tutorial.weave.local",
+                        "weave_ip": "192.168.1.4/16"
+                    }
+                ]
+            }
+        ],
+        "ambari_server_vm": [
+            {
+                "external_ip": "122.2.2.2",
+                "weave_dns_ip": "192.168.1.5",
+                "weave_internal_ip": "192.168.1.6",
+                "domain_name": "east-2.aws.net",
+                "weave_domain_name": "east-2.weave.local",
+                "weave_ip_mask": "16",
+                "docker_list": []
+            }
+        ],
+        "service_server_vm_list": [
+            {
+                "external_ip": "133.3.3.3",
+                "weave_dns_ip": "192.168.1.7",
+                "weave_internal_ip": "192.168.1.8",
+                "domain_name": "east-3.aws.net",
+                "weave_domain_name": "east-3.weave.local",
+                "weave_ip_mask": "16",
+                "docker_list": []
+            }
+        ]
+    }
+
+According to this JSON object, machine 122.2.2.2 is the Ambari-Server. 
+Machine 133.3.3.3 will have Ambari-Agent directly installed, 
+which is supposed to accommodate, for example, NameNode.
+Machine 111.1.1.1 will have 2 Docker containers.
+
+The regulation about the above attributes:
+
+* The "state" must be "FREE"
+* "weave_domain_name" must end up with "weave.local"
+* To make command "show" work properly, use the pattern "docker-{index}-{cluster name}.weave.local"
+for "weave_domain_name" inside "docker_list"
+* All the IP and the mask related to "weave" are just made up. 
+Just make sure, all of the IP related to "weave" are different.
+And make sure, with the mask, all IP related to "weave" are inside the same subnet.
+
+Next, we add this JSON object into config/cluster.txt. 
+This JSON object must be a child of the root "clusters". This is non-trivial.
+Notice that the root of the JSON file config/cluster.txt is
+
+    {
+        "clusters": [
+        ]
+    }
+    
+Finally, we use "up" command to run this cluster.
+
+## <a name="issues"></a>Issues
+* After use command "up", you need to log into Ambari-Server, 
+and use "ambari-server start" to manually start Ambari-Server,
+This is supposed to be a bug. If you check the log of Ambari-Server, you will see that, 
+actually Ambari-Server has run for a short time, but then gets terminated. The reason might be related to SSH.
+* This tool does NOT support parallel usage
 * If GCE has no enough resource, the cluster returned to you will have a smaller number of VM
-* Don't merge your cluster into someone else's cluster. Actually you can do it, but you have to dig into the network, and
-make sure the IP configuration is right.
-
-## Suggestions:
-* Make sure your cluster name is unique, or you might cause trouble to other people's VM
-* Use CTRL + P, then CTRL + Q to exit Docker container. Use "exit" will terminate the container.
+* Don't merge your cluster into someone else's cluster. 
+Actually you can do it, but you have to dig into the network, 
+and make sure the IP configuration is right (all in one subnet and no overlap).
+
+## Suggestions
+* Make sure your cluster name is unique, or you might cause trouble to other people's VM on GCE
+* Do NOT use "docker attach" any more, just use SSH. 
+If you did it, Use CTRL + P, then CTRL + Q to exit Docker container.
 * Remove ~/.ssh/know_hosts files, especially if you run a large cluster. 
-You might get a warning from SSH, because the new GCE VM assigned to you might have the same IP with the VMs you saved in know_hosts file. 
-Remove .ssh/know_hosts before run this script.
-* Ambari-agent and Ambari-server have to be the same version to successfully register. 
-The command used to install Ambari-agent is in the Dockerfile
-    
\ No newline at end of file
+You might get a warning from SSH, because the new GCE VM assigned to you might have the same IP with
+the VMs you saved in know_hosts file. Remove .ssh/know_hosts before run this script.
+* Ambari-agent and Ambari-server have to be the same version to successfully register.
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/cluster.py
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/cluster.py b/contrib/agent-simulator/cluster.py
index dbef555..832f5ae 100644
--- a/contrib/agent-simulator/cluster.py
+++ b/contrib/agent-simulator/cluster.py
@@ -433,6 +433,23 @@ class Cluster:
         else:
             Log.write("VM ", vm_external_ip, " file upload fail")
 
+    def _set_executable_permission(self, vm_external_ip):
+        """
+        Set all shell file to be executable
+        :param vm_external_ip: the external IP of the VM
+        :return: None
+        """
+        vm_ssh_login = "{0}@{1}".format(Config.ATTRIBUTES["vm_user"], vm_external_ip)
+        vm_ssh_cd_cmd = "cd {0}".format(Config.ATTRIBUTES["vm_code_directory"])
+        vm_ssh_chmod_cmd = "chmod a+x **/*.sh"
+        vm_ssh_cmd = "{0};{1}".format(vm_ssh_cd_cmd, vm_ssh_chmod_cmd)
+        vm_key = Config.ATTRIBUTES["vm_key_file"]
+
+        with open(os.devnull, 'w') as shutup:
+            subprocess.Popen(["ssh", "-o", "StrictHostKeyChecking=no", "-t", "-i", vm_key,
+                              vm_ssh_login, vm_ssh_cmd],
+                             stdout=shutup, stderr=shutup)
+
     def run_cluster(self, server_weave_ip, server_external_ip):
         """
         Run all Ambari-agents and Ambari-server in the cluster in parallel
@@ -463,8 +480,8 @@ class Cluster:
                     if returncode is None:
                         continue
                     else:
-                        Log.write("VM ", hostname, " configuration completed, return code: ", str(returncode) \
-                                  , ", output file path: ", output_file_path)
+                        Log.write("VM ", hostname, " configuration completed, return code: ", str(returncode),
+                                  ", output file path: ", output_file_path)
                         terminate_state_list[hostname] = True
                         output_file.close()
                 else:
@@ -490,6 +507,7 @@ class Cluster:
         for vm in self.ambari_server_vm:
             vm_external_ip = vm.external_ip
             self._scp_upload(vm_external_ip)
+            self._set_executable_permission(vm_external_ip)
 
             vm_output_file_path = vm.get_ssh_output_file_path()
             vm_output_file = open(vm_output_file_path, "w")
@@ -525,6 +543,7 @@ class Cluster:
         for vm in self.service_server_vm_list:
             vm_external_ip = vm.external_ip
             self._scp_upload(vm_external_ip)
+            self._set_executable_permission(vm_external_ip)
 
             vm_output_file_path = vm.get_ssh_output_file_path()
             vm_output_file = open(vm_output_file_path, "w")
@@ -563,6 +582,7 @@ class Cluster:
         for vm in self.ambari_agent_vm_list:
             vm_external_ip = vm.external_ip
             self._scp_upload(vm_external_ip)
+            self._set_executable_permission(vm_external_ip)
 
             vm_output_file_path = vm.get_ssh_output_file_path()
             vm_output_file = open(vm_output_file_path, "w")

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/config/cluster.txt
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/config/cluster.txt b/contrib/agent-simulator/config/cluster.txt
new file mode 100644
index 0000000..594257f
--- /dev/null
+++ b/contrib/agent-simulator/config/cluster.txt
@@ -0,0 +1,4 @@
+{
+    "clusters": [
+    ]
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/docker_image/Yum_Dockerfile
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/docker_image/Yum_Dockerfile b/contrib/agent-simulator/docker_image/Yum_Dockerfile
index 774c19a..61e2d34 100644
--- a/contrib/agent-simulator/docker_image/Yum_Dockerfile
+++ b/contrib/agent-simulator/docker_image/Yum_Dockerfile
@@ -17,7 +17,7 @@
 FROM centos:7
 
 #====================================set SSH service====================================================================
-RUN yum -y -q install openssh-server epel-release openssh-clients&& \
+RUN yum -y -q install openssh-server epel-release openssh-clients && \
     yum -y -q install pwgen && \
     rm -f /etc/ssh/ssh_host_ecdsa_key /etc/ssh/ssh_host_rsa_key && \
     ssh-keygen -q -N "" -t dsa -f /etc/ssh/ssh_host_ecdsa_key && \
@@ -28,8 +28,8 @@ ADD ssh_service/set_root_pw.sh /set_root_pw.sh
 ADD ssh_service/run.sh /run_ssh.sh
 RUN chmod +x /*.sh
 
-ENV AUTHORIZED_KEYS **None**
-ENV ROOT_PASS ambariagent
+ENV AUTHORIZED_KEYS "SSH_docker_container_public_key_STRING"
+ENV ROOT_PASS SSH_docker_container_password
 #====================================set SSH service====================================================================
 
 
@@ -48,8 +48,9 @@ RUN /ambari_agent_install.sh
 # Set Hadoop Repo
 RUN wget -O /etc/yum.repos.d/hdp.repo http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos7/2.x/updates/2.3.0.0/hdp.repo
 
-# Install all package
+# Install all package including YARN, HDFS, HBase, Zookeeper, Ambari-Metrics Monitor, etc..
 RUN yum install -y -q $(cat package_list.txt)
+
 RUN yum update -y -q
 
 # Clean yum download cache

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/docker_image/ambari_agent_install.sh
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/docker_image/ambari_agent_install.sh b/contrib/agent-simulator/docker_image/ambari_agent_install.sh
index d9c5cd6..e87b38b 100644
--- a/contrib/agent-simulator/docker_image/ambari_agent_install.sh
+++ b/contrib/agent-simulator/docker_image/ambari_agent_install.sh
@@ -19,4 +19,6 @@
 yum install -y -q wget
 wget -q -O /etc/yum.repos.d/ambari.repo http://s3.amazonaws.com/dev.hortonworks.com/ambari/centos7/2.x/latest/2.1.1/ambaribn.repo
 yum install -y -q epel-release
-yum install -y -q ambari-agent
\ No newline at end of file
+yum install -y -q ambari-agent
+yum install -y -q java-1.8.0-openjdk.x86_64
+yum install -y -q java-1.8.0-openjdk-devel.x86_64
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/docker_image/ambari_agent_start.sh
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/docker_image/ambari_agent_start.sh b/contrib/agent-simulator/docker_image/ambari_agent_start.sh
index 1e0cb0f..545b0ec 100644
--- a/contrib/agent-simulator/docker_image/ambari_agent_start.sh
+++ b/contrib/agent-simulator/docker_image/ambari_agent_start.sh
@@ -16,4 +16,5 @@
 
 # this script will start Ambari agent on Centos 7
 
-ambari-agent start
\ No newline at end of file
+ambari-agent start
+echo "ambari-agent start"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/example/config.ini
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/example/config.ini b/contrib/agent-simulator/example/config.ini
index df08421..3176c2c 100644
--- a/contrib/agent-simulator/example/config.ini
+++ b/contrib/agent-simulator/example/config.ini
@@ -25,7 +25,7 @@ gce_info_output = gce_info_output.txt
 log_file = log.txt
 
 [gce]
-gce_controller_ip = 104.196.89.197
+gce_controller_ip = your_gce_controller_ip
 gce_controller_user = root
 gce_controller_key_file = /your_path/gce-key
 # time in seconds waiting for GCE VM to boot
@@ -42,11 +42,11 @@ cluster_info_file = config/cluster.txt
 # ambari_agent_vm_type = --base
 # 2 cores, 7.5GB RAM
 # ambari_agent_vm_type = --medium
-# 4 cores, 15GB RAM
+# 4 cores, 15GB RAMvm_key_file
 # ambari_agent_vm_type = --large
 # 8 cores, 30GB RAM
 # ambari_agent_vm_type = --xxlarge
-ambari_agent_vm_type = --xlarge
+ambari_agent_vm_type = --large
 # only support centos 7
 ambari_agent_vm_os = --centos7
 #---------------------------------------------
@@ -65,32 +65,30 @@ container_hostname_fix = docker
 #==============================================================================================================
 # pull this image from Docker hub instead of build from Docker file. yes to confirm, other string to disable
 # pull_docker_hub = yes
-# docker_image_name = pengchexuacnt/hadp.2.3:1
+# docker_image_name = image_name
 #++++++++++++++++++++++++++++++++++++++++++++++++++++
 pull_docker_hub = no
 docker_image_name = ambari/agent-sim
 # The name of the Dockerfile under Docker/
 dockerfile_name = Yum_Dockerfile
-#dockerfile_name = Raw_Dockerfile
 #==============================================================================================================
 
 
 [ambari_server_vm]
-ambari_server_vm_type = --xlarge
+ambari_server_vm_type = --large
 ambari_server_vm_os = --centos7
-#ambari_server_vm = --extradisk
+#ambari_server_vm_extra = --extradisk
 
 [service_server_vm]
-service_server_vm_type = --xlarge
+service_server_vm_type = --large
 service_server_vm_os = --centos7
 #service_server_vm_extra = --extradisk
+# The UI port of the service server, like NameNode, HBase master. This makes these ports accessible from outside
+server_port_list = 50070,8088,16010,19888
 
 [weave]
-# Docker_IP_base is the starting point of IP address. with mask 16, ideally:
-# the IP of docker will be 192.168.[1-255].[1-255]/16
-# if there are more dockers, which means there is not enough IPs within this mask for all dockers,
-# the IP will continue to increase to be 192.169.*.*, dockers might not be able to talk to each other,
-# because the mask is 16
+# Internal Weave network will use this IP as a starting point,
+# and automatically assign IP to every node.
 weave_ip_base = 192.168.1.1
 weave_ip_mask = 16
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/launcher_cluster.py
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/launcher_cluster.py b/contrib/agent-simulator/launcher_cluster.py
index bed04d7..d43291a 100644
--- a/contrib/agent-simulator/launcher_cluster.py
+++ b/contrib/agent-simulator/launcher_cluster.py
@@ -47,12 +47,13 @@ def request_cluster(argv):
     cluster.request_gce_cluster(ambari_agent_vm_num, docker_num, service_server_num,
                                 with_ambari_server, cluster_name)
 
-    data = Data()
-    data.add_new_cluster(cluster)
-
     time_to_wait = Config.ATTRIBUTES["gce_boot_time"]
     print "wait ", str(time_to_wait), " seconds for the cluster to boot ... ..."
     time.sleep(int(time_to_wait))
+
+    data = Data()
+    data.add_new_cluster(cluster)
+
     print "complete"
 
 
@@ -203,7 +204,7 @@ def print_help():
     print "\t\t", "<the name of the cluster>"
     print "\t\t", "<number of VMs>"
     print "\t\t", "<number of dockers each VM>"
-    print "\t\t", "<number of service servers inside VM>"
+    print "\t\t", "<number of service servers>, directly install Ambari-Agent, not inside Dockers"
     print "\t\t", "<number of ambari-server>, either 0 or 1"
     print
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/launcher_docker.py
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/launcher_docker.py b/contrib/agent-simulator/launcher_docker.py
index 2d3404b..42943fa 100644
--- a/contrib/agent-simulator/launcher_docker.py
+++ b/contrib/agent-simulator/launcher_docker.py
@@ -47,8 +47,15 @@ if __name__ == "__main__":
 
     vm_ip_list = []
     vm_ip_list.append(server_external_ip)
-    for vm in cluster.ambari_agent_vm_list:
-        vm_ip_list.append(vm.external_ip)
+
+    # This will decide the topology of the Weave network.
+
+    # This connect all agents to other agents,
+    # which is not necessary, connecting to ambari-server and service server is enough.
+    # for vm in cluster.ambari_agent_vm_list:
+    #     vm_ip_list.append(vm.external_ip)
+
+    # This connect all agents to all service server
     for vm in cluster.service_server_vm_list:
         vm_ip_list.append(vm.external_ip)
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/network/DNS_editor.py
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/network/DNS_editor.py b/contrib/agent-simulator/network/DNS_editor.py
deleted file mode 100644
index 237654a..0000000
--- a/contrib/agent-simulator/network/DNS_editor.py
+++ /dev/null
@@ -1,53 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
-
-# This script will modify the /etc/resolv.conf
-# A new DNS is added as the first entry of "nameserver"
-# the domain is set to be Weave local domain, which is "weave.local"
-# set the Weave local domain as the first entry of "search"
-
-import sys
-
-local_Weave_DNS_IP = sys.argv[1]
-nameserver_file_name = "/etc/resolv.conf"
-
-lines = []
-with open(nameserver_file_name) as f_read:
-    lines = f_read.readlines()
-
-add_nameserver = False
-with open(nameserver_file_name, "w") as f:
-    for line in lines:
-        if "search" in line:
-            tokens = line.split()
-            f.write("search weave.local")
-            for token in tokens[1:]:
-                f.write(" ")
-                f.write(token)
-            f.write("\n")
-        elif "nameserver" in line:
-            if add_nameserver == False:
-                f.write("nameserver ")
-                f.write(local_Weave_DNS_IP)
-                f.write("\n")
-                add_nameserver = True
-            f.write(line)
-        elif "domain" in line:
-            f.write("domain weave.local\n")
-        else:
-            f.write(line)

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/network/dns_edit.py
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/network/dns_edit.py b/contrib/agent-simulator/network/dns_edit.py
new file mode 100644
index 0000000..237654a
--- /dev/null
+++ b/contrib/agent-simulator/network/dns_edit.py
@@ -0,0 +1,53 @@
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+# This script will modify the /etc/resolv.conf
+# A new DNS is added as the first entry of "nameserver"
+# the domain is set to be Weave local domain, which is "weave.local"
+# set the Weave local domain as the first entry of "search"
+
+import sys
+
+local_Weave_DNS_IP = sys.argv[1]
+nameserver_file_name = "/etc/resolv.conf"
+
+lines = []
+with open(nameserver_file_name) as f_read:
+    lines = f_read.readlines()
+
+add_nameserver = False
+with open(nameserver_file_name, "w") as f:
+    for line in lines:
+        if "search" in line:
+            tokens = line.split()
+            f.write("search weave.local")
+            for token in tokens[1:]:
+                f.write(" ")
+                f.write(token)
+            f.write("\n")
+        elif "nameserver" in line:
+            if add_nameserver == False:
+                f.write("nameserver ")
+                f.write(local_Weave_DNS_IP)
+                f.write("\n")
+                add_nameserver = True
+            f.write(line)
+        elif "domain" in line:
+            f.write("domain weave.local\n")
+        else:
+            f.write(line)

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/network/set_ambari_server_network.sh
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/network/set_ambari_server_network.sh b/contrib/agent-simulator/network/set_ambari_server_network.sh
index ad04644..892f6f9 100644
--- a/contrib/agent-simulator/network/set_ambari_server_network.sh
+++ b/contrib/agent-simulator/network/set_ambari_server_network.sh
@@ -53,4 +53,4 @@ weave launch-dns ${weave_dns_ip}/${mask}
 weave expose ${weave_internal_ip}/${mask}
 
 # set domain name resolution
-python dns_editor.py $weave_dns_ip
+python dns_edit.py $weave_dns_ip

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/network/set_host_network.sh
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/network/set_host_network.sh b/contrib/agent-simulator/network/set_host_network.sh
index a112d21..2c23d6a 100644
--- a/contrib/agent-simulator/network/set_host_network.sh
+++ b/contrib/agent-simulator/network/set_host_network.sh
@@ -60,7 +60,7 @@ weave launch-dns ${weave_dns_ip}/${mask}
 weave expose ${weave_internal_ip}/${mask} -h $weave_domain_name
 
 # set domain name resolution
-python dns_editor.py $weave_dns_ip
+python dns_edit.py $weave_dns_ip
 
 # add Weave local IP, host name, domain name mapping
 content="$(cat /etc/hosts)"

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/network/set_ui_port_forward.sh
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/network/set_ui_port_forward.sh b/contrib/agent-simulator/network/set_ui_port_forward.sh
new file mode 100644
index 0000000..1d0391a
--- /dev/null
+++ b/contrib/agent-simulator/network/set_ui_port_forward.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information rega4rding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script will forward the port from eth0 to the weave internal IP
+
+# run this script with root
+# $1 <external IP>
+# $2 <Weave internal IP>
+# $3 <Port>
+
+if [ $# -lt 3 ]; then
+    echo "usage: ./set_ui_port_forward.sh <external IP> <Weave internal IP> <Port>"
+    echo "example: ./set_ambari_server_network.sh 104.196.56.56 192.168.2.2 8088"
+    exit 1
+fi
+
+from_ip=$1
+to_ip=$2
+port=$3
+
+# enable forwarding
+echo 1 > /proc/sys/net/ipv4/ip_forward
+
+echo "forward port $port from $from_ip to $to_ip"
+
+#just to be sure firewall doesn't block
+iptables -I FORWARD -p tcp -d $from_ip --dport $port -j ACCEPT
+#actual forward
+iptables -t nat -A PREROUTING -p tcp -i eth0 --dport $port -j DNAT --to $to_ip
+
+#same for UDP
+iptables -I FORWARD -p udp -d $from_ip --dport $port -j ACCEPT
+iptables -t nat -A PREROUTING -p udp -i eth0 --dport $port -j DNAT --to $to_ip
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/server/ambari_server_install.sh
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/server/ambari_server_install.sh b/contrib/agent-simulator/server/ambari_server_install.sh
index dc6d034..e6568bc 100644
--- a/contrib/agent-simulator/server/ambari_server_install.sh
+++ b/contrib/agent-simulator/server/ambari_server_install.sh
@@ -19,4 +19,12 @@
 yum install -y -q wget
 wget -q -O /etc/yum.repos.d/ambari.repo http://s3.amazonaws.com/dev.hortonworks.com/ambari/centos7/2.x/latest/2.1.1/ambaribn.repo
 yum install -y -q ambari-server
-sudo ambari-server setup -s
\ No newline at end of file
+yum install -y -q java-1.8.0-openjdk.x86_64
+yum install -y -q java-1.8.0-openjdk-devel.x86_64
+# ambari-server setup -s
+# ambari-server setup -j <path to JDK on all hosts>
+ambari-server setup -j /usr/lib/jvm/java-openjdk << _EOF_
+y
+n
+n
+_EOF_

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/server/ambari_server_start.sh
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/server/ambari_server_start.sh b/contrib/agent-simulator/server/ambari_server_start.sh
index 306cc76..e80da11 100644
--- a/contrib/agent-simulator/server/ambari_server_start.sh
+++ b/contrib/agent-simulator/server/ambari_server_start.sh
@@ -16,5 +16,5 @@
 
 # This script will install and start the ambari-server on a CentOS 7 machine
 
-sudo ambari-server start
+ambari-server start
 echo "ambari-server start"
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/contrib/agent-simulator/vm.py
----------------------------------------------------------------------
diff --git a/contrib/agent-simulator/vm.py b/contrib/agent-simulator/vm.py
index 64f818d..9c49eca 100644
--- a/contrib/agent-simulator/vm.py
+++ b/contrib/agent-simulator/vm.py
@@ -117,7 +117,6 @@ class VM:
         install Weave on this VM
         :return: None
         """
-        subprocess.call(["sudo", "chmod", "755", "Linux/CentOS7/weave_install.sh"])
         subprocess.call("./Linux/CentOS7/weave_install.sh")
 
     def _set_weave_network(self, vm_external_ip_list, weave_dns_ip):
@@ -146,7 +145,6 @@ class VM:
         install Docker on this VM
         :return: None
         """
-        subprocess.call(["sudo", "chmod", "755", "Linux/CentOS7/docker_install.sh"])
         subprocess.call("./Linux/CentOS7/docker_install.sh")
 
     def _build_docker_image(self, image_name):
@@ -193,7 +191,6 @@ class VM:
         :param mount_point: the mount point of the partition to be used
         :return: None
         """
-        subprocess.call(["sudo", "chmod", "755", "./Linux/CentOS7/set_docker_partition.sh"])
         subprocess.call(["./Linux/CentOS7/set_docker_partition.sh", mount_point])
 
     def run_ambari_server(self):
@@ -203,17 +200,15 @@ class VM:
         """
         # set up network, run script inside the network directory
         os.chdir("network")
-        subprocess.call(["sudo", "chmod", "755", "set_ambari_server_network.sh"])
         subprocess.call(["./set_ambari_server_network.sh", self.weave_internal_ip,
                          self.weave_dns_ip, self.weave_ip_mask])
         os.chdir("..")
 
         # install ambari server and start service
-        subprocess.call(["sudo", "chmod", "755", "./server/ambari_server_install.sh"])
         subprocess.call(["./server/ambari_server_install.sh"])
 
         # start service
-        subprocess.call(["sudo", "ambari-server", "start"])
+        subprocess.call(["./server/ambari_server_start.sh"])
 
     def run_service_server(self, ambari_server_weave_ip, ambari_server_external_ip):
         """
@@ -224,19 +219,23 @@ class VM:
         """
         # set up network, run script inside the network directory
         os.chdir("network")
-        subprocess.call(["sudo", "chmod", "755", "set_host_network.sh"])
         subprocess.call(["./set_host_network.sh", self.weave_internal_ip,
                          self.weave_dns_ip, self.weave_ip_mask, self.hostname,
                          self.weave_domain_name, ambari_server_external_ip])
         os.chdir("..")
 
         # install ambari agent and start service
-        subprocess.call(["sudo", "chmod", "755", "./docker_image/ambari_agent_install.sh"])
         subprocess.call(["./docker_image/ambari_agent_install.sh"])
         replace_conf(ambari_server_weave_ip)
 
         # start service
-        subprocess.call(["sudo", "ambari-agent", "start"])
+        subprocess.call(["./docker_image/ambari_agent_start.sh"])
+
+        # forward public IP to Weave IP for server UI access
+        port_list = Config.ATTRIBUTES["server_port_list"].split(",")
+        for port in port_list:
+            subprocess.call(["./network/set_ui_port_forward.sh", self.external_ip, self.weave_internal_ip, port])
+
 
     def run_docker(self, server_weave_ip, vm_ip_list):
         """

http://git-wip-us.apache.org/repos/asf/ambari/blob/6baeac53/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5881515..5b5c860 100644
--- a/pom.xml
+++ b/pom.xml
@@ -263,6 +263,7 @@
             <exclude>contrib/ambari-scom/msi/src/GUI_Ambari.sln</exclude>
             <exclude>contrib/fast-hdfs-resource/dependency-reduced-pom.xml</exclude>
             <exclude>contrib/agent-simulator/docker_image/package_list.txt</exclude>
+            <exclude>contrib/agent-simulator/config/cluster.txt</exclude>
             <exclude>version</exclude>
             <!--IDE and GIT files-->
             <exclude>**/.idea/</exclude>


Mime
View raw message