From 68464bb6c351e4b86a1293dbb6c265826b5ea276 Mon Sep 17 00:00:00 2001
From: Andy McCrae <andy.mccrae@gmail.com>
Date: Fri, 23 Sep 2016 10:35:20 +0100
Subject: [PATCH] Add Ironic vars and play to central test repo

Ironic requires some new glance vars, as well as the ironic vars.

This ensures facts are set for the ironic host, as well as adding the
test-install-ironic.yml play so it can benefit from the common tasks
more easily.

Change-Id: Ib5dee3ee50a4a1a443ebf7b744001d6f5bd40d1e
---
 setting-nodepool-variables.yml |  2 +-
 test-install-ironic.yml        | 31 +++++++++++++++++++++++++++++++
 test-vars.yml                  | 34 ++++++++++++++++++++++++++++++++--
 3 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 test-install-ironic.yml

diff --git a/setting-nodepool-variables.yml b/setting-nodepool-variables.yml
index 199db54f..58fc1d0a 100644
--- a/setting-nodepool-variables.yml
+++ b/setting-nodepool-variables.yml
@@ -15,6 +15,6 @@
 
 - name: Setting nodepool variables
   hosts: all
-  gather_facts: false
+  gather_facts: true
   tasks:
     - include: "common-tasks/test-set-nodepool-vars.yml"
diff --git a/test-install-ironic.yml b/test-install-ironic.yml
new file mode 100644
index 00000000..a0831c6e
--- /dev/null
+++ b/test-install-ironic.yml
@@ -0,0 +1,31 @@
+---
+# Copyright 2015, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Playbook for installing Ironic
+  hosts: ironic_all
+  remote_user: root
+  gather_facts: true
+  pre_tasks:
+    - include: ensure-rabbitmq.yml
+      vhost_name: "{{ ironic_rabbitmq_vhost }}"
+      user_name: "{{ ironic_rabbitmq_userid }}"
+      user_password: "{{ ironic_rabbitmq_password }}"
+    - include: create-grant-db.yml
+      db_name: "{{ ironic_galera_database }}"
+      db_password: "{{ ironic_container_mysql_password }}"
+  roles:
+    - role: "{{ ironic_rolename | default('os_ironic') }}"
+  vars_files:
+    - test-vars.yml
diff --git a/test-vars.yml b/test-vars.yml
index 853aa64c..ec9fb82f 100644
--- a/test-vars.yml
+++ b/test-vars.yml
@@ -89,6 +89,8 @@ glance_service_internaluri: "http://{{ hostvars[groups['glance_all'][0]]['ansibl
 glance_service_internalurl: "{{ glance_service_internaluri }}"
 glance_service_adminuri: "http://{{ hostvars[groups['glance_all'][0]]['ansible_host'] }}:9292"
 glance_service_adminurl: "{{ glance_service_adminuri }}"
+glance_service_port: 9292
+glance_service_user_name: glance
 glance_container_mysql_password: "SuperSecrete"
 glance_developer_mode: true
 glance_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
@@ -105,7 +107,7 @@ glance_requirements_git_install_branch: master
 glance_service_password: "secrete"
 glance_venv_tag: "testing"
 glance_host: "{{ hostvars[groups['glance_all'][0]]['ansible_host'] }}"
-glance_service_port: 9292
+glance_api_servers: "{{ hostvars[groups['glance_all'][0]]['ansible_host'] }}"
 
 # Nova specific settings
 nova_api_container_mysql_password: "SuperSecrete"
@@ -207,6 +209,7 @@ swift:
   storage_network: "{{ test_swift_storage_network | default('eth2') }}"
   replication_network: "{{ test_swift_repl_network | default('eth3') }}"
   part_power: 8
+  repl_number: "{{ test_swift_repl_number | default(3) }}"
   region: "{{ test_swift_region | default(1) }}"
   drives:
     - name: swift1
@@ -216,13 +219,40 @@ swift:
     - policy:
         name: gold
         index: 0
-        repl_number: 3
         default: True
 swift_proxy_server_conf_overrides:
   "filter:keystoneauth":
     reseller_prefix: "AUTH, SERVICE"
     "SERVICE_service_roles": "test5"
 
+# Ironic specific settings
+ironic_venv_tag: "testing"
+ironic_developer_mode: True
+ironic_git_install_branch: master
+ironic_requirements_git_install_branch: master
+ironic_service_publicuri: "http://{{ hostvars[groups['ironic_api'][0]]['ansible_host'] }}:6385"
+ironic_service_publicurl: "{{ ironic_service_publicuri }}"
+ironic_service_adminuri: "http://{{ hostvars[groups['ironic_api'][0]]['ansible_host'] }}:6385"
+ironic_service_adminurl: "{{ ironic_service_adminuri }}"
+ironic_service_internaluri: "http://{{ hostvars[groups['ironic_api'][0]]['ansible_host'] }}:6385"
+ironic_service_internalurl: "{{ ironic_service_internaluri }}"
+ironic_service_password: "secrete"
+ironic_service_name: ironic
+ironic_service_project_name: "service"
+ironic_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
+ironic_galera_database: ironic
+ironic_galera_user: ironic
+ironic_container_mysql_password: "secrete"
+ironic_rabbitmq_password: "{{ rabbitmq_password }}"
+ironic_rabbitmq_userid: ironic
+ironic_rabbitmq_vhost: /ironic
+ironic_rabbitmq_servers: "{{ rabbitmq_servers }}"
+ironic_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
+ironic_rabbitmq_port: "{{ rabbitmq_port }}"
+ironic_standalone: False
+ironic_swift_temp_url_secret_key: secrete
+ironic_keystone_auth_plugin: password
+
 # Tempest specific settings
 tempest_developer_mode: True
 tempest_git_install_branch: master