From 9e62a3991369f35877cb0af4028a93ec4167ea9b Mon Sep 17 00:00:00 2001
From: Jens Harbott <j.harbott@x-ion.de>
Date: Mon, 11 Mar 2019 18:22:01 +0000
Subject: [PATCH] Updates for Rocky deployment

OpenStack Rocky is only supported on Ubuntu Bionic, so we no longer can
run any sensible tests on Xenial.

- Update default mariadb version to 10.1

Depends-On: https://review.openstack.org/645119
Depends-On: https://review.openstack.org/645162
Change-Id: Ifcf73e49a77e497b19700566a3a13ebfc9ca9741
---
 .kitchen.yml                               |  4 ++--
 .zuul.yaml                                 | 15 +++------------
 README.md                                  |  2 +-
 doc/source/install/supported-platforms.rst |  2 +-
 environments/integration.json              |  7 ++++++-
 playbooks/pre.yaml                         |  2 +-
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index 5c0604d..6a6d581 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -30,9 +30,9 @@ verifier:
   name: inspec
 
 platforms:
-  - name: ubuntu-xenial
+  - name: ubuntu-bionic
     driver:
-      box: bento/ubuntu-16.04
+      box: bento/ubuntu-18.04
   - name: centos-7
     driver:
       box: bento/centos-7
diff --git a/.zuul.yaml b/.zuul.yaml
index bf33fbf..b5a1c0f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,9 +8,8 @@
     timeout: 2700
 
 - job:
-    name: openstack-chef-integration-bionic
+    name: openstack-chef-integration
     parent: base
-    nodeset: ubuntu-bionic
     description: Run integration tests with openstack-chef on Ubuntu Bionic
     required-projects: openstack/openstack-chef
     pre-run: playbooks/pre.yaml
@@ -18,24 +17,16 @@
     post-run: playbooks/post.yaml
     timeout: 3600
 
-- job:
-    name: openstack-chef-integration-xenial
-    parent: openstack-chef-integration-bionic
-    nodeset: ubuntu-xenial
-    description: Run integration tests with openstack-chef on Ubuntu Xenial
-
 - project-template:
     name: openstack-chef-jobs
     check:
       jobs:
         - openstack-chef-delivery
-        - openstack-chef-integration-bionic:
-            voting: false
-        - openstack-chef-integration-xenial:
-            voting: false
+        - openstack-chef-integration
     gate:
       jobs:
         - openstack-chef-delivery
+        - openstack-chef-integration
 
 - project:
     templates:
diff --git a/README.md b/README.md
index 483656c..550bad3 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ This framework also gives us an opportunity to show different Reference
 Architectures and a sane example on how to start with OpenStack using Chef.
 
 With the `master` branch of the cookbooks, which is currently tied to the base
-OpenStack Ocata release, this supports deploying to Ubuntu 16.04 and CentOS 7
+OpenStack Rocky release, this supports deploying to Ubuntu 18.04 and CentOS 7
 in monolithic, or allinone, and non-HA multinode configurations with Neutron.
 The cookbooks support a fully HA configuration, but we do not test for that as
 there are far numerous paths to HA.
diff --git a/doc/source/install/supported-platforms.rst b/doc/source/install/supported-platforms.rst
index 15a9f42..29e324a 100644
--- a/doc/source/install/supported-platforms.rst
+++ b/doc/source/install/supported-platforms.rst
@@ -4,7 +4,7 @@ Supported Platforms
 The following operating systems and versions are supported by the OpenStack cookbooks:
 
 * RHEL / CentOS 7
-* Ubuntu 16.04 LTS (Xenial Xerus)
+* Ubuntu 18.04 LTS (Bionic Beaver)
 
 The cookbooks are tested and verified to work on the Chef stable track using
 the `Chef Development Kit <https://docs.chef.io/about_chefdk.html>`_.
diff --git a/environments/integration.json b/environments/integration.json
index 56f83e7..c4eaa44 100644
--- a/environments/integration.json
+++ b/environments/integration.json
@@ -7,6 +7,11 @@
 
       ]
     },
+    "mariadb": {
+      "install": {
+        "version": "10.1"
+      }
+    },
     "yum": {
       "epel": {
         "enabled": false
@@ -64,4 +69,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/playbooks/pre.yaml b/playbooks/pre.yaml
index f3cbab9..a75e53e 100644
--- a/playbooks/pre.yaml
+++ b/playbooks/pre.yaml
@@ -12,7 +12,7 @@
   - name: Fetch chefdk package
     get_url:
       dest: /tmp/{{ chefdk }}
-      url: https://packages.chef.io/files/stable/chefdk/{{ release }}/ubuntu/16.04/{{ chefdk }}
+      url: https://packages.chef.io/files/stable/chefdk/{{ release }}/ubuntu/18.04/{{ chefdk }}
   - name: Install chefdk package
     shell: dpkg -i /tmp/{{ chefdk }}
     become: yes