From 43d7b1b2d8832c32e1ea864541087ffadce07a43 Mon Sep 17 00:00:00 2001
From: "Mark T. Voelker" <mvoelker@cisco.com>
Date: Fri, 18 Jul 2014 11:24:41 -0400
Subject: [PATCH 1/4] Fix iscsi_ip_address to work automatically for AIO

In https://review.openstack.org/#/c/101589/ a change was made
to allow compute nodes to connect to iscsi volumes that don't
reside on the same physical host. However, the default value used
is the IP address on eth1, which causes a minor headache for many
people deploying AIO with a single NIC (usually eth0).  This patch
adds a line to the install.sh script that sets a value in user.yaml
that works for such cases.

Change-Id: I6d968ec5fb9bea56159c48e754e94e53ab0b1bb8
Closes-Bug: #1344074
---
 install-scripts/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install-scripts/install.sh b/install-scripts/install.sh
index 9b9ba2f..4c78a39 100755
--- a/install-scripts/install.sh
+++ b/install-scripts/install.sh
@@ -101,6 +101,7 @@ controller_internal_address: "${build_server_ip}"
 cobbler_node_ip: "${build_server_ip}"
 controller_public_address: "${build_server_ip}"
 controller_admin_address: "${build_server_ip}"
+cinder::volume::iscsi::iscsi_ip_address: "${build_server_ip}"
 controller_public_url: "${default_protocol}://${build_server_ip}:5000"
 neutron::server::notifications::nova_admin_auth_url: "${default_protocol}://${build_server_ip}:5000/v2.0"
 neutron::server::notifications::nova_url: "${default_protocol}://${build_server_ip}:8774/v2"

From bdcbc81f5e9344dab7b337ddaf458f4b9b8870e2 Mon Sep 17 00:00:00 2001
From: Chris Ricker <chricker@cisco.com>
Date: Thu, 7 Aug 2014 10:34:46 -0400
Subject: [PATCH 2/4] Add notifications class to provider class group

Add neutron::server::notifications class to provider network class group
so that Nova <-> Neutron notifications get configured.

Change-Id: I5e39a84ca04558e8650199ad88938a51700c869e
Partial-Bug: #1353671
---
 data/class_groups/provider_network_controller.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/class_groups/provider_network_controller.yaml b/data/class_groups/provider_network_controller.yaml
index 5ffc6c5..c004c6c 100644
--- a/data/class_groups/provider_network_controller.yaml
+++ b/data/class_groups/provider_network_controller.yaml
@@ -2,3 +2,4 @@ classes:
   - "%{network_service}"
   - "%{network_service}::agents::dhcp"
   - "%{network_service}::agents::%{network_plugin}"
+  - "%{network_service}::server::notifications"

From 88aaf8e570c672b035d822e0b100759cd30819a6 Mon Sep 17 00:00:00 2001
From: "Mark T. Voelker" <mvoelker@cisco.com>
Date: Wed, 13 Aug 2014 23:17:40 -0400
Subject: [PATCH 3/4] Add nova::scheduler::filter to nova_controller

The current nova_controller classgroup doesn't include
the nova::scheduler::filter class, which leaves end
users without the ability to modify scheduler filters.
This patch adds it.

Change-Id: I689919048a22eac1fdcae918dde1509fbed5863f
Closes-Bug: #1354458
(cherry picked from commit b2fd7baafad5c0fe7d136066b87446753916d31e)
---
 data/class_groups/nova_controller.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/class_groups/nova_controller.yaml b/data/class_groups/nova_controller.yaml
index fd3a757..d5a43bb 100644
--- a/data/class_groups/nova_controller.yaml
+++ b/data/class_groups/nova_controller.yaml
@@ -9,3 +9,4 @@ classes:
   - nova::conductor
   - "nova::network::%{network_service}"
   - nova::vncproxy
+  - nova::scheduler::filter

From 6953d04f3d2588d18edf5bbeee96d58f426ebe42 Mon Sep 17 00:00:00 2001
From: "Mark T. Voelker" <mvoelker@cisco.com>
Date: Mon, 18 Aug 2014 22:31:42 -0400
Subject: [PATCH 4/4] Add neutron::config to network control classgroups

Most class groups now include the <service>::config class.
These generic classes make it possible to add arbitrary
configuration for items that don'thave full class params
either because such haven't been added yet or because they're
seldom used.  However we don't currently include the neutron::config
class in the classgroups related to network controllers.  This
patch corrects the oversight.

Change-Id: I82fef066cf7052220fcfc5f3f2a6f1fb8f47bfb3
Closes-Bug: #1358533
---
 data/class_groups/network_controller.yaml          | 1 +
 data/class_groups/provider_network_controller.yaml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/data/class_groups/network_controller.yaml b/data/class_groups/network_controller.yaml
index 807affa..413fbc4 100644
--- a/data/class_groups/network_controller.yaml
+++ b/data/class_groups/network_controller.yaml
@@ -11,3 +11,4 @@ classes:
   - "%{network_service}::agents::%{network_plugin}"
   - "%{network_service}::services::fwaas"
   - "%{network_service}::plugins::%{network_plugin}"
+  - "%{network_service}::config"
diff --git a/data/class_groups/provider_network_controller.yaml b/data/class_groups/provider_network_controller.yaml
index c004c6c..1a9a643 100644
--- a/data/class_groups/provider_network_controller.yaml
+++ b/data/class_groups/provider_network_controller.yaml
@@ -3,3 +3,4 @@ classes:
   - "%{network_service}::agents::dhcp"
   - "%{network_service}::agents::%{network_plugin}"
   - "%{network_service}::server::notifications"
+  - "%{network_service}::config"