Fix flavors creation

Plus rename libvirt tls option

Change-Id: I0b8b043047479a464183ddc20eaf0e0101806094

service/files/create-flavor.sh.j2

@@ -16,6 +16,9 @@ export OS_PASSWORD={{ openstack.user_password }}
 export OS_USERNAME={{ openstack.user_name }}
 export OS_PROJECT_NAME={{ openstack.project_name }}
 export OS_AUTH_URL="{{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3"
+{% if keystone.tls.enabled %}
+export OS_CACERT="/opt/ccp/etc/tls/ca.pem"
+{% endif %}
 
 openstack flavor show $name || openstack --os-region-name=RegionOne \
     flavor create --id $id --ram $ram --disk $disk --vcpus $vcpus $name

service/files/defaults.yaml

@@ -35,7 +35,8 @@ configs:
     virt_type: "kvm"
 
     libvirt:
-      tls_enable: true
+      tls:
+        enabled: true
       libvirt_certificate_authority_certificate: |
         -----BEGIN CERTIFICATE-----
         MIIDRzCCAf+gAwIBAgIEWFKFHjANBgkqhkiG9w0BAQsFADATMREwDwYDVQQDEwht

service/files/libvirtd.conf.j2

@@ -1,4 +1,4 @@
-{% if nova.libvirt.tls_enable %}
+{% if nova.libvirt.tls.enabled %}
 listen_tcp = 0
 listen_tls = 1
 {% else %}

service/files/nova.conf.j2

@@ -132,7 +132,7 @@ memcache_servers = {{ address('memcached', memcached.port) }}
 
 [libvirt]
 virt_type = {{ nova.virt_type }}
-{% if nova.libvirt.tls_enable %}
+{% if nova.libvirt.tls.enabled %}
 # TLS config:
 # 1. NOTE: nova will use default connection_uri to connect to libvirt,
 # e.g. qemu:/// which assumes nova-compute and libvirtd are on the same host.

service/nova-compute.yaml

@@ -37,7 +37,7 @@ service:
           - "{{ messaging.dependencies[messaging.backend.notifications] }}"
         files:
           - nova.conf
-          # {% if nova.libvirt.tls_enable %}
+          # {% if nova.libvirt.tls.enabled %}
           - libvirt-cacert
           # {% endif %}
           # {% if nova.ceph.enable %}
@@ -50,7 +50,7 @@ files:
     path: /etc/nova/nova.conf
     content: nova.conf.j2
     perm: "0600"
-  # {% if nova.libvirt.tls_enable %}
+  # {% if nova.libvirt.tls.enabled %}
   libvirt-cacert:
     path: /etc/pki/CA/cacert.pem
     content: libvirt.cacert.j2

service/nova-libvirt.yaml

@@ -37,7 +37,7 @@ service:
         files:
           - libvirtd.conf
           - nova-libvirt-bootstrap.sh
-          # {% if nova.libvirt.tls_enable %}
+          # {% if nova.libvirt.tls.enabled %}
           - libvirt-cacert
           - libvirt-servercert
           - libvirt-serverkey
@@ -88,7 +88,7 @@ files:
     path: /tmp/nova-libvirt-bootstrap.sh
     content: nova-libvirt-bootstrap.sh
     perm: "0755"
-  # {% if nova.libvirt.tls_enable %}
+  # {% if nova.libvirt.tls.enabled %}
   libvirt-cacert:
     path: /etc/pki/CA/cacert.pem
     content: libvirt.cacert.j2