From 926aa62d7889fe0c56a55fc3747750b3c5397b2d Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 16 Jan 2018 16:55:19 -0800
Subject: [PATCH] Prepare for Ocata post release

Prepare the metadata configuration for a new Ocata release.
Also add missing bindep.

Change-Id: I4cf139f0740ce013895aef4c836bde7c237185df
---
 bindep.txt                  |  12 +++
 metadata.json               | 146 ++++++++++++++++++------------------
 releasenotes/source/conf.py |   4 +-
 3 files changed, 87 insertions(+), 75 deletions(-)
 create mode 100644 bindep.txt

diff --git a/bindep.txt b/bindep.txt
new file mode 100644
index 00000000..d6645f86
--- /dev/null
+++ b/bindep.txt
@@ -0,0 +1,12 @@
+# This is a cross-platform list tracking distribution packages needed by tests;
+# see https://docs.openstack.org/infra/bindep/ for additional information.
+
+libxml2-devel [test platform:rpm]
+libxml2-dev [test platform:dpkg]
+libxslt-devel [test platform:rpm]
+libxslt1-dev [test platform:dpkg]
+ruby-devel [test platform:rpm]
+ruby-dev [test platform:dpkg]
+zlib1g-dev [test platform:dpkg]
+zlib-devel [test platform:rpm]
+puppet [build]
diff --git a/metadata.json b/metadata.json
index cf8321b4..19b591c2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,75 +1,75 @@
 {
-  "name": "openstack-octavia",
-  "version": "10.3.1",
-  "author": "OpenStack Contributors",
-  "summary": "Puppet module for OpenStack Octavia",
-  "license": "Apache-2.0",
-  "source": "git://github.com/openstack/puppet-octavia.git",
-  "project_page": "https://launchpad.net/puppet-octavia",
-  "issues_url": "https://bugs.launchpad.net/puppet-octavia",
-  "description": "Installs and configures OpenStack Octavia.",
-  "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": "4.x"
-    },
-    {
-      "name": "puppet",
-      "version_requirement": "4.x"
-    }
-  ],
-  "operatingsystem_support": [
-    {
-      "operatingsystem": "Debian",
-      "operatingsystemrelease": [
-        "8"
-      ]
-    },
-    {
-      "operatingsystem": "Fedora",
-      "operatingsystemrelease": [
-        "21",
-        "22"
-      ]
-    },
-    {
-      "operatingsystem": "RedHat",
-      "operatingsystemrelease": [
-        "7"
-      ]
-    },
-    {
-      "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": [
-        "14.04",
-        "16.04"
-      ]
-    }
-  ],
-  "dependencies": [
-    {
-      "name": "puppetlabs/inifile",
-      "version_requirement": ">=1.0.0 <2.0.0"
-    },
-    {
-      "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.2.0 <5.0.0"
-    },
-    {
-      "name": "openstack/keystone",
-      "version_requirement": ">=10.3.0 <11.0.0"
-    },
-    {
-      "name": "openstack/nova",
-      "version_requirement": ">=10.3.0 <11.0.0"
-    },
-    {
-      "name": "openstack/openstacklib",
-      "version_requirement": ">=10.3.0 <11.0.0"
-    },
-    {
-      "name": "openstack/oslo",
-      "version_requirement": ">=10.3.0 <11.0.0"
-    }
-  ]
+    "name": "openstack-octavia",
+    "version": "10.4.0",
+    "author": "OpenStack Contributors",
+    "summary": "Puppet module for OpenStack Octavia",
+    "license": "Apache-2.0",
+    "source": "git://github.com/openstack/puppet-octavia.git",
+    "project_page": "https://launchpad.net/puppet-octavia",
+    "issues_url": "https://bugs.launchpad.net/puppet-octavia",
+    "description": "Installs and configures OpenStack Octavia.",
+    "requirements": [
+        {
+            "name": "pe",
+            "version_requirement": "4.x"
+        },
+        {
+            "name": "puppet",
+            "version_requirement": "4.x"
+        }
+    ],
+    "operatingsystem_support": [
+        {
+            "operatingsystem": "Debian",
+            "operatingsystemrelease": [
+                "8"
+            ]
+        },
+        {
+            "operatingsystem": "Fedora",
+            "operatingsystemrelease": [
+                "21",
+                "22"
+            ]
+        },
+        {
+            "operatingsystem": "RedHat",
+            "operatingsystemrelease": [
+                "7"
+            ]
+        },
+        {
+            "operatingsystem": "Ubuntu",
+            "operatingsystemrelease": [
+                "14.04",
+                "16.04"
+            ]
+        }
+    ],
+    "dependencies": [
+        {
+            "name": "puppetlabs/inifile",
+            "version_requirement": ">=1.0.0 <2.0.0"
+        },
+        {
+            "name": "puppetlabs/stdlib",
+            "version_requirement": ">= 4.2.0 <5.0.0"
+        },
+        {
+            "name": "openstack/keystone",
+            "version_requirement": ">=10.4.0 <11.0.0"
+        },
+        {
+            "name": "openstack/nova",
+            "version_requirement": ">=10.4.0 <11.0.0"
+        },
+        {
+            "name": "openstack/openstacklib",
+            "version_requirement": ">=10.4.0 <11.0.0"
+        },
+        {
+            "name": "openstack/oslo",
+            "version_requirement": ">=10.4.0 <11.0.0"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 561d1aac..1cbc7507 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -52,9 +52,9 @@ copyright = u'2016, Puppet OpenStack Developers'
 # built documents.
 #
 # The short X.Y version.
-version = '10.3.1'
+version = ''
 # The full version, including alpha/beta/rc tags.
-release = '10.3.1'
+release = ''
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.