Merge pull request #2497 from StackStorm/v1.3.2

manasdk · manasdk · commit c9cd1fe0184c · 2016-02-12T15:45:20.000-08:00
V1.3.2
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.3.2 - February 12, 2016
+-------------------------
+* Remove get_open_ports action from Linux pack.
+
 1.3.1 - January 25, 2016
 ------------------------
 
diff --git a/circle.yml b/circle.yml
@@ -1,7 +1,11 @@
 # Setup in CircleCI account the following ENV variables:
-# BINTRAY_ORGANIZATION
+# IS_PRODUCTION (default: 0)
+# IS_ENTERPRISE (default: 0)
+# BINTRAY_ORGANIZATION (default: stackstorm)
 # BINTRAY_ACCOUNT
 # BINTRAY_API_KEY
+# PACKAGECLOUD_ORGANIZATION (default: stackstorm)
+# PACKAGECLOUD_TOKEN
 # DOCKER_USER
 # DOCKER_EMAIL
 # DOCKER_PASSWORD
@@ -10,7 +14,7 @@ general:
   branches:
     only:
       - master
-      - /v[0-9]+(\.[0-9]+)*/
+      - /v[0-9]+\.[0-9]+/
   build_dir: st2-packages
   artifacts:
     - ~/packages
@@ -47,6 +51,8 @@ dependencies:
   pre:
     - sudo .circle/configure-services.sh
     - sudo .circle/fix-cache-permissions.sh
+    - sudo apt-get -y install parallel jq
+    - gem install package_cloud
     - sudo pip install docker-compose
     - docker-compose version
     - docker version
@@ -73,16 +79,16 @@ deployment:
     owner: StackStorm
     branch:
       - master
-      - /v[0-9]+(\.[0-9]+)*/
+      - /v[0-9]+\.[0-9]+/
     commands:
       # Deploy to Bintray all artifacts for respective distros in parallel
       - |
         DISTROS=($DISTROS)
-        for i in $(seq 0 $((CIRCLE_NODE_TOTAL-1))); do
-          echo Deploying Bintray artifacts for "${DISTROS[$i]}" ...
-          .circle/bintray.sh deploy ${DISTROS[$i]}_staging ~/packages/${DISTROS[$i]} &
-        done
-        wait
+        parallel -v -j0 --line-buffer .circle/bintray.sh deploy {}_staging ~/packages/{} ::: ${DISTROS[@]::$CIRCLE_NODE_TOTAL}
+      # Deploy to PackageCloud all artifacts for respective distros in parallel
+      - |
+        DISTROS=($DISTROS)
+        parallel -v -j0 --line-buffer .circle/packagecloud.sh deploy {} ~/packages/{} ::: ${DISTROS[@]::$CIRCLE_NODE_TOTAL}
       - .circle/docker.sh deploy st2actionrunner st2api st2auth st2exporter st2notifier st2resultstracker st2rulesengine st2sensorcontainer
       - .circle/save_payload.py ~/packages
 
@@ -91,4 +97,4 @@ experimental:
     branches:
       only:
         - master
-        - /v[0-9]+(\.[0-9]+)*/
+        - /v[0-9]+\.[0-9]+/
diff --git a/contrib/linux/actions/get_open_ports.py b/contrib/linux/actions/get_open_ports.py
diff --git a/contrib/linux/actions/get_open_ports.yaml b/contrib/linux/actions/get_open_ports.yaml
diff --git a/contrib/linux/requirements.txt b/contrib/linux/requirements.txt
@@ -1,5 +1,3 @@
 # used by file watcher sensor
 pyinotify>=0.9.5,<=0.10
 -e git+https://github.com/Kami/logshipper.git@stackstorm_patched#egg=logshipper
-# used by nmap actions
-python-nmap>=0.3.4,<0.4
diff --git a/fixed-requirements.txt b/fixed-requirements.txt
@@ -15,7 +15,6 @@ lockfile>=0.10.2,<0.11
 python-gnupg>=0.3.7,<0.4
 jsonpath-rw>=1.3.0
 pyinotify>=0.9.5,<=0.10
-python-nmap>=0.3.4,<0.4
 semver>=2.1.2
 tooz==1.20.0
 stevedore>=1.7.0,<1.8
diff --git a/requirements.txt b/requirements.txt
@@ -1,13 +1,15 @@
 # Don't edit this file. It's generated automatically!
 apscheduler>=3.0.0rc1
+bcrypt
 bencode<1.1,>=1.0
 eventlet>=0.13.0
 git+https://github.com/Kami/logshipper.git@stackstorm_patched#egg=logshipper
 git+https://github.com/StackStorm/fabric.git@stanley-patched#egg=fabric
 git+https://github.com/StackStorm/pecan.git@st2-patched#egg=pecan
-git+https://github.com/StackStorm/python-mistralclient.git@st2-1.3.1#egg=python-mistralclient
+git+https://github.com/StackStorm/python-mistralclient.git@st2-1.3.2#egg=python-mistralclient
 git+https://github.com/StackStorm/st2-auth-backend-flat-file.git@master#egg=st2-auth-backend-flat-file
 gitpython==0.3.2.1
+gunicorn
 ipaddr
 jinja2
 jsonpath-rw>=1.3.0
@@ -26,7 +28,6 @@ pymongo<3.0
 python-dateutil
 python-gnupg<0.4,>=0.3.7
 python-json-logger
-python-nmap<0.4,>=0.3.4
 pyyaml<4.0,>=3.11
 requests[security]<3.0,>=2.7.0
 retrying
diff --git a/st2actions/in-requirements.txt b/st2actions/in-requirements.txt
@@ -5,7 +5,7 @@ eventlet
 git+https://github.com/StackStorm/fabric.git@stanley-patched#egg=fabric
 jinja2
 kombu
-git+https://github.com/StackStorm/python-mistralclient.git@st2-1.3.1#egg=python-mistralclient
+git+https://github.com/StackStorm/python-mistralclient.git@st2-1.3.2#egg=python-mistralclient
 oslo.config
 oslo.utils
 requests
@@ -16,7 +16,6 @@ python-json-logger
 gitpython
 lockfile
 # needed by core "linux" pack - TODO: create virtualenv for linux pack on postinst
-python-nmap
 pyinotify
 git+https://github.com/Kami/logshipper.git@stackstorm_patched#egg=logshipper
 # required by pack_mgmt/setup_virtualenv.py#L135
diff --git a/st2client/st2client/__init__.py b/st2client/st2client/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '1.3.1'
+__version__ = '1.3.2'
diff --git a/st2common/bin/st2ctl b/st2common/bin/st2ctl
@@ -2,10 +2,8 @@
 
 
 LOGFILE="/dev/null"
-COMPONENTS="st2actionrunner st2api st2auth st2garbagecollector st2notifier st2resultstracker "
-COMPONENTS+="st2rulesengine st2sensorcontainer st2web mistral mistral-api"
+COMPONENTS="st2actionrunner st2api st2auth st2garbagecollector st2notifier st2resultstracker st2rulesengine st2sensorcontainer mistral"
 STANCONF="/etc/st2/st2.conf"
-WEBUI_PORT=${WEBUI_PORT:-8080}
 
 # Ensure global environment is sourced if exists
 # Does not happen consistently with all OSes we support.
@@ -76,8 +74,10 @@ function st2stop() {
 function service_manager() {
   if [ -d /run/systemd/system ]; then
     systemctl "${2}" "${1}"
-  elif command -v service 2>/dev/null; then
+  elif command -v service > /dev/null 2>&1; then
     service "${1}" "${2}"
+  elif [ -x /etc/init.d/${1} ]; then
+    /etc/init.d/${1} "${2}"
   else
     echo -e "\e[31mError: Unsupported service manager in the system! \e[0m\n"
     exit 1
@@ -140,15 +140,10 @@ function clean_logs() {
 
 function getpids() {
   echo "##### st2 components status #####"
+  COMPONENTS=${COMPONENTS/mistral/mistral-server mistral-api}
 
   for COM in ${COMPONENTS}; do
-    if [[ "${COM}" == "st2web" && -z "${ST2_DISABLE_HTTPSERVER}" ]]; then
-      PID=`ps ax | grep -v grep | egrep "SimpleHTTPServer $WEBUI_PORT\$" | awk '{print $1}'`
-    elif [[ "${COM}" == "mistral" ]]; then
-      PID=`ps ax | grep -v grep | grep -v postgres | grep "${COM}" | awk '{print $1}'`
-    else
-      PID=`ps ax | grep -v grep | grep -v st2ctl | grep "${COM}" | awk '{print $1}'`
-    fi
+    PID=`ps ax | grep -v grep | grep -v st2ctl | grep "${COM}" | awk '{print $1}'`
 
     if [[ ! -z ${PID} ]]; then
       for p in ${PID}; do
@@ -172,7 +167,7 @@ case ${1} in
     st2stop
     ;;
   restart)
-    must_be_root  
+    must_be_root
     st2stop
     sleep 1
     st2start
diff --git a/st2common/st2common/__init__.py b/st2common/st2common/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '1.3.1'
+__version__ = '1.3.2'
