You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/10/05 21:28:13 UTC

[1/2] incubator-brooklyn git commit: renamed image files and updated sql-app landing page

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 8636eb302 -> aca8914ed


renamed image files and updated sql-app landing page


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/09d8eb3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/09d8eb3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/09d8eb3c

Branch: refs/heads/master
Commit: 09d8eb3cd3f05966612dc1fd01a033bc50d71e59
Parents: d3cefa3
Author: morganbwright <mo...@cloudsoftcorp.com>
Authored: Thu Oct 1 13:42:37 2015 -0700
Committer: morganbwright <mo...@cloudsoftcorp.com>
Committed: Thu Oct 1 13:42:37 2015 -0700

----------------------------------------------------------------------
 docs/guide/start/brooklyn.properties            |   1 +
 docs/guide/yaml/winrm/index.md                  |  42 +++++++++++
 .../main/webapp/images/BrooklynBridge3Large.png | Bin 0 -> 703246 bytes
 .../hello-world-sql/src/main/webapp/index.html  |  35 +++++----
 .../src/main/webapp/styles/main.css             |  71 +++++++++++++++++++
 .../main/webapp/images/BrooklynBridge3Large.png | Bin 0 -> 703246 bytes
 .../webapp/images/bridge-large-no-title.png     | Bin 0 -> 66113 bytes
 .../src/main/webapp/index.html                  |  35 +++++----
 .../src/main/webapp/styles/main.css             |  71 +++++++++++++++++++
 9 files changed, 217 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09d8eb3c/docs/guide/start/brooklyn.properties
----------------------------------------------------------------------
diff --git a/docs/guide/start/brooklyn.properties b/docs/guide/start/brooklyn.properties
index 0858f94..d70c92c 100644
--- a/docs/guide/start/brooklyn.properties
+++ b/docs/guide/start/brooklyn.properties
@@ -83,6 +83,7 @@ brooklyn.location.jclouds.aws-ec2.credential = <access-key-hex-digits>
 # brooklyn.geoscaling.primaryDomain = DOMAIN
 
 
+
 ##########################  Getting Started Complete!  ###################################
 
 # That's it, although you may want to read through these options...

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09d8eb3c/docs/guide/yaml/winrm/index.md
----------------------------------------------------------------------
diff --git a/docs/guide/yaml/winrm/index.md b/docs/guide/yaml/winrm/index.md
index 2a6ce6a..a29d75a 100644
--- a/docs/guide/yaml/winrm/index.md
+++ b/docs/guide/yaml/winrm/index.md
@@ -355,6 +355,18 @@ refer to [How and Why to re-authenticate withing a powershell script](#how-and-w
 If using the imageId of a Windows community AMI, you may find that the AMI is deleted after a few weeks.
 See [Windows AMIs on AWS](#windows-amis-on-aws) above.
 
+### VM Provisioning Times Out
+
+In some environments, provisioning of Windows VMs can take a very long time to return a usable VM.
+If the image is old, it may install many security updates (and reboot several times) before it is
+usable.
+
+On a VMware vCloud Director environment, the guest customizations can cause the VM to reboot (sometimes
+several times) before the VM is usable.
+
+This could cause the WinRM connection attempts to timeout. The location configuration option 
+`waitForWinRmAvailable` defaults to `30m` (i.e. 30 minutes). This can be increased if required.
+
 ### Windows log files
 
 Details of the commands executed, and their results, can be found in the Brooklyn log and in the Brooklyn 
@@ -416,6 +428,36 @@ If a batch or Powershell file exits with an exit code greater than one (or negat
 be reported as 1 over WinRM. For example, if a batch file ends with `exit /B 3`, the WinRM 
 result from executing that file will be 1.
 
+### PowerShell "Preparing modules for first use"
+
+The first command executed over WinRM has been observed to include stderr saying "Preparing 
+modules for first use", such as that below:
+
+    < CLIXML
+    <Objs Version="1.1.0.1" xmlns="http://schemas.microsoft.com/powershell/2004/04"><Obj S="progress" RefId="0"><TN RefId="0"><T>System.Management.Automation.PSCustomObject</T><T>System.Object</T></TN><MS><I64 N="SourceId">1</I64><PR N="Record"><AV>Preparing modules for first use.</AV><AI>0</AI><Nil /><PI>-1</PI><PC>-1</PC><T>Completed</T><SR>-1</SR><SD> </SD></PR></MS></Obj><Obj S="progress" RefId="1"><TNRef RefId="0" /><MS><I64 N="SourceId">2</I64><PR N="Record"><AV>Preparing modules for first use.</AV><AI>0</AI><Nil /><PI>-1</PI><PC>-1</PC><T>Completed</T><SR>-1</SR><SD> </SD></PR></MS></Obj></Objs>
+
+The command still succeeded. This has only been observed on private clouds (e.g. not on
+AWS). It could be related to the specific Windows images in use. It is recommended that 
+VM images are prepared carefully, e.g. so that security patches are up-to-date and the
+VM is suitably initialised.
+
+### WinRM executeScript failed: httplib.BadStatusLine: ''
+
+As described in https://issues.apache.org/jira/browse/BROOKLYN-173, a failure has been
+observed where the 10 attempts to execute the command over WinRM failed with:
+
+    httplib.BadStatusLine: ''
+
+Subsequently retrying the command worked. It is unclear what caused the failure, but could 
+have been that the Windows VM was not yet in the right state.
+
+One possible workaround is to ensure the Windows VM is in a good state for immediate use (e.g. 
+security updates are up-to-date). Another option is to increase the number of retries, 
+which defaults to 10. This is a configuration option on the machine location, so can be set on
+the location's brooklyn.properties or in the YAML: 
+
+    execTries: 20
+
 ### Direct Configuration of Multi-line Batch Commands Not Executed
 
 If a command is directly configured with multi-line batch commands, then only the first line 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09d8eb3c/examples/webapps/hello-world-sql/src/main/webapp/images/BrooklynBridge3Large.png
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-sql/src/main/webapp/images/BrooklynBridge3Large.png b/examples/webapps/hello-world-sql/src/main/webapp/images/BrooklynBridge3Large.png
new file mode 100644
index 0000000..2f8253a
Binary files /dev/null and b/examples/webapps/hello-world-sql/src/main/webapp/images/BrooklynBridge3Large.png differ

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09d8eb3c/examples/webapps/hello-world-sql/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-sql/src/main/webapp/index.html b/examples/webapps/hello-world-sql/src/main/webapp/index.html
index 5ee151b..33b9bd9 100644
--- a/examples/webapps/hello-world-sql/src/main/webapp/index.html
+++ b/examples/webapps/hello-world-sql/src/main/webapp/index.html
@@ -21,25 +21,22 @@ under the License.
 <html>
 <head>
 <title>Sample "Hello, World" Application</title>
+<link rel="stylesheet" type="text/css" href="styles/main.css">
 </head>
-<body bgcolor=white>
-
-<table border="0">
-<tr>
-<td>
-<img src="images/bridge-small.png">
-</td>
-<td>
-<h1>Sample Brooklyn Deployed "Hello, World" Application</h1>
-<p>This is the home page for a sample application used to illustrate 
-how web applications can be deployed to multi-cloud environments using Brooklyn.
-</td>
-</tr>
-</table>
-
-<p>
-See the available illustrations <a href="available.jsp">here</a>.
-</p>
-
+<body>
+<div id='main'>
+<div id="header">
+	<div class="header_text">
+		<h1>Sample Brooklyn Deployed "Hello, World" Application</h1>
+	</div>
+</div>
+	<div id="container">
+		<div class="text_row">
+		  <div class="app_info"><h3>This is the home page for a sample application used to illustrate 
+		how web applications can be deployed to multi-cloud environments using Brooklyn.</h3></div>
+		  <div class="illustrations"><p>See the available illustrations <a href="available.jsp">here</a>.</p></div>
+		</div>
+	</div>
+</div>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09d8eb3c/examples/webapps/hello-world-sql/src/main/webapp/styles/main.css
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-sql/src/main/webapp/styles/main.css b/examples/webapps/hello-world-sql/src/main/webapp/styles/main.css
new file mode 100644
index 0000000..c52e212
--- /dev/null
+++ b/examples/webapps/hello-world-sql/src/main/webapp/styles/main.css
@@ -0,0 +1,71 @@
+/*
+ * 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.
+*/
+*{
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+body{
+	padding: 0;
+	margin: 0;
+}
+#main{
+	background: url('../images/BrooklynBridge3Large.png') no-repeat fixed;
+	-webkit-background-size: cover;
+	-moz-background-size: cover;
+	-o-background-size: cover;
+	background-size: cover;
+	height: 100vh;
+	background-color: #6BB445;
+}
+#header{
+	text-align: center;
+}
+h1{
+	font-family: "open sans","HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;
+    text-transform: uppercase;
+    line-height: 105%;
+    letter-spacing: 1px;
+    font-weight: bold;
+    text-align: center;
+    margin: 20px 0 15px;
+    margin: 0;
+    padding-top: 20vh;
+}
+#container{
+	padding-top: 30vh;
+	text-align: center;
+	line-height: 140%;
+    font-family: "Noto Serif","open sans","HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;
+    font-weight: normal;
+    color: white;
+    text-shadow: #000 0px 0px 5px,   #000 0px 0px 5px,   #000 0px 0px 5px,
+	#000 0px 0px 5px,   #000 0px 0px 5px,   #000 0px 0px 5px;
+    font-style: italic;
+    margin-bottom: 45px;
+	width: 80%;
+	margin-left: 10%;
+}
+a{
+	color: #6BB445;
+}
+.text_row{
+	padding: 5%;
+}
+.illustrations{
+	padding-bottom: 5%;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09d8eb3c/examples/webapps/hello-world-webapp/src/main/webapp/images/BrooklynBridge3Large.png
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-webapp/src/main/webapp/images/BrooklynBridge3Large.png b/examples/webapps/hello-world-webapp/src/main/webapp/images/BrooklynBridge3Large.png
new file mode 100644
index 0000000..2f8253a
Binary files /dev/null and b/examples/webapps/hello-world-webapp/src/main/webapp/images/BrooklynBridge3Large.png differ

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09d8eb3c/examples/webapps/hello-world-webapp/src/main/webapp/images/bridge-large-no-title.png
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-webapp/src/main/webapp/images/bridge-large-no-title.png b/examples/webapps/hello-world-webapp/src/main/webapp/images/bridge-large-no-title.png
new file mode 100644
index 0000000..0a7f878
Binary files /dev/null and b/examples/webapps/hello-world-webapp/src/main/webapp/images/bridge-large-no-title.png differ

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09d8eb3c/examples/webapps/hello-world-webapp/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-webapp/src/main/webapp/index.html b/examples/webapps/hello-world-webapp/src/main/webapp/index.html
index 5ee151b..33b9bd9 100644
--- a/examples/webapps/hello-world-webapp/src/main/webapp/index.html
+++ b/examples/webapps/hello-world-webapp/src/main/webapp/index.html
@@ -21,25 +21,22 @@ under the License.
 <html>
 <head>
 <title>Sample "Hello, World" Application</title>
+<link rel="stylesheet" type="text/css" href="styles/main.css">
 </head>
-<body bgcolor=white>
-
-<table border="0">
-<tr>
-<td>
-<img src="images/bridge-small.png">
-</td>
-<td>
-<h1>Sample Brooklyn Deployed "Hello, World" Application</h1>
-<p>This is the home page for a sample application used to illustrate 
-how web applications can be deployed to multi-cloud environments using Brooklyn.
-</td>
-</tr>
-</table>
-
-<p>
-See the available illustrations <a href="available.jsp">here</a>.
-</p>
-
+<body>
+<div id='main'>
+<div id="header">
+	<div class="header_text">
+		<h1>Sample Brooklyn Deployed "Hello, World" Application</h1>
+	</div>
+</div>
+	<div id="container">
+		<div class="text_row">
+		  <div class="app_info"><h3>This is the home page for a sample application used to illustrate 
+		how web applications can be deployed to multi-cloud environments using Brooklyn.</h3></div>
+		  <div class="illustrations"><p>See the available illustrations <a href="available.jsp">here</a>.</p></div>
+		</div>
+	</div>
+</div>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09d8eb3c/examples/webapps/hello-world-webapp/src/main/webapp/styles/main.css
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-webapp/src/main/webapp/styles/main.css b/examples/webapps/hello-world-webapp/src/main/webapp/styles/main.css
new file mode 100644
index 0000000..27606d3
--- /dev/null
+++ b/examples/webapps/hello-world-webapp/src/main/webapp/styles/main.css
@@ -0,0 +1,71 @@
+/*
+ * 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.
+*/
+*{
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+body{
+	padding: 0;
+	margin: 0;
+}
+#main{
+	background: url('../images/BrooklynBridge3Large.png')fixed;
+	-webkit-background-size: cover;
+	-moz-background-size: cover;
+	-o-background-size: cover;
+	background-size: cover;
+	height: 100vh;
+	background-color: #6BB445;
+}
+#header{
+	text-align: center;
+}
+h1{
+	font-family: "open sans","HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;
+    text-transform: uppercase;
+    line-height: 105%;
+    letter-spacing: 1px;
+    font-weight: bold;
+    text-align: center;
+    margin: 20px 0 15px;
+    margin: 0;
+    padding-top: 20vh;
+}
+#container{
+	padding-top: 30vh;
+	text-align: center;
+	line-height: 140%;
+    font-family: "Noto Serif","open sans","HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;
+    font-weight: normal;
+    color: white;
+    text-shadow: #000 0px 0px 5px,   #000 0px 0px 5px,   #000 0px 0px 5px,
+    	#000 0px 0px 5px,   #000 0px 0px 5px,   #000 0px 0px 5px;
+    font-style: italic;
+    margin-bottom: 45px;
+	width: 80%;
+	margin-left: 10%;
+}
+a{
+	color: #6BB445;
+}
+.text_row{
+	padding: 5%;
+}
+.illustrations{
+	padding-bottom: 5%;
+}
\ No newline at end of file


[2/2] incubator-brooklyn git commit: This closes #928

Posted by al...@apache.org.
This closes #928


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/aca8914e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/aca8914e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/aca8914e

Branch: refs/heads/master
Commit: aca8914ed36e2d50df4fb52ebaabd41401b68e46
Parents: 8636eb3 09d8eb3
Author: Aled Sage <al...@gmail.com>
Authored: Mon Oct 5 20:26:53 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Oct 5 20:26:53 2015 +0100

----------------------------------------------------------------------
 docs/guide/start/brooklyn.properties            |   1 +
 .../main/webapp/images/BrooklynBridge3Large.png | Bin 0 -> 703246 bytes
 .../hello-world-sql/src/main/webapp/index.html  |  35 +++++----
 .../src/main/webapp/styles/main.css             |  71 +++++++++++++++++++
 .../main/webapp/images/BrooklynBridge3Large.png | Bin 0 -> 703246 bytes
 .../webapp/images/bridge-large-no-title.png     | Bin 0 -> 66113 bytes
 .../src/main/webapp/index.html                  |  35 +++++----
 .../src/main/webapp/styles/main.css             |  71 +++++++++++++++++++
 8 files changed, 175 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aca8914e/docs/guide/start/brooklyn.properties
----------------------------------------------------------------------