xci: osa: Add initial dynamic inventory from PDF/IDF files

The PDF and IDF files contain all the information we need for the
virtual XCI deployment, so we can use it to create a dynamic inventory
and get rid of all the static ones which could easily get outdated
as PDF and IDF files evolve over time.

This inital version of the dynamic inventory contains a lot of
unnecessary generated information but we do that in order to ease
the migration from static files to the dynamic inventory. The dynamic
inventory will be improved in the future as we consume more and more
information from the PDF and IDF files.

Change-Id: Id9f07a61c67a5cffcbc18079a341e5d395020a27
Signed-off-by: Markos Chandras <mchandras@suse.de>

11 files changed, 2 insertions, 137 deletions

diff --git a/xci/installer/osa/deploy.sh b/xci/installer/osa/deploy.sh
index 6dada3f5..c3a6eb84 100755
--- a/xci/installer/osa/deploy.sh
+++ b/xci/installer/osa/deploy.sh
@@ -58,7 +58,7 @@ echo "Info: Configuring opnfv deployment host for openstack-ansible"
 echo "-----------------------------------------------------------------------"
 cd $OSA_XCI_PLAYBOOKS
 ansible-galaxy install -r ${XCI_PATH}/xci/files/requirements.yml -p $HOME/.ansible/roles
-ansible-playbook ${XCI_ANSIBLE_PARAMS} -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory \
+ansible-playbook ${XCI_ANSIBLE_PARAMS} -i ${XCI_PLAYBOOKS}/dynamic_inventory.py \
     configure-opnfvhost.yml
 echo "-----------------------------------------------------------------------"
 echo "Info: Configured opnfv deployment host for openstack-ansible"
@@ -78,7 +78,7 @@ if [[ $XCI_FLAVOR != "aio" ]]; then
     echo "Info: Configuring target hosts for openstack-ansible"
     echo "-----------------------------------------------------------------------"
     cd $OSA_XCI_PLAYBOOKS
-    ansible-playbook ${XCI_ANSIBLE_PARAMS} -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory \
+    ansible-playbook ${XCI_ANSIBLE_PARAMS} -i ${XCI_PLAYBOOKS}/dynamic_inventory.py \
         configure-targethosts.yml
     echo "-----------------------------------------------------------------------"
     echo "Info: Configured target hosts"
diff --git a/xci/installer/osa/files/aio/flavor-vars.yml b/xci/installer/osa/files/aio/flavor-vars.yml
deleted file mode 100644
index 6ac1e0fe..00000000
--- a/xci/installer/osa/files/aio/flavor-vars.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# this file is added intentionally in order to simplify putting files in place
-# in future, it might contain vars specific to this flavor
diff --git a/xci/installer/osa/files/aio/inventory b/xci/installer/osa/files/aio/inventory
deleted file mode 100644
index fa2a1009..00000000
--- a/xci/installer/osa/files/aio/inventory
+++ /dev/null
@@ -1,2 +0,0 @@
-[deployment]
-opnfv ansible_ssh_host=192.168.122.2
diff --git a/xci/installer/osa/files/ha/flavor-vars.yml b/xci/installer/osa/files/ha/flavor-vars.yml
deleted file mode 100644
index 167502c9..00000000
--- a/xci/installer/osa/files/ha/flavor-vars.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-host_info: {
-    'opnfv': {
-        'VLAN_IP': '192.168.122.2',
-        'MGMT_IP': '172.29.236.10',
-        'VXLAN_IP': '172.29.240.10',
-        'STORAGE_IP': '172.29.244.10'
-    },
-    'controller00': {
-        'VLAN_IP': '192.168.122.3',
-        'MGMT_IP': '172.29.236.11',
-        'VXLAN_IP': '172.29.240.11',
-        'STORAGE_IP': '172.29.244.11'
-    },
-    'controller01': {
-        'VLAN_IP': '192.168.122.4',
-        'MGMT_IP': '172.29.236.12',
-        'VXLAN_IP': '172.29.240.12',
-        'STORAGE_IP': '172.29.244.12'
-    },
-    'controller02': {
-        'VLAN_IP': '192.168.122.5',
-        'MGMT_IP': '172.29.236.13',
-        'VXLAN_IP': '172.29.240.13',
-        'STORAGE_IP': '172.29.244.13'
-    },
-    'compute00': {
-        'VLAN_IP': '192.168.122.6',
-        'MGMT_IP': '172.29.236.14',
-        'VXLAN_IP': '172.29.240.14',
-        'STORAGE_IP': '172.29.244.14'
-    },
-    'compute01': {
-        'VLAN_IP': '192.168.122.7',
-        'MGMT_IP': '172.29.236.15',
-        'VXLAN_IP': '172.29.240.15',
-        'STORAGE_IP': '172.29.244.15'
-    }
-}
diff --git a/xci/installer/osa/files/ha/inventory b/xci/installer/osa/files/ha/inventory
deleted file mode 100644
index f5d882ef..00000000
--- a/xci/installer/osa/files/ha/inventory
+++ /dev/null
@@ -1,15 +0,0 @@
-[deployment]
-opnfv ansible_ssh_host=192.168.122.2
-
-[controller]
-controller00 ansible_ssh_host=192.168.122.3
-controller01 ansible_ssh_host=192.168.122.4
-controller02 ansible_ssh_host=192.168.122.5
-
-[compute]
-compute00 ansible_ssh_host=192.168.122.6
-compute01 ansible_ssh_host=192.168.122.7
-
-[openstack:children]
-controller
-compute
diff --git a/xci/installer/osa/files/mini/flavor-vars.yml b/xci/installer/osa/files/mini/flavor-vars.yml
deleted file mode 100644
index 0d446ba2..00000000
--- a/xci/installer/osa/files/mini/flavor-vars.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-host_info: {
-    'opnfv': {
-        'VLAN_IP': '192.168.122.2',
-        'MGMT_IP': '172.29.236.10',
-        'VXLAN_IP': '172.29.240.10',
-        'STORAGE_IP': '172.29.244.10'
-    },
-    'controller00': {
-        'VLAN_IP': '192.168.122.3',
-        'MGMT_IP': '172.29.236.11',
-        'VXLAN_IP': '172.29.240.11',
-        'STORAGE_IP': '172.29.244.11'
-    },
-    'compute00': {
-        'VLAN_IP': '192.168.122.4',
-        'MGMT_IP': '172.29.236.12',
-        'VXLAN_IP': '172.29.240.12',
-        'STORAGE_IP': '172.29.244.12'
-    },
-}
diff --git a/xci/installer/osa/files/mini/inventory b/xci/installer/osa/files/mini/inventory
deleted file mode 100644
index 4224131f..00000000
--- a/xci/installer/osa/files/mini/inventory
+++ /dev/null
@@ -1,12 +0,0 @@
-[deployment]
-opnfv ansible_ssh_host=192.168.122.2
-
-[controller]
-controller00 ansible_ssh_host=192.168.122.3
-
-[compute]
-compute00 ansible_ssh_host=192.168.122.4
-
-[openstack:children]
-controller
-compute
diff --git a/xci/installer/osa/files/noha/flavor-vars.yml b/xci/installer/osa/files/noha/flavor-vars.yml
deleted file mode 100644
index 3c69a34b..00000000
--- a/xci/installer/osa/files/noha/flavor-vars.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-host_info: {
-    'opnfv': {
-        'VLAN_IP': '192.168.122.2',
-        'MGMT_IP': '172.29.236.10',
-        'VXLAN_IP': '172.29.240.10',
-        'STORAGE_IP': '172.29.244.10'
-    },
-    'controller00': {
-        'VLAN_IP': '192.168.122.3',
-        'MGMT_IP': '172.29.236.11',
-        'VXLAN_IP': '172.29.240.11',
-        'STORAGE_IP': '172.29.244.11'
-    },
-    'compute00': {
-        'VLAN_IP': '192.168.122.4',
-        'MGMT_IP': '172.29.236.12',
-        'VXLAN_IP': '172.29.240.12',
-        'STORAGE_IP': '172.29.244.12'
-    },
-    'compute01': {
-        'VLAN_IP': '192.168.122.5',
-        'MGMT_IP': '172.29.236.13',
-        'VXLAN_IP': '172.29.240.13',
-        'STORAGE_IP': '172.29.244.13'
-    }
-}
diff --git a/xci/installer/osa/files/noha/inventory b/xci/installer/osa/files/noha/inventory
deleted file mode 100644
index 0e3b8d84..00000000
--- a/xci/installer/osa/files/noha/inventory
+++ /dev/null
@@ -1,13 +0,0 @@
-[deployment]
-opnfv ansible_ssh_host=192.168.122.2
-
-[controller]
-controller00 ansible_ssh_host=192.168.122.3
-
-[compute]
-compute00 ansible_ssh_host=192.168.122.4
-compute01 ansible_ssh_host=192.168.122.5
-
-[openstack:children]
-controller
-compute
diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml
index e2770989..c92abd97 100644
--- a/xci/installer/osa/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml
@@ -26,7 +26,6 @@
         file: "{{ item }}"
       with_items:
         - "{{ xci_path }}/xci/var/{{ ansible_os_family }}.yml"
-        - "{{ xci_flavor_ansible_file_path }}/flavor-vars.yml"
     - name: Set facts for remote deployment
       set_fact:
         remote_xci_path: "{{ ansible_env.HOME }}/releng-xci"
@@ -74,7 +73,6 @@
         - { src: "{{ openstack_osa_path }}/etc/openstack_deploy/env.d", dest: "{{ openstack_osa_etc_path }}" }
         - { src: "{{ openstack_osa_path }}/etc/openstack_deploy/conf.d", dest: "{{ openstack_osa_etc_path }}" }
         - { src: "{{ openstack_osa_path }}/etc/openstack_deploy/user_secrets.yml", dest: "{{ openstack_osa_etc_path }}" }
-        - { src: "{{ remote_xci_flavor_files }}/inventory", dest: "{{ remote_xci_playbooks }}" }
         - { src: "{{ remote_xci_flavor_files }}/openstack_user_config.yml", dest: "{{ openstack_osa_etc_path }}" }
         - { src: "{{ remote_xci_flavor_files }}/user_variables.yml", dest: "{{ openstack_osa_etc_path }}" }
         - { src: "{{ remote_xci_flavor_files }}/ceph.yml", dest: "{{ openstack_osa_etc_path }}/conf.d/", cond: xci_ceph_enabled }
diff --git a/xci/installer/osa/playbooks/configure-targethosts.yml b/xci/installer/osa/playbooks/configure-targethosts.yml
index cb817cfc..a5d2923c 100644
--- a/xci/installer/osa/playbooks/configure-targethosts.yml
+++ b/xci/installer/osa/playbooks/configure-targethosts.yml
@@ -17,7 +17,6 @@
         file: "{{ item }}"
       with_items:
         - "{{ xci_path }}/xci/var/{{ ansible_os_family }}.yml"
-        - "{{ xci_flavor_ansible_file_path }}/flavor-vars.yml"
   roles:
     - role: peru.proxy_settings
       proxy_settings_http_proxy: "{{ lookup('env','http_proxy') }}"