Generate static inventory with shade inventory (#538)

* Autogenerate inventory/hosts when 'inventory: static' (Default),
  with the shade-inventory tool.
* Drop unused anymore: openstack.py and associated GPL notes,
  an example static inventory, omit manual updates for the
  inventory DNS names in the deployment guide.
* Switch openstack.py formatted inventory hostvars
  to the shade-inventory format (omit openstack.* from hostvars).
* Populate node labels from inventory vars instead of the heat
  templates combined with inventory vars.
* Add app (k8s minions) nodes group for primary node labels.

Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/playbooks/provisioning/openstack/openstack_dns_views.yml b/playbooks/provisioning/openstack/openstack_dns_views.yml
index ea0a7cb96..7165b4269 100644
--- a/playbooks/provisioning/openstack/openstack_dns_views.yml
+++ b/playbooks/provisioning/openstack/openstack_dns_views.yml
@@ -1,24 +1,24 @@
 ---
 - name: "Generate ACL list for DNS server"
   set_fact:
-    acl_list: "{{ acl_list | default([]) + [ (hostvars[item]['openstack']['private_v4'] + '/32') ] }}"
+    acl_list: "{{ acl_list | default([]) + [ (hostvars[item]['private_v4'] + '/32') ] }}"
   with_items: "{{ groups['cluster_hosts'] }}"
 
 - name: "Generate the private view"
   set_fact:
     private_named_view:
-    - name: "private"
-      acl_entry: "{{ acl_list }}"
-      zone:
-      - dns_domain: "{{ full_dns_domain }}"
+      - name: "private"
+        acl_entry: "{{ acl_list }}"
+        zone:
+          - dns_domain: "{{ full_dns_domain }}"
 
 - name: "Generate the public view"
   set_fact:
     public_named_view:
-    - name: "public"
-      zone:
-      - dns_domain: "{{ full_dns_domain }}"
-      forwarder: "{{ public_dns_nameservers }}"
+      - name: "public"
+        zone:
+          - dns_domain: "{{ full_dns_domain }}"
+        forwarder: "{{ public_dns_nameservers }}"
 
 - name: "Generate the final named_config_views"
   set_fact: