Start version 1.2.0 development

Change-Id: Ib60f1cc3bd5c7c9f467aad7f27d6b563e9ea5e94
Mirantis · May 15, 2017 · 535944d · 535944d
1 parent 392de44
commit 535944d
Show file tree

Hide file tree

Showing 84 changed files with 141 additions and 6,088 deletions.
diff --git a/.scd.yaml b/.scd.yaml
@@ -3,7 +3,7 @@
 config: 1
 
 version:
-  number: "1.1.0"
+  number: "1.2.0.dev1"
   scheme: pep440
 
 search_patterns:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -8,6 +8,11 @@ The format is based on `Keep a Changelog <http://keepachangelog.com>`_
 and this project adheres to `Sematic Versioning <http://semver.org>`_.
 
 
+-----------
+[1.2] - XXX
+-----------
+
+
 ------------------
 [1.1] - 2017-05-15
 ------------------
@@ -41,6 +46,20 @@ Changed
 * Upgrade of Ansible to 2.3.0.0
 
 
+
+--------------------
+[1.0.1] - 2017-05-15
+--------------------
+
+Changed
+*******
+
+* Fixes for `cidner_integration` playbook
+* Correct task canceling
+* Support for NIC aliases on playbook generation
+* More liberal verification of IDs on server discovery
+
+
 ------------------
 [1.0] - 2017-03-14
 ------------------

diff --git a/backend/admin/setup.py b/backend/admin/setup.py
@@ -20,10 +20,10 @@
 
 
 REQUIREMENTS = (
-    "decapod-api~=1.1",
-    "decapod-common~=1.1",
-    "decapod-controller~=1.1",
-    "decapodlib~=1.1",
+    "decapod-api~=1.2.dev1",
+    "decapod-common~=1.2.dev1",
+    "decapod-controller~=1.2.dev1",
+    "decapodlib~=1.2.dev1",
     "python-keystoneclient>=3.9,<4",
     "click>=6,<7",
     "cryptography>=1.4,<2",
@@ -35,7 +35,7 @@
     name="decapod-admin",
     description="Admin scripts for Decapod",
     long_description="",  # TODO
-    version="1.1.0",
+    version="1.2.0.dev1",
     author="Sergey Arkhipov",
     author_email="sarkhipov@mirantis.com",
     maintainer="Sergey Arkhipov",

diff --git a/backend/admin/stdeb.cfg b/backend/admin/stdeb.cfg
@@ -1,3 +1,3 @@
 [DEFAULT]
 X-Python3-Version: >= 3.4
-Depends3: python3-decapod-common (>= 1.1), python3-decapod-common (<< 1.2)
+Depends3: python3-decapod-common (>= 1.2), python3-decapod-common (<< 1.3)
diff --git a/backend/ansible/setup.py b/backend/ansible/setup.py
@@ -30,7 +30,7 @@
     name="decapod-ansible",
     description="Decapod Ansible files",
     long_description="",  # TODO
-    version="1.1.0",
+    version="1.2.0.dev1",
     author="Sergey Arkhipov",
     author_email="sarkhipov@mirantis.com",
     maintainer="Sergey Arkhipov",

diff --git a/backend/api/setup.py b/backend/api/setup.py
@@ -20,7 +20,7 @@
 
 
 REQUIREMENTS = (
-    "decapod-common~=1.1",
+    "decapod-common~=1.2.dev1",
     "Flask>=0.12,<0.13",
     "jsonschema>=2.6,<2.7"
 )
@@ -30,7 +30,7 @@
     name="decapod-api",
     description="Decapod API service",
     long_description="",  # TODO
-    version="1.1.0",
+    version="1.2.0.dev1",
     author="Sergey Arkhipov",
     author_email="sarkhipov@mirantis.com",
     maintainer="Sergey Arkhipov",

diff --git a/backend/api/stdeb.cfg b/backend/api/stdeb.cfg
@@ -1,3 +1,3 @@
 [DEFAULT]
 X-Python3-Version: >= 3.4
-Depends3: python3-decapod-common (>= 1.1), python3-decapod-common (<< 1.2)
+Depends3: python3-decapod-common (>= 1.2), python3-decapod-common (<< 1.3)
diff --git a/backend/common/setup.py b/backend/common/setup.py
@@ -31,7 +31,7 @@
     name="decapod-common",
     description="Decapod common package",
     long_description="",  # TODO
-    version="1.1.0",
+    version="1.2.0.dev1",
     author="Sergey Arkhipov",
     author_email="sarkhipov@mirantis.com",
     maintainer="Sergey Arkhipov",

diff --git a/backend/controller/setup.py b/backend/controller/setup.py
@@ -20,7 +20,7 @@
 
 
 REQUIREMENTS = (
-    "decapod-common~=1.1",
+    "decapod-common~=1.2.dev1",
     "python-daemon>=2.1,<2.2",
     "lockfile>=0.12,<0.13"
 )
@@ -30,7 +30,7 @@
     name="decapod-controller",
     description="Ceph Lifecycle Management controller service",
     long_description="",  # TODO
-    version="1.1.0",
+    version="1.2.0.dev1",
     author="Sergey Arkhipov",
     author_email="sarkhipov@mirantis.com",
     maintainer="Sergey Arkhipov",

diff --git a/backend/controller/stdeb.cfg b/backend/controller/stdeb.cfg
@@ -1,3 +1,3 @@
 [DEFAULT]
 X-Python3-Version: >= 3.4
-Depends3: python3-decapod-common (>= 1.1), python3-decapod-common (<< 1.2)
+Depends3: python3-decapod-common (>= 1.2), python3-decapod-common (<< 1.3)
diff --git a/backend/docker/setup.py b/backend/docker/setup.py
@@ -20,7 +20,7 @@
 
 
 REQUIREMENTS = (
-    "decapod-common~=1.1",
+    "decapod-common~=1.2.dev1",
     "uwsgi-tools>=1.0.3,<1.1"
 )
 
@@ -29,7 +29,7 @@
     name="decapod-docker",
     description="Decapod docker scripts",
     long_description="",  # TODO
-    version="1.1.0",
+    version="1.2.0.dev1",
     author="Sergey Arkhipov",
     author_email="sarkhipov@mirantis.com",
     maintainer="Sergey Arkhipov",

diff --git a/backend/monitoring/setup.py b/backend/monitoring/setup.py
@@ -20,7 +20,7 @@
 
 
 REQUIREMENTS = (
-    "decapod-ansible~=1.1",
+    "decapod-ansible~=1.2.dev1",
     "PyMongo[tls]>=3.4,<3.5",
     "PyYAML>=3.10,<4",
     "ipaddr>=2.1,<2.2"
@@ -31,7 +31,7 @@
     name="decapod-monitoring",
     description="Custom monitoring plugin for Decapod",
     long_description="",  # TODO
-    version="1.1.0",
+    version="1.2.0.dev1",
     author="Sergey Arkhipov",
     author_email="sarkhipov@mirantis.com",
     maintainer="Sergey Arkhipov",

diff --git a/backend/monitoring/stdeb.cfg b/backend/monitoring/stdeb.cfg
@@ -1,3 +1,3 @@
 [DEFAULT]
 XS-Python-Version: >= 2.7
-Depends: python-decapod-ansible (>= 1.1), python-decapod-ansible (<< 1.2)
+Depends: python-decapod-ansible (>= 1.2), python-decapod-ansible (<< 1.3)
diff --git a/containerization/backend-admin.dockerfile b/containerization/backend-admin.dockerfile
@@ -19,7 +19,7 @@ FROM decapod/base
 MAINTAINER Mirantis Inc.
 
 
-LABEL version="1.1.0" description="Admin utilities for Decapod" vendor="Mirantis"
+LABEL version="1.2.0" description="Admin utilities for Decapod" vendor="Mirantis"
 ARG pip_index_url=
 ARG npm_registry_url=
 ENV DECAPOD_URL=http://frontend:80 DECAPOD_LOGIN=root DECAPOD_PASSWORD=root EDITOR=vim

diff --git a/containerization/backend-api.dockerfile b/containerization/backend-api.dockerfile
@@ -19,7 +19,7 @@ FROM decapod/base
 MAINTAINER Mirantis Inc.
 
 
-LABEL version="1.1.0" description="API service for Decapod" vendor="Mirantis"
+LABEL version="1.2.0" description="API service for Decapod" vendor="Mirantis"
 ARG pip_index_url=
 ARG npm_registry_url=
 

diff --git a/containerization/backend-base.dockerfile b/containerization/backend-base.dockerfile
@@ -19,7 +19,7 @@ FROM docker-prod-virtual.docker.mirantis.net/ubuntu:xenial
 MAINTAINER Mirantis Inc.
 
 
-LABEL version="1.1.0" description="Base image of Decapod" vendor="Mirantis"
+LABEL version="1.2.0" description="Base image of Decapod" vendor="Mirantis"
 ARG pip_index_url=
 ARG npm_registry_url=
 

diff --git a/containerization/backend-controller.dockerfile b/containerization/backend-controller.dockerfile
@@ -19,7 +19,7 @@ FROM decapod/base
 MAINTAINER Mirantis Inc.
 
 
-LABEL version="1.1.0" description="Controller service for Decapod" vendor="Mirantis"
+LABEL version="1.2.0" description="Controller service for Decapod" vendor="Mirantis"
 ARG pip_index_url=
 ARG npm_registry_url=
 

diff --git a/containerization/db-data.dockerfile b/containerization/db-data.dockerfile
@@ -19,6 +19,6 @@ FROM docker-prod-virtual.docker.mirantis.net/tianon/true
 MAINTAINER Mirantis Inc.
 
 
-LABEL version="1.1.0" description="Base image with database data for Decapod" vendor="Mirantis"
+LABEL version="1.2.0" description="Base image with database data for Decapod" vendor="Mirantis"
 ARG pip_index_url=
 ARG npm_registry_url=
diff --git a/containerization/db.dockerfile b/containerization/db.dockerfile
@@ -19,7 +19,7 @@ FROM docker-prod-virtual.docker.mirantis.net/mongo:3.4
 MAINTAINER Mirantis Inc.
 
 
-LABEL version="1.1.0" description="Base image with database for Decapod" vendor="Mirantis"
+LABEL version="1.2.0" description="Base image with database for Decapod" vendor="Mirantis"
 ARG pip_index_url=
 ARG npm_registry_url=
 

diff --git a/containerization/frontend.dockerfile b/containerization/frontend.dockerfile
@@ -19,7 +19,7 @@ FROM docker-prod-virtual.docker.mirantis.net/nginx:stable
 MAINTAINER Mirantis Inc.
 
 
-LABEL version="1.1.0" description="Base image with frontend for Decapod" vendor="Mirantis"
+LABEL version="1.2.0" description="Base image with frontend for Decapod" vendor="Mirantis"
 ARG pip_index_url=
 ARG npm_registry_url=
 

diff --git a/containerization/ui-tests.dockerfile b/containerization/ui-tests.dockerfile
@@ -19,7 +19,7 @@ FROM docker-prod-virtual.docker.mirantis.net/ubuntu:xenial
 MAINTAINER Mirantis Inc.
 
 
-LABEL version="1.1.0" description="Image to run UI tests" vendor="Mirantis"
+LABEL version="1.2.0" description="Image to run UI tests" vendor="Mirantis"
 
 
 ARG pip_index_url=

diff --git a/decapodcli/setup.py b/decapodcli/setup.py
@@ -20,7 +20,7 @@
 
 
 REQUIREMENTS = (
-    "decapodlib~=1.1",
+    "decapodlib~=1.2.dev1",
     "click>=6,<7",
     "six>=1.10",
     "backports.csv"
@@ -31,7 +31,7 @@
     name="decapod-cli",
     description="Decapod CLI",
     long_description="",  # TODO
-    version="1.1.0",
+    version="1.2.0.dev1",
     author="Sergey Arkhipov",
     author_email="sarkhipov@mirantis.com",
     maintainer="Sergey Arkhipov",

diff --git a/decapodcli/stdeb.cfg b/decapodcli/stdeb.cfg
@@ -1,5 +1,5 @@
 [DEFAULT]
 XS-Python-Version: >= 2.7
 X-Python3-Version: >= 3.4
-Depends: python-backports.csv, python-decapodlib (>= 1.1), python-decapodlib (<< 1.2)
-Depends3: python3-decapodlib (>= 1.1), python3-decapodlib (<< 1.2)
+Depends: python-backports.csv, python-decapodlib (>= 1.2), python-decapodlib (<< 1.3)
+Depends3: python3-decapodlib (>= 1.2), python3-decapodlib (<< 1.3)
diff --git a/decapodlib/setup.py b/decapodlib/setup.py
@@ -30,7 +30,7 @@
     name="decapodlib",
     description="Decapod client library",
     long_description="",  # TODO
-    version="1.1.0",
+    version="1.2.0.dev1",
     author="Sergey Arkhipov",
     author_email="sarkhipov@mirantis.com",
     maintainer="Sergey Arkhipov",

diff --git a/decapodlib/stdeb.cfg b/decapodlib/stdeb.cfg
@@ -1,5 +1,5 @@
 [DEFAULT]
 XS-Python-Version: >= 2.7
 X-Python3-Version: >= 3.4
-Suggests: python-decapod-cli (>= 1.1), python-decapod-cli (<< 1.2)
-Suggests3: python3-decapod-cli (>= 1.1), python3-decapod-cli (<< 1.2)
+Suggests: python-decapod-cli (>= 1.2), python-decapod-cli (<< 1.3)
+Suggests3: python3-decapod-cli (>= 1.2), python3-decapod-cli (<< 1.3)
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "1.1"
+version = "1.2"
 # The full version, including alpha/beta/rc tags.
-release = "1.1.0"
+release = "1.2.0.dev1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/plugins/alerts/emails/setup.py b/plugins/alerts/emails/setup.py
@@ -20,15 +20,15 @@
 
 
 REQUIREMENTS = (
-    "decapod-common~=1.1",
+    "decapod-common~=1.2.dev1",
 )
 
 
 setuptools.setup(
     name="decapod-plugin-alerts-emails",
     description="Decapod email alerts plugin",
     long_description="",  # TODO
-    version="1.1.0",
+    version="1.2.0.dev1",
     author="Sergey Arkhipov",
     author_email="sarkhipov@mirantis.com",
     maintainer="Sergey Arkhipov",

diff --git a/plugins/alerts/emails/stdeb.cfg b/plugins/alerts/emails/stdeb.cfg
@@ -1,3 +1,3 @@
 [DEFAULT]
 X-Python3-Version: >= 3.4
-Depends3: python3-decapod-common (>= 1.1), python3-decapod-common (<< 1.2)
+Depends3: python3-decapod-common (>= 1.2), python3-decapod-common (<< 1.3)
diff --git a/plugins/playbook/__template__/{{cookiecutter.plugin_name}}/setup.py b/plugins/playbook/__template__/{{cookiecutter.plugin_name}}/setup.py
@@ -23,7 +23,7 @@
 setuptools.setup(
     name="{{ cookiecutter.package|replace('_', '-') }}",
     description="{{ cookiecutter.description }}",
-    version="1.1.0",
+    version="1.2.0.dev1",
     author="Sergey Arkhipov",
     author_email="sarkhipov@mirantis.com",
     url="https://github.com/Mirantis/ceph-lcm",
@@ -42,7 +42,7 @@
         ]
     },
     install_requires=[
-        "decapod-common~=1.1"
+        "decapod-common~=1.2.dev1"
     ],
     zip_safe=False
 )
diff --git a/plugins/playbook/__template__/{{cookiecutter.plugin_name}}/stdeb.cfg b/plugins/playbook/__template__/{{cookiecutter.plugin_name}}/stdeb.cfg
@@ -1,3 +1,3 @@
 [DEFAULT]
 X-Python3-Version: >= 3.4
-Depends3: python3-decapod-common (>= 1.1), python3-decapod-common (<< 1.2)
+Depends3: python3-decapod-common (>= 1.2), python3-decapod-common (<< 1.3)
diff --git a/plugins/playbook/add_client/setup.py b/plugins/playbook/add_client/setup.py
@@ -23,7 +23,7 @@
 setuptools.setup(
     name="decapod-plugin-playbook-add-client",
     description="Add RBD and CLI clients to the hosts",
-    version="1.1.0",
+    version="1.2.0.dev1",
     author="Sergey Arkhipov",
     author_email="sarkhipov@mirantis.com",
     url="https://github.com/Mirantis/ceph-lcm",
@@ -42,7 +42,7 @@
         ]
     },
     install_requires=[
-        "decapod-common~=1.1"
+        "decapod-common~=1.2.dev1"
     ],
     zip_safe=False
 )
diff --git a/plugins/playbook/add_client/stdeb.cfg b/plugins/playbook/add_client/stdeb.cfg
@@ -1,3 +1,3 @@
 [DEFAULT]
 X-Python3-Version: >= 3.4
-Depends3: python3-decapod-common (>= 1.1), python3-decapod-common (<< 1.2)
+Depends3: python3-decapod-common (>= 1.2), python3-decapod-common (<< 1.3)
diff --git a/plugins/playbook/add_mds/setup.py b/plugins/playbook/add_mds/setup.py
@@ -23,7 +23,7 @@
 setuptools.setup(
     name="decapod-plugin-playbook-add-mds",
     description="Add metadata server host",
-    version="1.1.0",
+    version="1.2.0.dev1",
     author="Sergey Arkhipov",
     author_email="sarkhipov@mirantis.com",
     url="https://github.com/Mirantis/ceph-lcm",
@@ -42,7 +42,7 @@
         ]
     },
     install_requires=[
-        "decapod-common~=1.1"
+        "decapod-common~=1.2.dev1"
     ],
     zip_safe=False
 )
diff --git a/plugins/playbook/add_mds/stdeb.cfg b/plugins/playbook/add_mds/stdeb.cfg
@@ -1,3 +1,3 @@
 [DEFAULT]
 X-Python3-Version: >= 3.4
-Depends3: python3-decapod-common (>= 1.1), python3-decapod-common (<< 1.2)
+Depends3: python3-decapod-common (>= 1.2), python3-decapod-common (<< 1.3)