Adjust SSH key creation method for Nova compute

This patch ensures that the authorized_keys ansible module, as well as
the built in "generate_ssh_keys" flag for user creation, so that we can
avoid using shell out commands.

Additionally, this moves the key synchronisation to use ansible
variables instead of the memcache server.

Change-Id: Icd97ebd44f6065fc60fdce1b61e9dc2daa45faa0
Closes-Bug: #1477512

playbooks/roles/os_nova/defaults/main.yml

@@ -229,6 +229,10 @@ nova_scheduler_manager: nova.scheduler.manager.SchedulerManager
 nova_scheduler_weight_classes: nova.scheduler.weights.all_weighers
 nova_scheduler_program_name: nova-scheduler
 
+# If you want to regenerate the nova users SSH keys, on each run, set this var to True
+# Otherwise keys will be generated on the first run and not regenerated each run.
+nova_recreate_keys: False
+
 ## General Neutron configuration
 # If ``nova_osapi_compute_workers`` is unset the system will use half the number of available VCPUS to
 # compute the number of api workers to use.

playbooks/roles/os_nova/tasks/nova_compute.yml

@@ -16,13 +16,6 @@
 - include: nova_compute_kvm.yml
   when: nova_virt_type == 'kvm' or nova_virt_type == 'qemu'
 
-- include: nova_compute_key_create.yml
+- include: nova_compute_key_populate.yml
-
-- include: nova_compute_key_store.yml
-  when: >
-    inventory_hostname == groups['nova_compute'][0]
 
 - include: nova_compute_key_distribute.yml
-  when: >
-    inventory_hostname != groups['nova_compute'][0] and
-    inventory_hostname in groups['nova_compute']

playbooks/roles/os_nova/tasks/nova_compute_key_create.yml

@@ -1,85 +0,0 @@
----
-# Copyright 2014, 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: Remove old key file(s) if found
-  file:
-    path: "{{ item }}"
-    state: "absent"
-  with_items:
-    - "{{ nova_system_home_folder }}/.ssh/authorized_keys"
-    - "{{ nova_system_home_folder }}/.ssh/id_rsa"
-    - "{{ nova_system_home_folder }}/.ssh/id_rsa.pub"
-  tags:
-    - nova-key
-    - nova-key-create
-
-- name: Create the nova SSH config file
-  copy:
-    src: "ssh_config"
-    dest: "/var/lib/nova/.ssh/config"
-    owner: "{{ nova_system_user_name }}"
-    group: "{{ nova_system_user_name }}"
-    mode: "0644"
-  tags:
-    - nova-key
-    - nova-key-create
-
-- name: Create the nova SSH key if it doesnt exist
-  command: |
-    ssh-keygen -f {{ nova_system_home_folder }}/.ssh/id_rsa -t rsa -q -N ""
-  sudo: yes
-  sudo_user: "{{ nova_system_user_name }}"
-  tags:
-    - nova-key
-    - nova-key-create
-
-- name: Create empty 'authorized_keys' file
-  file:
-    path: "{{ nova_system_home_folder }}/.ssh/authorized_keys"
-    state: "touch"
-  tags:
-    - nova-key
-    - nova-key-create
-
-- name: Change permissions on the generated keys
-  file:
-    path: "{{ item.path }}"
-    group: "{{ nova_system_user_name }}"
-    owner: "{{ nova_system_user_name }}"
-    mode: "{{ item.mode }}"
-  with_items:
-    - { path: "{{ nova_system_home_folder }}/.ssh/authorized_keys", mode: "0700" }
-    - { path: "{{ nova_system_home_folder }}/.ssh/id_rsa", mode: "0600" }
-    - { path: "{{ nova_system_home_folder }}/.ssh/id_rsa.pub", mode: "0644" }
-  tags:
-    - nova-key
-    - nova-key-create
-
-- name: Get public key contents
-  command: |
-    cat {{ nova_system_home_folder }}/.ssh/id_rsa.pub
-  register: nova_pub
-  changed_when: false
-  tags:
-    - nova-key
-    - nova-key-create
-
-- name: Build authorized keys
-  shell: |
-    echo "{{ nova_pub.stdout }}" | tee -a {{ nova_system_home_folder }}/.ssh/authorized_keys
-  delegate_to: "{{ groups['nova_compute'][0] }}"
-  tags:
-    - nova-key
-    - nova-key-create

playbooks/roles/os_nova/tasks/nova_compute_key_distribute.yml

@@ -13,21 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Retrieve authorized keys
+- name: Create authorized keys file from host vars
-  memcached:
+  authorized_key:
-    name: "{{ item.name }}"
+    user: "{{ nova_system_user_name }}"
-    file_path: "{{ item.src }}"
+    key: "{{ hostvars[item]['nova_pubkey'] }}"
-    state: "retrieve"
+  with_items: groups['nova_compute']
-    file_mode: "{{ item.file_mode }}"
-    dir_mode: "{{ item.dir_mode }}"
-    server: "{{ memcached_servers.split(',')[0] }}"
-    encrypt_string: "{{ memcached_encryption_key }}"
-  with_items:
-    - { src: "{{ nova_system_home_folder }}/.ssh/authorized_keys", name: "authorized_keys", file_mode: "0640", dir_mode: "0750" }
-  register: memcache_keys
-  until: memcache_keys|success
-  retries: 5
-  delay: 2
   tags:
     - nova-key
     - nova-key-distribute

playbooks/roles/os_nova/tasks/nova_compute_key_populate.yml

@@ -13,19 +13,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- name: Distribute authorized keys for cluster consumption
+- name: Create the nova SSH config file
-  memcached:
+  copy:
-    name: "{{ item.name }}"
+    src: "ssh_config"
-    file_path: "{{ item.src }}"
+    dest: "/var/lib/nova/.ssh/config"
-    state: "present"
+    owner: "{{ nova_system_user_name }}"
-    server: "{{ memcached_servers.split(',')[0] }}"
+    group: "{{ nova_system_user_name }}"
-    encrypt_string: "{{ memcached_encryption_key }}"
+    mode: "0644"
-  with_items:
-    - { src: "{{ nova_system_home_folder }}/.ssh/authorized_keys", name: "authorized_keys" }
-  register: memcache_keys
-  until: memcache_keys|success
-  retries: 5
-  delay: 2
   tags:
     - nova-key
-    - nova-key-store
+    - nova-key-create
+
+- name: Get public key contents and store as var
+  command: |
+    cat {{ nova_system_home_folder }}/.ssh/id_rsa.pub
+  register: nova_pub
+  changed_when: false
+  tags:
+    - nova-key
+    - nova-key-create
+
+- name: Register a fact for the nova pub key
+  set_fact:
+     nova_pubkey: "{{ nova_pub.stdout }}"
+  tags:
+    - nova-key
+    - nova-key-create

playbooks/roles/os_nova/tasks/nova_pre_install.yml

@@ -21,6 +21,19 @@
   tags:
     - nova-group
 
+- name: Remove old key file(s) if found
+  file:
+    path: "{{ item }}"
+    state: "absent"
+  with_items:
+    - "{{ nova_system_home_folder }}/.ssh/authorized_keys"
+    - "{{ nova_system_home_folder }}/.ssh/id_rsa"
+    - "{{ nova_system_home_folder }}/.ssh/id_rsa.pub"
+  when: nova_recreate_keys | bool
+  tags:
+    - nova-key
+    - nova-key-create
+
 - name: Create the nova system user
   user:
     name: "{{ nova_system_user_name }}"
@@ -30,8 +43,11 @@
     system: "yes"
     createhome: "yes"
     home: "{{ nova_system_home_folder }}"
+    generate_ssh_key: "yes"
   tags:
     - nova-user
+    - nova-key
+    - nova-key-create
 
 - name: Create nova dir
   file: