Merge "Allow nova key/partition/password injection"

playbooks/roles/os_horizon/defaults/main.yml

@@ -55,6 +55,8 @@ horizon_time_zone: UTC
 horizon_enforce_password_check: False
 horizon_disable_password_reveal: False
 horizon_enable_password_retrieve: False
+# If nova_libvirt_inject_password is set to True, then this can also be enabled:
+horizon_can_set_password: False
 
 ## Horizon SSL
 horizon_ssl_cert: /etc/ssl/certs/horizon.pem

playbooks/roles/os_horizon/templates/horizon_local_settings.py.j2

@@ -239,7 +239,7 @@ LAUNCH_INSTANCE_NG_ENABLED = {{ horizon_launch_instance_ng }}
 # from the UI.
 OPENSTACK_HYPERVISOR_FEATURES = {
     'can_set_mount_point': False,
-    'can_set_password': False,
+    'can_set_password': {{ horizon_can_set_password }},
 }
 
 # The OPENSTACK_CINDER_FEATURES settings can be used to enable optional

playbooks/roles/os_nova/defaults/main.yml

@@ -176,6 +176,13 @@ nova_compute_program_name: nova-compute
 # TODO: This defaults to 'False' upstream, we should set this to 'False' in Liberty
 nova_force_config_drive: True
 
+## Nova libvirt
+nova_libvirt_inject_key: False
+# inject partition options:
+#  -2 => disable, -1 => inspect (libguestfs only), 0 => not partitioned, >0 => partition number
+nova_libvirt_inject_partition: -2
+nova_libvirt_inject_password: False
+
 ## Nova conductor
 nova_conductor_program_name: nova-conductor
 

playbooks/roles/os_nova/templates/nova.conf.j2

@@ -234,7 +234,9 @@ rabbit_hosts = {{ rabbitmq_servers }}
 
 [libvirt]
 vif_driver = {{ nova_libvirt_vif_driver }}
-inject_partition = -2
+inject_partition = {{ nova_libvirt_inject_partition }}
+inject_password = {{ nova_libvirt_inject_password }}
+inject_key = {{ nova_libvirt_inject_key }}
 use_usb_tablet = False
 use_virtio_for_bridges = True
 cpu_mode = {{ nova_cpu_mode }}
@@ -250,9 +252,6 @@ rbd_secret_uuid = {{ nova_ceph_client_uuid }}
 images_type = rbd
 images_rbd_pool = {{ nova_libvirt_images_rbd_pool }}
 images_rbd_ceph_conf = /etc/ceph/ceph.conf
-inject_password = false
-inject_key = false
-inject_partition = -2
 live_migration_flag="VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST"
 {% endif %}
 

playbooks/roles/os_tempest/defaults/main.yml

@@ -32,6 +32,7 @@ tempest_compute_run_ssh: True
 tempest_compute_console_output_enabled: True
 tempest_compute_resize_enabled: True
 tempest_compute_snapshot_enabled: True
+tempest_compute_change_password: False
 
 tempest_dashboard_login_url: "https://{{ external_lb_vip_address }}/auth/login/"
 tempest_dashboard_url: "https://{{ external_lb_vip_address }}/"

playbooks/roles/os_tempest/templates/tempest.conf.j2

@@ -68,7 +68,7 @@ volume_device_name = vdb
 api_extensions = all
 block_migrate_cinder_iscsi = false
 block_migration_for_live_migration = false
-change_password = false
+change_password = {{ tempest_compute_change_password }}
 console_output = {{ tempest_compute_console_output_enabled }}
 disk_config = true
 enable_instance_password = false