eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject [06/20] incubator-eagle git commit: [EAGLE-53] Refactor eagle docker strucutre and implement eagle-docker.sh wrapper scripts
Date Mon, 30 Nov 2015 10:11:48 GMT
http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/dc5b5ab3/eagle-external/eagle-docker/resource/wait-for-eagle.sh
----------------------------------------------------------------------
diff --git a/eagle-external/eagle-docker/resource/wait-for-eagle.sh b/eagle-external/eagle-docker/resource/wait-for-eagle.sh
new file mode 100755
index 0000000..3b6ab11
--- /dev/null
+++ b/eagle-external/eagle-docker/resource/wait-for-eagle.sh
@@ -0,0 +1,38 @@
+#!/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 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.
+
+: ${EAGLE_HOST:=$AMBARISERVER_PORT_9099_TCP_ADDR}
+: ${SLEEP:=2}
+: ${DEBUG:=1}
+
+: ${EAGLE_HOST:? eagle server address is mandatory, fallback is a linked containers exposed
9099}
+
+debug() {
+  [ $DEBUG -gt 0 ] && echo [DEBUG] "$@" 1>&2
+}
+
+get-server-state() {
+  curl -s -o /dev/null -w "%{http_code}" $AMBARISERVER_PORT_9099_TCP_ADDR:9099/eagle-service/index.html
+}
+
+debug waits for eagle to start on: $EAGLE_HOST
+while ! get-server-state | grep 200 &>/dev/null ; do
+  [ $DEBUG -gt 0 ] && echo -n .
+  sleep $SLEEP
+done
+[ $DEBUG -gt 0 ] && echo
+debug eagle web started: $EAGLE_HOST:9099/eagle-service

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/dc5b5ab3/eagle-external/eagle-docker/serf/etc/ambari.json
----------------------------------------------------------------------
diff --git a/eagle-external/eagle-docker/serf/etc/ambari.json b/eagle-external/eagle-docker/serf/etc/ambari.json
deleted file mode 100644
index 4409e84..0000000
--- a/eagle-external/eagle-docker/serf/etc/ambari.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "event_handlers": [
-    "member-join=/usr/local/serf/handlers/ambari-bootstrap",
-    "user:eagle=/usr/local/serf/handlers/eagle"
-  ],
-  "tags" : {
-    "ambari-agent": "true"
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/dc5b5ab3/eagle-external/eagle-docker/serf/handlers/eagle
----------------------------------------------------------------------
diff --git a/eagle-external/eagle-docker/serf/handlers/eagle b/eagle-external/eagle-docker/serf/handlers/eagle
deleted file mode 100755
index 7f7df4b..0000000
--- a/eagle-external/eagle-docker/serf/handlers/eagle
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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 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.
-
-# install Eagle on the Ambari server instance
-if [[ "$SERF_TAG_AMBARI_SERVER" == "true" ]] ;then
-  echo run eagle install script
-  nohup /usr/hdp/current/eagle/deploy.sh > /var/log/eagle-deploy.log
-fi

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/dc5b5ab3/eagle-external/eagle-docker/wait-for-eagle.sh
----------------------------------------------------------------------
diff --git a/eagle-external/eagle-docker/wait-for-eagle.sh b/eagle-external/eagle-docker/wait-for-eagle.sh
deleted file mode 100755
index 3b6ab11..0000000
--- a/eagle-external/eagle-docker/wait-for-eagle.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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 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.
-
-: ${EAGLE_HOST:=$AMBARISERVER_PORT_9099_TCP_ADDR}
-: ${SLEEP:=2}
-: ${DEBUG:=1}
-
-: ${EAGLE_HOST:? eagle server address is mandatory, fallback is a linked containers exposed
9099}
-
-debug() {
-  [ $DEBUG -gt 0 ] && echo [DEBUG] "$@" 1>&2
-}
-
-get-server-state() {
-  curl -s -o /dev/null -w "%{http_code}" $AMBARISERVER_PORT_9099_TCP_ADDR:9099/eagle-service/index.html
-}
-
-debug waits for eagle to start on: $EAGLE_HOST
-while ! get-server-state | grep 200 &>/dev/null ; do
-  [ $DEBUG -gt 0 ] && echo -n .
-  sleep $SLEEP
-done
-[ $DEBUG -gt 0 ] && echo
-debug eagle web started: $EAGLE_HOST:9099/eagle-service


Mime
View raw message