From 8954bebfaf47b005bd06c2177ae1285a1a559b62 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Fri, 31 Jul 2015 19:37:44 -0400 Subject: [PATCH] Minor testing clean-up After changing from ubuntu to debian, testing was never updated to validate that the hostname was not ubuntu. Since we support simple-init, we should check for multiple default OS names and fail accordingly if they are found. Additionally, changed the default testing user to root as simple init writes the key to the root user's authorized_keys file. Change-Id: Icce62d0b9256188dbc9b49d948c99bb0c469ae6b --- playbooks/inventory/group_vars/all | 6 +++--- playbooks/roles/bifrost-test-vm/README.md | 2 +- playbooks/roles/bifrost-test-vm/tasks/main.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/playbooks/inventory/group_vars/all b/playbooks/inventory/group_vars/all index f6974d37b..5022e1f57 100644 --- a/playbooks/inventory/group_vars/all +++ b/playbooks/inventory/group_vars/all @@ -9,10 +9,10 @@ mysql_password: # virtual machines for the hardware instead of real hardware. # testing: true # -# Normally this user should be ubuntu, however if cirros is used, +# Normally this user should be root, however if cirros is used, # a user may wish to define a specific user for testing VM -# connectivity during atest sequence -testing_user: ubuntu +# connectivity during a test sequence +testing_user: root http_boot_folder: /httpboot nginx_port: 8080 ssh_public_key_path: "{{ ansible_env.HOME }}/.ssh/id_rsa.pub" diff --git a/playbooks/roles/bifrost-test-vm/README.md b/playbooks/roles/bifrost-test-vm/README.md index 97a80ae55..b21da25e3 100644 --- a/playbooks/roles/bifrost-test-vm/README.md +++ b/playbooks/roles/bifrost-test-vm/README.md @@ -25,7 +25,7 @@ hosts: testvm name: "Tests connectivity to the VM" sudo: no gather_facts: yes - remote_user: ubuntu + remote_user: root roles: - role: bifrost-test-vm diff --git a/playbooks/roles/bifrost-test-vm/tasks/main.yml b/playbooks/roles/bifrost-test-vm/tasks/main.yml index 58cb528a5..e7522af56 100644 --- a/playbooks/roles/bifrost-test-vm/tasks/main.yml +++ b/playbooks/roles/bifrost-test-vm/tasks/main.yml @@ -17,7 +17,7 @@ # hostname. This is because cirros lacks sftp support. raw: hostname register: instance_hostname -- name: 'Error if hostname is set to "ubuntu"' +- name: 'Error if hostname is set to "ubuntu", "cirros", "debian", or "centos"' # TODO: Presently this step is unable to cycle through each host and verify # it's hostname is properly set. Perhaps if there was some way to extract # the data on each host from Ironic's DB and then verify that information @@ -28,4 +28,4 @@ # NOTE(TheJulia): If we go down the path of additional validation, we need # to keep things like Cirros in mind. fail: msg='If this fails, the configdrive may not have been used as the hostname was set to the default.' - when: '"ubuntu" in instance_hostname.stdout or "cirros" in instance_hostname.stdout' + when: '"ubuntu" in instance_hostname.stdout or "cirros" in instance_hostname.stdout or "debian" in instance_hostname.stdout or "centos" in instance_hostname.stdout'