From 8fa54db5cf53c50c61c1096bc1badd5b5838b269 Mon Sep 17 00:00:00 2001
From: Samuel Cassiba <samuel@cassi.ba>
Date: Mon, 27 Aug 2018 16:48:47 -0700
Subject: [PATCH] Add ironic to integration

Depends-On: https://review.openstack.org/599690
Change-Id: Idb9a075381615e5ed99090764e1afd7f5eab09d9
---
 .kitchen.yml                                          | 11 +++++++++--
 Berksfile                                             |  1 +
 data_bags/db_passwords/ironic.json                    | 10 ++++++++++
 data_bags/service_passwords/openstack-bare-metal.json | 10 ++++++++++
 doc/source/contributor/cookbook-list.rst              |  2 +-
 roles/minimal.json                                    |  5 ++++-
 6 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 data_bags/db_passwords/ironic.json
 create mode 100644 data_bags/service_passwords/openstack-bare-metal.json

diff --git a/.kitchen.yml b/.kitchen.yml
index be56fee..38e18ec 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -30,8 +30,12 @@ verifier:
   name: inspec
 
 platforms:
-  - name: ubuntu-16.04
-  - name: centos-7.5
+  - name: ubuntu-xenial
+    driver:
+      box: bento/ubuntu-16.04
+  - name: centos-7
+    driver:
+      box: bento/centos-7
 
 suites:
   - name: default
@@ -80,6 +84,9 @@ suites:
       - recipe[openstack-block-storage::volume]
       - recipe[openstack-block-storage::backup]
       - recipe[openstack-block-storage::identity_registration]
+      - recipe[openstack-bare-metal::api]
+      - recipe[openstack-bare-metal::conductor]
+      - recipe[openstack-bare-metal::identity_registration]
       - recipe[openstack-orchestration::engine]
       - recipe[openstack-orchestration::api]
       - recipe[openstack-orchestration::api-cfn]
diff --git a/Berksfile b/Berksfile
index 9023ab8..ef84b9b 100644
--- a/Berksfile
+++ b/Berksfile
@@ -14,6 +14,7 @@ source 'https://supermarket.chef.io'
   network
   ops-database
   ops-messaging
+  bare-metal
 ).each do |cookbook|
   if Dir.exist?("../cookbook-openstack-#{cookbook}")
     cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
diff --git a/data_bags/db_passwords/ironic.json b/data_bags/db_passwords/ironic.json
new file mode 100644
index 0000000..5843ad4
--- /dev/null
+++ b/data_bags/db_passwords/ironic.json
@@ -0,0 +1,10 @@
+{
+  "id": "ironic",
+  "ironic": {
+    "encrypted_data": "O9dpq41k90vdOtFGW60p13Mki6Hp8vu+EQ==\n",
+    "iv": "qP8LpWlAWdyH/jxe\n",
+    "auth_tag": "6yM7Z1sw4wpAGjwuvluEuA==\n",
+    "version": 3,
+    "cipher": "aes-256-gcm"
+  }
+}
\ No newline at end of file
diff --git a/data_bags/service_passwords/openstack-bare-metal.json b/data_bags/service_passwords/openstack-bare-metal.json
new file mode 100644
index 0000000..664e0d6
--- /dev/null
+++ b/data_bags/service_passwords/openstack-bare-metal.json
@@ -0,0 +1,10 @@
+{
+  "id": "openstack-bare-metal",
+  "openstac-bare-metal": {
+    "encrypted_data": "V3TjN0VM+M5h0gCFyFRQqQZc8zYFTeWaYg==\n",
+    "iv": "oDSNcsfcj6Db298Z\n",
+    "auth_tag": "NSpX3UCs//hoNttc2SCh7g==\n",
+    "version": 3,
+    "cipher": "aes-256-gcm"
+  }
+}
\ No newline at end of file
diff --git a/doc/source/contributor/cookbook-list.rst b/doc/source/contributor/cookbook-list.rst
index 1d40b70..0e6f79e 100644
--- a/doc/source/contributor/cookbook-list.rst
+++ b/doc/source/contributor/cookbook-list.rst
@@ -9,6 +9,7 @@ achieve a clearly stated objective: deploy OpenStack.
 OpenStack Cookbooks
 ===================
 
+* `Bare Metal <https://git.openstack.org/cgit/openstack/cookbook-openstack-bare-metal/>`_ (*Ironic*)
 * `Block Storage <https://git.openstack.org/cgit/openstack/cookbook-openstack-block-storage/>`_ (*Cinder*)
 * `Compute <https://git.openstack.org/cgit/openstack/cookbook-openstack-compute/>`_ (*Nova*)
 * `Dashboard <https://git.openstack.org/cgit/openstack/cookbook-openstack-dashboard/>`_ (*Horizon*)
@@ -31,7 +32,6 @@ Supporting Repositories
 Unmaintained Cookbooks
 ==============================
 * `Object Storage <https://git.openstack.org/cgit/openstack/cookbook-openstack-object-storage/>`_ (*Swift*)
-* `Bare Metal <https://git.openstack.org/cgit/openstack/cookbook-openstack-bare-metal/>`_ (*Ironic*)
 * `Data Processing <https://git.openstack.org/cgit/openstack/cookbook-openstack-data-processing/>`_ (*Sahara*)
 * `Application Catalog <https://git.openstack.org/cgit/openstack/cookbook-openstack-application-catalog/>`_ (*Murano*)
 * `Database as a Service <https://git.openstack.org/cgit/openstack/cookbook-openstack-database/>`_ (*Trove*)
diff --git a/roles/minimal.json b/roles/minimal.json
index b52a59d..366b060 100644
--- a/roles/minimal.json
+++ b/roles/minimal.json
@@ -36,9 +36,12 @@
     "recipe[openstack-compute::scheduler]",
     "recipe[openstack-compute::vncproxy]",
     "recipe[openstack-compute::compute]",
+    "recipe[openstack-bare-metal::api]",
+    "recipe[openstack-bare-metal::conductor]",
+    "recipe[openstack-bare-metal::identity_registration]",
     "recipe[openstack-image::image_upload]",
     "recipe[openstack-integration-test::create_network]",
     "recipe[openstack-integration-test::setup]",
     "recipe[openstack-integration-test::run_tempest]"
   ]
-}
\ No newline at end of file
+}