From 54af2f29edcd02e965dbbd3cbb4b149e95da8ad2 Mon Sep 17 00:00:00 2001
From: Eric Berglund <esberglu@us.ibm.com>
Date: Mon, 27 Mar 2017 10:33:48 -0500
Subject: [PATCH] Add novalink apt key and repo before installation

The novalink apt key and repo were not being added until after the
pvm-novalink apt installation. This moves those steps to a new playbook
that will run before the apt installation when using the powervm driver
type.

Change-Id: I13588aecd7e3dfe31502956846a75fafd96d1afd
Closes-Bug: #1675913
---
 tasks/nova_compute_powervm_install.yml | 25 -----------------
 tasks/nova_install_apt.yml             |  3 ++
 tasks/nova_install_apt_powervm.yml     | 39 ++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 tasks/nova_install_apt_powervm.yml

diff --git a/tasks/nova_compute_powervm_install.yml b/tasks/nova_compute_powervm_install.yml
index cfacc07a..6fec6b0e 100644
--- a/tasks/nova_compute_powervm_install.yml
+++ b/tasks/nova_compute_powervm_install.yml
@@ -13,31 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Add novalink keys
-  apt_key:
-    url: "{{ item.url }}"
-    state: "{{ item.state }}"
-  register: add_nv_keys
-  until: add_nv_keys|success
-  retries: 5
-  delay: 2
-  with_items: "{{ novalink_gpg_keys }}"
-  tags:
-    - novalink-apt-keys
-
-- name: Add novalink repo
-  apt_repository:
-    repo: "{{ novalink_repo.repo }}"
-    state: "{{ novalink_repo.state }}"
-    filename:  "{{ novalink_repo.filename | default(omit) }}"
-    update_cache: yes
-  register: add_nv_repos
-  until: add_nv_repos|success
-  retries: 5
-  delay: 2
-  tags:
-    - novalink-repo
-
 - name: Register pypowervm module path (venv)
   command: python -c 'import pypowervm; print pypowervm.__file__'
   changed_when: false
diff --git a/tasks/nova_install_apt.yml b/tasks/nova_install_apt.yml
index 3da30121..3251d8d5 100644
--- a/tasks/nova_install_apt.yml
+++ b/tasks/nova_install_apt.yml
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- include: nova_install_apt_powervm.yml
+  when: nova_virt_type == "powervm"
+
 - name: Install nova role packages (apt)
   apt:
     name: "{{ item }}"
diff --git a/tasks/nova_install_apt_powervm.yml b/tasks/nova_install_apt_powervm.yml
new file mode 100644
index 00000000..50d6f9f7
--- /dev/null
+++ b/tasks/nova_install_apt_powervm.yml
@@ -0,0 +1,39 @@
+---
+# Copyright 2017, IBM Corp.
+#
+# 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: Add novalink keys
+  apt_key:
+    url: "{{ item.url }}"
+    state: "{{ item.state }}"
+  register: add_nv_keys
+  until: add_nv_keys|success
+  retries: 5
+  delay: 2
+  with_items: "{{ novalink_gpg_keys }}"
+  tags:
+    - novalink-apt-keys
+
+- name: Add novalink repo
+  apt_repository:
+    repo: "{{ novalink_repo.repo }}"
+    state: "{{ novalink_repo.state }}"
+    filename:  "{{ novalink_repo.filename | default(omit) }}"
+    update_cache: yes
+  register: add_nv_repos
+  until: add_nv_repos|success
+  retries: 5
+  delay: 2
+  tags:
+    - novalink-repo