aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorliyuenan <liyuenan@huawei.com>2016-12-20 16:44:59 +0800
committerliyuenan <liyuenan@huawei.com>2016-12-22 10:54:34 +0800
commita9041dbf7b68f56169e82de3c37601b7e86867b0 (patch)
tree8364c3b523bc0ac1e8dceda0d66eed4b8d2816f5 /deploy
parent819912d0379f6cd2b2693c2968576f7514a117c5 (diff)
Change newton_xenial to newton
JIRA: COMPASS-513 Change-Id: I937a02bcd69f0df1f5d951dd6630ef2e76e8d386 Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy')
-rw-r--r--deploy/adapters/ansible/openstack_newton/.gitkeep (renamed from deploy/adapters/ansible/openstack_newton_xenial/.gitkeep)0
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_juno.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_kilo.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_liberty.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_mitaka.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_mitaka_xenial.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_newton.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_newton_xenial.conf7
-rwxr-xr-xdeploy/compass_conf/adapter/ansible_openstack_osp9.conf7
-rwxr-xr-xdeploy/compass_conf/flavor/openstack_juno_ansible.conf32
-rwxr-xr-xdeploy/compass_conf/flavor/openstack_kilo_ansible.conf32
-rwxr-xr-xdeploy/compass_conf/flavor/openstack_liberty_ansible.conf32
-rwxr-xr-xdeploy/compass_conf/flavor/openstack_mitaka.conf32
-rwxr-xr-xdeploy/compass_conf/flavor/openstack_mitaka_xenial.conf32
-rwxr-xr-xdeploy/compass_conf/flavor/openstack_newton.conf (renamed from deploy/compass_conf/flavor/openstack_osp9.conf)6
-rwxr-xr-xdeploy/compass_conf/flavor/openstack_newton_xenial.conf32
-rwxr-xr-xdeploy/compass_conf/flavor_mapping/HA-ansible-multinodes-juno.conf112
-rwxr-xr-xdeploy/compass_conf/flavor_mapping/HA-ansible-multinodes-kilo.conf104
-rwxr-xr-xdeploy/compass_conf/flavor_mapping/HA-ansible-multinodes-liberty.conf112
-rwxr-xr-xdeploy/compass_conf/flavor_mapping/HA-ansible-multinodes-mitaka.conf124
-rwxr-xr-xdeploy/compass_conf/flavor_mapping/HA-ansible-multinodes-mitaka_xenial.conf120
-rwxr-xr-xdeploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton.conf (renamed from deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton_xenial.conf)4
-rwxr-xr-xdeploy/compass_conf/flavor_metadata/HA-ansible-multinodes-kilo.conf19
-rwxr-xr-xdeploy/compass_conf/flavor_metadata/HA-ansible-multinodes-liberty.conf19
-rwxr-xr-xdeploy/compass_conf/flavor_metadata/HA-ansible-multinodes-mitaka.conf19
-rwxr-xr-xdeploy/compass_conf/flavor_metadata/HA-ansible-multinodes-mitaka_xenial.conf19
-rwxr-xr-xdeploy/compass_conf/flavor_metadata/HA-ansible-multinodes-newton.conf (renamed from deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-juno.conf)4
-rwxr-xr-xdeploy/compass_conf/flavor_metadata/HA-ansible-multinodes-newton_xenial.conf19
-rwxr-xr-xdeploy/compass_conf/flavor_metadata/HA-ansible-multinodes-osp9.conf19
-rwxr-xr-xdeploy/compass_conf/os/centos6.5.conf3
-rwxr-xr-xdeploy/compass_conf/os/centos6.6.conf3
-rwxr-xr-xdeploy/compass_conf/os/general.conf2
-rwxr-xr-xdeploy/compass_conf/os/sles11sp3.conf3
-rwxr-xr-xdeploy/compass_conf/os/suse.conf2
-rwxr-xr-xdeploy/compass_conf/os/ubuntu12.04.conf3
-rwxr-xr-xdeploy/compass_conf/os/ubuntu14.04.3.conf3
-rwxr-xr-xdeploy/compass_conf/os/ubuntu14.04.conf3
-rwxr-xr-xdeploy/compass_conf/os/uvp11sp3.conf3
-rwxr-xr-xdeploy/compass_conf/package_installer/ansible-kilo.conf13
-rwxr-xr-xdeploy/compass_conf/package_installer/ansible-liberty.conf13
-rwxr-xr-xdeploy/compass_conf/package_installer/ansible-mitaka.conf13
-rwxr-xr-xdeploy/compass_conf/package_installer/ansible-mitaka_xenial.conf13
-rwxr-xr-xdeploy/compass_conf/package_installer/ansible-newton.conf (renamed from deploy/compass_conf/package_installer/ansible-juno.conf)4
-rwxr-xr-xdeploy/compass_conf/package_installer/ansible-newton_xenial.conf13
-rwxr-xr-xdeploy/compass_conf/package_installer/ansible-osp9.conf13
-rwxr-xr-xdeploy/compass_conf/role/openstack_juno_ansible.conf110
-rwxr-xr-xdeploy/compass_conf/role/openstack_kilo_ansible.conf110
-rwxr-xr-xdeploy/compass_conf/role/openstack_liberty_ansible.conf115
-rwxr-xr-xdeploy/compass_conf/role/openstack_mitaka_ansible.conf115
-rwxr-xr-xdeploy/compass_conf/role/openstack_mitaka_xenial_ansible.conf115
-rwxr-xr-xdeploy/compass_conf/role/openstack_newton_ansible.conf (renamed from deploy/compass_conf/role/openstack_osp9_ansible.conf)2
-rwxr-xr-xdeploy/compass_conf/role/openstack_newton_xenial_ansible.conf115
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/HA-ansible-multinodes.tmpl7
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/allinone.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/multinodes.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/single-controller.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_juno/inventories/HA-ansible-multinodes.tmpl110
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_juno/vars/HA-ansible-multinodes.tmpl202
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_juno/vars/allinone.tmpl96
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_juno/vars/multinodes.tmpl165
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_juno/vars/single-controller.tmpl108
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/HA-ansible-multinodes.tmpl7
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/allinone.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/multinodes.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/single-controller.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/HA-ansible-multinodes.tmpl31
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/allinone.tmpl10
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/multinodes.tmpl110
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/single-controller.tmpl40
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/HA-ansible-multinodes.tmpl109
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/allinone.tmpl47
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/multinodes.tmpl123
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/single-controller.tmpl67
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/HA-ansible-multinodes.tmpl202
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/allinone.tmpl96
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/multinodes.tmpl165
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/single-controller.tmpl108
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/HA-ansible-multinodes.tmpl7
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/HA-ansible-multinodes.tmplr7
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/allinone.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/allinone.tmplr6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/multinodes.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/multinodes.tmplr6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/single-controller.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/single-controller.tmplr6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/HA-ansible-multinodes.tmpl31
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/allinone.tmpl10
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/multinodes.tmpl110
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/single-controller.tmpl40
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/allinone.tmpl47
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/multinodes.tmpl123
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/single-controller.tmpl67
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl203
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/allinone.tmpl96
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/multinodes.tmpl165
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/single-controller.tmpl108
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/allinone.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/multinodes.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/HA-ansible-multinodes.tmpl31
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/allinone.tmpl10
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/multinodes.tmpl110
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/single-controller.tmpl40
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/HA-ansible-multinodes.tmpl100
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/allinone.tmpl47
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/multinodes.tmpl123
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/single-controller.tmpl67
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/HA-ansible-multinodes.tmpl213
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/allinone.tmpl96
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/multinodes.tmpl165
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/single-controller.tmpl108
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/HA-ansible-multinodes.tmpl7
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/allinone.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/multinodes.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/single-controller.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/HA-ansible-multinodes.tmpl31
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/allinone.tmpl10
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/multinodes.tmpl110
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/single-controller.tmpl40
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/HA-ansible-multinodes.tmpl100
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/allinone.tmpl47
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/multinodes.tmpl123
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/single-controller.tmpl67
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/HA-ansible-multinodes.tmpl209
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/allinone.tmpl96
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/multinodes.tmpl165
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/single-controller.tmpl108
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/ansible_cfg/HA-ansible-multinodes.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/HA-ansible-multinodes.tmpl)2
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/ansible_cfg/allinone.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/allinone.tmpl)2
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/ansible_cfg/multinodes.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/multinodes.tmpl)2
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/ansible_cfg/single-controller.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/single-controller.tmpl)2
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/hosts/HA-ansible-multinodes.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_juno/hosts/HA-ansible-multinodes.tmpl)0
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/hosts/allinone.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_juno/hosts/allinone.tmpl)0
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/hosts/multinodes.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_juno/hosts/multinodes.tmpl)0
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/hosts/single-controller.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_juno/hosts/single-controller.tmpl)0
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/HA-ansible-multinodes.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/HA-ansible-multinodes.tmpl)0
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/allinone.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_juno/inventories/allinone.tmpl)0
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/multinodes.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_juno/inventories/multinodes.tmpl)0
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/single-controller.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_juno/inventories/single-controller.tmpl)0
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/vars/HA-ansible-multinodes.tmpl)0
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/vars/allinone.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/vars/allinone.tmpl)0
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/vars/multinodes.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/vars/multinodes.tmpl)0
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/vars/single-controller.tmpl (renamed from deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/vars/single-controller.tmpl)0
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/HA-ansible-multinodes.tmpl7
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/allinone.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/multinodes.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/single-controller.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/HA-ansible-multinodes.tmpl31
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/allinone.tmpl10
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/multinodes.tmpl110
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/single-controller.tmpl40
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/HA-ansible-multinodes.tmpl100
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/allinone.tmpl47
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/multinodes.tmpl123
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/single-controller.tmpl67
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/HA-ansible-multinodes.tmpl7
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/single-controller.tmpl6
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/HA-ansible-multinodes.tmpl31
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/allinone.tmpl10
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/multinodes.tmpl110
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/single-controller.tmpl40
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/HA-ansible-multinodes.tmpl100
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/allinone.tmpl47
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/multinodes.tmpl123
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/single-controller.tmpl67
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/HA-ansible-multinodes.tmpl210
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/allinone.tmpl96
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/multinodes.tmpl165
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/single-controller.tmpl108
-rwxr-xr-xdeploy/compass_conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl76
-rwxr-xr-xdeploy/compass_conf/templates/cobbler/CentOS-6.6-x86_64/system.tmpl76
-rwxr-xr-xdeploy/compass_conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl75
-rwxr-xr-xdeploy/compass_conf/templates/cobbler/Ubuntu-14.04-x86_64/system.tmpl75
-rwxr-xr-xdeploy/compass_conf/templates/cobbler/sles-11sp3-x86_64/system.tmpl76
-rwxr-xr-xdeploy/compass_conf/templates/cobbler/ubuntu-14.04.3-server-x86_64/profile.tmpl3
-rwxr-xr-xdeploy/compass_conf/templates/cobbler/ubuntu-14.04.3-server-x86_64/system.tmpl75
-rwxr-xr-xdeploy/compass_conf/templates/cobbler/uvp-11sp3-x86_64/system.tmpl76
-rwxr-xr-xdeploy/compass_vm.sh61
-rw-r--r--deploy/conf/cluster.conf23
178 files changed, 55 insertions, 9121 deletions
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/.gitkeep b/deploy/adapters/ansible/openstack_newton/.gitkeep
index e69de29b..e69de29b 100644
--- a/deploy/adapters/ansible/openstack_newton_xenial/.gitkeep
+++ b/deploy/adapters/ansible/openstack_newton/.gitkeep
diff --git a/deploy/compass_conf/adapter/ansible_openstack_juno.conf b/deploy/compass_conf/adapter/ansible_openstack_juno.conf
deleted file mode 100755
index 6d36cd55..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_juno.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_juno'
-DISPLAY_NAME = 'Openstack Juno'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_juno'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)CentOS-7.*15.*']
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_kilo.conf b/deploy/compass_conf/adapter/ansible_openstack_kilo.conf
deleted file mode 100755
index 943453ad..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_kilo.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_kilo'
-DISPLAY_NAME = 'Openstack kilo'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_kilo'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)CentOS-7.*15.*']
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_liberty.conf b/deploy/compass_conf/adapter/ansible_openstack_liberty.conf
deleted file mode 100755
index d181d1c7..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_liberty.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_liberty'
-DISPLAY_NAME = 'Openstack Liberty'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_liberty'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)CentOS-7.*15.*']
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_mitaka.conf b/deploy/compass_conf/adapter/ansible_openstack_mitaka.conf
deleted file mode 100755
index 0e53829b..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_mitaka.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_mitaka'
-DISPLAY_NAME = 'Openstack Mitaka'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_mitaka'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)ubuntu-16\.04', '(?i)CentOS-7.*15.*']
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_mitaka_xenial.conf b/deploy/compass_conf/adapter/ansible_openstack_mitaka_xenial.conf
deleted file mode 100755
index 691ce930..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_mitaka_xenial.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_mitaka_xenial'
-DISPLAY_NAME = 'Openstack Mitaka Xenial'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_mitaka_xenial'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)ubuntu-16\.04', '(?i)CentOS-7.*15.*']
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_newton.conf b/deploy/compass_conf/adapter/ansible_openstack_newton.conf
new file mode 100755
index 00000000..dfc8f1af
--- /dev/null
+++ b/deploy/compass_conf/adapter/ansible_openstack_newton.conf
@@ -0,0 +1,7 @@
+NAME = 'openstack_newton'
+DISPLAY_NAME = 'Openstack Newton'
+PARENT = 'openstack'
+PACKAGE_INSTALLER = 'ansible_installer_newton'
+OS_INSTALLER = 'cobbler'
+SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-16\.04', '(?i)CentOS-7.*15.*']
+DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_newton_xenial.conf b/deploy/compass_conf/adapter/ansible_openstack_newton_xenial.conf
deleted file mode 100755
index cd8d2deb..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_newton_xenial.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_newton_xenial'
-DISPLAY_NAME = 'Openstack Mitaka Xenial'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_newton_xenial'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-14\.04.*', '(?i)ubuntu-14\.04\.3.*', '(?i)ubuntu-16\.04', '(?i)CentOS-7.*15.*']
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/adapter/ansible_openstack_osp9.conf b/deploy/compass_conf/adapter/ansible_openstack_osp9.conf
deleted file mode 100755
index 81c00a0f..00000000
--- a/deploy/compass_conf/adapter/ansible_openstack_osp9.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME = 'openstack_osp9'
-DISPLAY_NAME = 'RedHat OSP 9'
-PARENT = 'openstack'
-PACKAGE_INSTALLER = 'ansible_installer_osp9'
-OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)rhel-server-7\.2.*']
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/flavor/openstack_juno_ansible.conf b/deploy/compass_conf/flavor/openstack_juno_ansible.conf
deleted file mode 100755
index 53724b58..00000000
--- a/deploy/compass_conf/flavor/openstack_juno_ansible.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-ADAPTER_NAME = 'openstack_juno'
-FLAVORS = [{
- 'flavor': 'allinone',
- 'display_name': 'All-In-One',
- 'template': 'allinone.tmpl',
- 'roles': ['allinone-compute'],
-}, {
- 'flavor': 'single-controller',
- 'display_name': 'Single Controller',
- 'template': 'single-controller.tmpl',
- 'roles': [
- 'controller', 'compute', 'network', 'storage', 'odl', 'onos'
- ],
-}, {
- 'flavor': 'multinodes',
- 'display_name': 'Multi-nodes',
- 'template': 'multinodes.tmpl',
- 'roles': [
- 'compute-controller', 'compute-worker', 'network-server',
- 'network-worker', 'database', 'messaging', 'image', 'odl',
- 'dashboard', 'identity', 'storage-controller', 'storage-volume'
- ],
-}, {
- 'flavor': 'HA-ansible-multinodes-juno',
- 'display_name': 'HA-ansible-multinodes-juno',
- 'template': 'HA-ansible-multinodes.tmpl',
- 'roles': [
- 'controller', 'compute', 'ha', 'odl', 'onos', 'ceph', 'ceph-adm', 'ceph-mon', 'ceph-osd', 'sec-patch', 'ceph-osd-node'
- ],
-}]
-
-
diff --git a/deploy/compass_conf/flavor/openstack_kilo_ansible.conf b/deploy/compass_conf/flavor/openstack_kilo_ansible.conf
deleted file mode 100755
index d8d93fec..00000000
--- a/deploy/compass_conf/flavor/openstack_kilo_ansible.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-ADAPTER_NAME = 'openstack_kilo'
-FLAVORS = [{
- 'flavor': 'allinone',
- 'display_name': 'All-In-One',
- 'template': 'allinone.tmpl',
- 'roles': ['allinone-compute'],
-}, {
- 'flavor': 'single-controller',
- 'display_name': 'Single Controller',
- 'template': 'single-controller.tmpl',
- 'roles': [
- 'controller', 'compute', 'network', 'storage', 'odl', 'onos'
- ],
-}, {
- 'flavor': 'multinodes',
- 'display_name': 'Multi-nodes',
- 'template': 'multinodes.tmpl',
- 'roles': [
- 'compute-controller', 'compute-worker', 'network-server',
- 'network-worker', 'database', 'messaging', 'image', 'odl',
- 'dashboard', 'identity', 'storage-controller', 'storage-volume'
- ],
-}, {
- 'flavor': 'HA-ansible-multinodes-kilo',
- 'display_name': 'HA-ansible-multinodes-kilo',
- 'template': 'HA-ansible-multinodes.tmpl',
- 'roles': [
- 'controller', 'compute', 'ha', 'odl', 'onos', 'ceph', 'ceph-adm', 'ceph-mon', 'ceph-osd'
- ],
-}]
-
-
diff --git a/deploy/compass_conf/flavor/openstack_liberty_ansible.conf b/deploy/compass_conf/flavor/openstack_liberty_ansible.conf
deleted file mode 100755
index 21aaa51e..00000000
--- a/deploy/compass_conf/flavor/openstack_liberty_ansible.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-ADAPTER_NAME = 'openstack_liberty'
-FLAVORS = [{
- 'flavor': 'allinone',
- 'display_name': 'All-In-One',
- 'template': 'allinone.tmpl',
- 'roles': ['allinone-compute'],
-}, {
- 'flavor': 'single-controller',
- 'display_name': 'Single Controller',
- 'template': 'single-controller.tmpl',
- 'roles': [
- 'controller', 'compute', 'network', 'storage', 'odl', 'onos'
- ],
-}, {
- 'flavor': 'multinodes',
- 'display_name': 'Multi-nodes',
- 'template': 'multinodes.tmpl',
- 'roles': [
- 'compute-controller', 'compute-worker', 'network-server',
- 'network-worker', 'database', 'messaging', 'image', 'odl',
- 'dashboard', 'identity', 'storage-controller', 'storage-volume'
- ],
-}, {
- 'flavor': 'HA-ansible-multinodes-liberty',
- 'display_name': 'HA-ansible-multinodes-liberty',
- 'template': 'HA-ansible-multinodes.tmpl',
- 'roles': [
- 'controller', 'compute', 'ha', 'odl', 'onos', 'opencontrail', 'ceph', 'ceph-adm', 'ceph-mon', 'ceph-osd', 'sec-patch', 'ceph-osd-node'
- ],
-}]
-
-
diff --git a/deploy/compass_conf/flavor/openstack_mitaka.conf b/deploy/compass_conf/flavor/openstack_mitaka.conf
deleted file mode 100755
index ffa2e2bd..00000000
--- a/deploy/compass_conf/flavor/openstack_mitaka.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-ADAPTER_NAME = 'openstack_mitaka'
-FLAVORS = [{
- 'flavor': 'allinone',
- 'display_name': 'All-In-One',
- 'template': 'allinone.tmpl',
- 'roles': ['allinone-compute'],
-}, {
- 'flavor': 'single-controller',
- 'display_name': 'Single Controller',
- 'template': 'single-controller.tmpl',
- 'roles': [
- 'controller', 'compute', 'network', 'storage', 'odl', 'onos'
- ],
-}, {
- 'flavor': 'multinodes',
- 'display_name': 'Multi-nodes',
- 'template': 'multinodes.tmpl',
- 'roles': [
- 'compute-controller', 'compute-worker', 'network-server',
- 'network-worker', 'database', 'messaging', 'image', 'odl',
- 'dashboard', 'identity', 'storage-controller', 'storage-volume'
- ],
-}, {
- 'flavor': 'HA-ansible-multinodes-mitaka',
- 'display_name': 'HA-ansible-multinodes-mitaka',
- 'template': 'HA-ansible-multinodes.tmpl',
- 'roles': [
- 'controller', 'compute', 'ha', 'odl', 'onos', 'opencontrail', 'ceph', 'ceph-adm', 'ceph-mon', 'ceph-osd', 'sec-patch', 'ceph-osd-node'
- ],
-}]
-
-
diff --git a/deploy/compass_conf/flavor/openstack_mitaka_xenial.conf b/deploy/compass_conf/flavor/openstack_mitaka_xenial.conf
deleted file mode 100755
index 9f3bf0f4..00000000
--- a/deploy/compass_conf/flavor/openstack_mitaka_xenial.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-ADAPTER_NAME = 'openstack_mitaka_xenial'
-FLAVORS = [{
- 'flavor': 'allinone',
- 'display_name': 'All-In-One',
- 'template': 'allinone.tmpl',
- 'roles': ['allinone-compute'],
-}, {
- 'flavor': 'single-controller',
- 'display_name': 'Single Controller',
- 'template': 'single-controller.tmpl',
- 'roles': [
- 'controller', 'compute', 'network', 'storage', 'odl', 'onos'
- ],
-}, {
- 'flavor': 'multinodes',
- 'display_name': 'Multi-nodes',
- 'template': 'multinodes.tmpl',
- 'roles': [
- 'compute-controller', 'compute-worker', 'network-server',
- 'network-worker', 'database', 'messaging', 'image', 'odl',
- 'dashboard', 'identity', 'storage-controller', 'storage-volume'
- ],
-}, {
- 'flavor': 'HA-ansible-multinodes-mitaka_xenial',
- 'display_name': 'HA-ansible-multinodes-mitaka_xenial',
- 'template': 'HA-ansible-multinodes.tmpl',
- 'roles': [
- 'controller', 'compute', 'ha', 'odl', 'onos', 'opencontrail', 'ceph', 'ceph-adm', 'ceph-mon', 'ceph-osd', 'sec-patch', 'ceph-osd-node'
- ],
-}]
-
-
diff --git a/deploy/compass_conf/flavor/openstack_osp9.conf b/deploy/compass_conf/flavor/openstack_newton.conf
index b627c6fb..2861ccdf 100755
--- a/deploy/compass_conf/flavor/openstack_osp9.conf
+++ b/deploy/compass_conf/flavor/openstack_newton.conf
@@ -1,4 +1,4 @@
-ADAPTER_NAME = 'openstack_osp9'
+ADAPTER_NAME = 'openstack_newton'
FLAVORS = [{
'flavor': 'allinone',
'display_name': 'All-In-One',
@@ -21,8 +21,8 @@ FLAVORS = [{
'dashboard', 'identity', 'storage-controller', 'storage-volume'
],
}, {
- 'flavor': 'HA-ansible-multinodes-osp9',
- 'display_name': 'HA-ansible-multinodes-osp9',
+ 'flavor': 'HA-ansible-multinodes-newton',
+ 'display_name': 'HA-ansible-multinodes-newton',
'template': 'HA-ansible-multinodes.tmpl',
'roles': [
'controller', 'compute', 'ha', 'odl', 'onos', 'opencontrail', 'ceph', 'ceph-adm', 'ceph-mon', 'ceph-osd', 'sec-patch', 'ceph-osd-node'
diff --git a/deploy/compass_conf/flavor/openstack_newton_xenial.conf b/deploy/compass_conf/flavor/openstack_newton_xenial.conf
deleted file mode 100755
index 3566acee..00000000
--- a/deploy/compass_conf/flavor/openstack_newton_xenial.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-ADAPTER_NAME = 'openstack_newton_xenial'
-FLAVORS = [{
- 'flavor': 'allinone',
- 'display_name': 'All-In-One',
- 'template': 'allinone.tmpl',
- 'roles': ['allinone-compute'],
-}, {
- 'flavor': 'single-controller',
- 'display_name': 'Single Controller',
- 'template': 'single-controller.tmpl',
- 'roles': [
- 'controller', 'compute', 'network', 'storage', 'odl', 'onos'
- ],
-}, {
- 'flavor': 'multinodes',
- 'display_name': 'Multi-nodes',
- 'template': 'multinodes.tmpl',
- 'roles': [
- 'compute-controller', 'compute-worker', 'network-server',
- 'network-worker', 'database', 'messaging', 'image', 'odl',
- 'dashboard', 'identity', 'storage-controller', 'storage-volume'
- ],
-}, {
- 'flavor': 'HA-ansible-multinodes-newton_xenial',
- 'display_name': 'HA-ansible-multinodes-newton_xenial',
- 'template': 'HA-ansible-multinodes.tmpl',
- 'roles': [
- 'controller', 'compute', 'ha', 'odl', 'onos', 'opencontrail', 'ceph', 'ceph-adm', 'ceph-mon', 'ceph-osd', 'sec-patch', 'ceph-osd-node'
- ],
-}]
-
-
diff --git a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-juno.conf b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-juno.conf
deleted file mode 100755
index ec69a418..00000000
--- a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-juno.conf
+++ /dev/null
@@ -1,112 +0,0 @@
-ADAPTER = 'openstack_juno'
-FLAVOR = 'HA-ansible-multinodes-juno'
-CONFIG_MAPPING = {
- "mapped_name": "flavor_config",
- "mapped_children": [{
- "security": {
- "accordion_heading": "OpenStack Database and Queue Credentials",
- "category": "service_credentials",
- "data_structure": "table",
- "action": "true",
- "modifiable_data": ["username", "password"],
- "table_display_header": ["Service", "UserName", "Password", "Action"],
- "config": {
- "rabbitmq": {
- "username": "guest",
- "password": "guest"
- },
- "compute": {
- "username": "nova",
- "password": "nova"
- },
- "dashboard": {
- "username": "dashboard",
- "password": "dashboard"
- },
- "identity": {
- "username": "keystone",
- "password": "keystone"
- },
- "network": {
- "username": "network",
- "password": "network"
- },
- "image": {
- "username": "glance",
- "password": "glance"
- },
- "metering": {
- "username": "ceilometer",
- "password": "ceilometer"
- },
- "mysql": {
- "username": "root",
- "password": "root"
- },
- "volume": {
- "username": "cinder",
- "password": "cinder"
- },
- "heat": {
- "username": "heat",
- "password": "heat"
- }
- }
- }
- },{
- "security": {
- "accordion_heading": "OpenStack Keystone User Credentials",
- "category": "console_credentials",
- "data_structure": "table",
- "action": "true",
- "modifiable_data": ["username", "password"],
- "table_display_header": ["Service", "UserName", "Password", "Action"],
- "config":{
- "admin": {
- "username": "admin",
- "password": "admin"
- },
- "demo": {
- "username": "demo",
- "password": "demo"
- },
- "compute": {
- "username": "nova",
- "password": "nova"
- },
- "dashboard": {
- "username": "dashboard",
- "password": "dashboard"
- },
- "identity": {
- "username": "keystone",
- "password": "keystone"
- },
- "image": {
- "username": "glance",
- "password": "glance"
- },
- "metering": {
- "username": "ceilometer",
- "password": "ceilometer"
- },
- "network": {
- "username": "quantum",
- "password": "quantum"
- },
- "object-store": {
- "username": "swift",
- "password": "swift"
- },
- "heat": {
- "username": "heat",
- "password": "heat"
- },
- "volume": {
- "username": "cinder",
- "password": "cinder"
- }
- }
- }
- }]
-}
diff --git a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-kilo.conf b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-kilo.conf
deleted file mode 100755
index 20be0239..00000000
--- a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-kilo.conf
+++ /dev/null
@@ -1,104 +0,0 @@
-ADAPTER = 'openstack_kilo'
-FLAVOR = 'HA-ansible-multinodes-kilo'
-CONFIG_MAPPING = {
- "mapped_name": "flavor_config",
- "mapped_children": [{
- "security": {
- "accordion_heading": "OpenStack Database and Queue Credentials",
- "category": "service_credentials",
- "data_structure": "table",
- "action": "true",
- "modifiable_data": ["username", "password"],
- "table_display_header": ["Service", "UserName", "Password", "Action"],
- "config": {
- "rabbitmq": {
- "username": "guest",
- "password": "guest"
- },
- "compute": {
- "username": "nova",
- "password": "nova"
- },
- "dashboard": {
- "username": "dashboard",
- "password": "dashboard"
- },
- "identity": {
- "username": "keystone",
- "password": "keystone"
- },
- "image": {
- "username": "glance",
- "password": "glance"
- },
- "network": {
- "username": "neutron",
- "password": "neutron"
- },
- "metering": {
- "username": "ceilometer",
- "password": "ceilometer"
- },
- "mysql": {
- "username": "root",
- "password": "root"
- },
- "volume": {
- "username": "cinder",
- "password": "cinder"
- }
- }
- }
- },{
- "security": {
- "accordion_heading": "OpenStack Keystone User Credentials",
- "category": "console_credentials",
- "data_structure": "table",
- "action": "true",
- "modifiable_data": ["username", "password"],
- "table_display_header": ["Service", "UserName", "Password", "Action"],
- "config":{
- "admin": {
- "username": "admin",
- "password": "admin"
- },
- "demo": {
- "username": "demo",
- "password": "demo"
- },
- "compute": {
- "username": "nova",
- "password": "nova"
- },
- "dashboard": {
- "username": "dashboard",
- "password": "dashboard"
- },
- "identity": {
- "username": "keystone",
- "password": "keystone"
- },
- "image": {
- "username": "glance",
- "password": "glance"
- },
- "metering": {
- "username": "ceilometer",
- "password": "ceilometer"
- },
- "network": {
- "username": "quantum",
- "password": "quantum"
- },
- "object-store": {
- "username": "swift",
- "password": "swift"
- },
- "volume": {
- "username": "cinder",
- "password": "cinder"
- }
- }
- }
- }]
-}
diff --git a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-liberty.conf b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-liberty.conf
deleted file mode 100755
index 87843ed4..00000000
--- a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-liberty.conf
+++ /dev/null
@@ -1,112 +0,0 @@
-ADAPTER = 'openstack_liberty'
-FLAVOR = 'HA-ansible-multinodes-liberty'
-CONFIG_MAPPING = {
- "mapped_name": "flavor_config",
- "mapped_children": [{
- "security": {
- "accordion_heading": "OpenStack Database and Queue Credentials",
- "category": "service_credentials",
- "data_structure": "table",
- "action": "true",
- "modifiable_data": ["username", "password"],
- "table_display_header": ["Service", "UserName", "Password", "Action"],
- "config": {
- "rabbitmq": {
- "username": "guest",
- "password": "guest"
- },
- "compute": {
- "username": "nova",
- "password": "nova"
- },
- "dashboard": {
- "username": "dashboard",
- "password": "dashboard"
- },
- "identity": {
- "username": "keystone",
- "password": "keystone"
- },
- "image": {
- "username": "glance",
- "password": "glance"
- },
- "metering": {
- "username": "ceilometer",
- "password": "ceilometer"
- },
- "network": {
- "username": "neutron",
- "password": "neutron"
- },
- "mysql": {
- "username": "root",
- "password": "root"
- },
- "volume": {
- "username": "cinder",
- "password": "cinder"
- },
- "heat": {
- "username": "heat",
- "password": "heat"
- }
- }
- }
- },{
- "security": {
- "accordion_heading": "OpenStack Keystone User Credentials",
- "category": "console_credentials",
- "data_structure": "table",
- "action": "true",
- "modifiable_data": ["username", "password"],
- "table_display_header": ["Service", "UserName", "Password", "Action"],
- "config":{
- "admin": {
- "username": "admin",
- "password": "admin"
- },
- "demo": {
- "username": "demo",
- "password": "demo"
- },
- "compute": {
- "username": "nova",
- "password": "nova"
- },
- "dashboard": {
- "username": "dashboard",
- "password": "dashboard"
- },
- "identity": {
- "username": "keystone",
- "password": "keystone"
- },
- "image": {
- "username": "glance",
- "password": "glance"
- },
- "metering": {
- "username": "ceilometer",
- "password": "ceilometer"
- },
- "network": {
- "username": "quantum",
- "password": "quantum"
- },
- "object-store": {
- "username": "swift",
- "password": "swift"
- },
- "heat": {
- "username": "heat",
- "password": "heat"
- },
- "volume": {
- "username": "cinder",
- "password": "cinder"
- }
- }
- }
- }]
-}
diff --git a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-mitaka.conf b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-mitaka.conf
deleted file mode 100755
index 5339be43..00000000
--- a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-mitaka.conf
+++ /dev/null
@@ -1,124 +0,0 @@
-ADAPTER = 'openstack_mitaka'
-FLAVOR = 'HA-ansible-multinodes-mitaka'
-CONFIG_MAPPING = {
- "mapped_name": "flavor_config",
- "mapped_children": [{
- "security": {
- "accordion_heading": "OpenStack Database and Queue Credentials",
- "category": "service_credentials",
- "data_structure": "table",
- "action": "true",
- "modifiable_data": ["username", "password"],
- "table_display_header": ["Service", "UserName", "Password", "Action"],
- "config": {
- "rabbitmq": {
- "username": "guest",
- "password": "guest"
- },
- "compute": {
- "username": "nova",
- "password": "nova"
- },
- "dashboard": {
- "username": "dashboard",
- "password": "dashboard"
- },
- "identity": {
- "username": "keystone",
- "password": "keystone"
- },
- "image": {
- "username": "glance",
- "password": "glance"
- },
- "metering": {
- "username": "ceilometer",
- "password": "ceilometer"
- },
- "alarming": {
- "username": "aodh",
- "password": "aodh"
- },
- "network": {
- "username": "neutron",
- "password": "neutron"
- },
- "mysql": {
- "username": "root",
- "password": "root"
- },
- "volume": {
- "username": "cinder",
- "password": "cinder"
- },
- "heat": {
- "username": "heat",
- "password": "heat"
- },
- "policy": {
- "username": "congress",
- "password": "congress"
- }
- }
- }
- },{
- "security": {
- "accordion_heading": "OpenStack Keystone User Credentials",
- "category": "console_credentials",
- "data_structure": "table",
- "action": "true",
- "modifiable_data": ["username", "password"],
- "table_display_header": ["Service", "UserName", "Password", "Action"],
- "config":{
- "admin": {
- "username": "admin",
- "password": "admin"
- },
- "demo": {
- "username": "demo",
- "password": "demo"
- },
- "compute": {
- "username": "nova",
- "password": "nova"
- },
- "dashboard": {
- "username": "dashboard",
- "password": "dashboard"
- },
- "identity": {
- "username": "keystone",
- "password": "keystone"
- },
- "image": {
- "username": "glance",
- "password": "glance"
- },
- "metering": {
- "username": "ceilometer",
- "password": "ceilometer"
- },
- "alarming": {
- "username": "aodh",
- "password": "aodh"
- },
- "network": {
- "username": "quantum",
- "password": "quantum"
- },
- "object-store": {
- "username": "swift",
- "password": "swift"
- },
- "heat": {
- "username": "heat",
- "password": "heat"
- },
- "volume": {
- "username": "cinder",
- "password": "cinder"
- }
- }
- }
- }]
-}
diff --git a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-mitaka_xenial.conf b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-mitaka_xenial.conf
deleted file mode 100755
index 37195736..00000000
--- a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-mitaka_xenial.conf
+++ /dev/null
@@ -1,120 +0,0 @@
-ADAPTER = 'openstack_mitaka_xenial'
-FLAVOR = 'HA-ansible-multinodes-mitaka_xenial'
-CONFIG_MAPPING = {
- "mapped_name": "flavor_config",
- "mapped_children": [{
- "security": {
- "accordion_heading": "OpenStack Database and Queue Credentials",
- "category": "service_credentials",
- "data_structure": "table",
- "action": "true",
- "modifiable_data": ["username", "password"],
- "table_display_header": ["Service", "UserName", "Password", "Action"],
- "config": {
- "rabbitmq": {
- "username": "guest",
- "password": "guest"
- },
- "compute": {
- "username": "nova",
- "password": "nova"
- },
- "dashboard": {
- "username": "dashboard",
- "password": "dashboard"
- },
- "identity": {
- "username": "keystone",
- "password": "keystone"
- },
- "image": {
- "username": "glance",
- "password": "glance"
- },
- "metering": {
- "username": "ceilometer",
- "password": "ceilometer"
- },
- "alarming": {
- "username": "aodh",
- "password": "aodh"
- },
- "network": {
- "username": "neutron",
- "password": "neutron"
- },
- "mysql": {
- "username": "root",
- "password": "root"
- },
- "volume": {
- "username": "cinder",
- "password": "cinder"
- },
- "heat": {
- "username": "heat",
- "password": "heat"
- }
- }
- }
- },{
- "security": {
- "accordion_heading": "OpenStack Keystone User Credentials",
- "category": "console_credentials",
- "data_structure": "table",
- "action": "true",
- "modifiable_data": ["username", "password"],
- "table_display_header": ["Service", "UserName", "Password", "Action"],
- "config":{
- "admin": {
- "username": "admin",
- "password": "admin"
- },
- "demo": {
- "username": "demo",
- "password": "demo"
- },
- "compute": {
- "username": "nova",
- "password": "nova"
- },
- "dashboard": {
- "username": "dashboard",
- "password": "dashboard"
- },
- "identity": {
- "username": "keystone",
- "password": "keystone"
- },
- "image": {
- "username": "glance",
- "password": "glance"
- },
- "metering": {
- "username": "ceilometer",
- "password": "ceilometer"
- },
- "alarming": {
- "username": "aodh",
- "password": "aodh"
- },
- "network": {
- "username": "quantum",
- "password": "quantum"
- },
- "object-store": {
- "username": "swift",
- "password": "swift"
- },
- "heat": {
- "username": "heat",
- "password": "heat"
- },
- "volume": {
- "username": "cinder",
- "password": "cinder"
- }
- }
- }
- }]
-}
diff --git a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton_xenial.conf b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton.conf
index 5095b203..9dcdfc5f 100755
--- a/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton_xenial.conf
+++ b/deploy/compass_conf/flavor_mapping/HA-ansible-multinodes-newton.conf
@@ -1,5 +1,5 @@
-ADAPTER = 'openstack_newton_xenial'
-FLAVOR = 'HA-ansible-multinodes-newton_xenial'
+ADAPTER = 'openstack_newton'
+FLAVOR = 'HA-ansible-multinodes-newton'
CONFIG_MAPPING = {
"mapped_name": "flavor_config",
"mapped_children": [{
diff --git a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-kilo.conf b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-kilo.conf
deleted file mode 100755
index c944c0dc..00000000
--- a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-kilo.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-ADAPTER = 'openstack_kilo'
-FLAVOR = 'HA-ansible-multinodes-kilo'
-METADATA = {
- 'ha_proxy': {
- '_self': {
- },
- 'vip': {
- '_self': {
- 'is_required': True,
- 'field': 'general',
- 'mapping_to': 'ha_vip'
- }
- },
- 'test': {
- '_self': {
- },
- }
- }
-}
diff --git a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-liberty.conf b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-liberty.conf
deleted file mode 100755
index 2d1cc7d3..00000000
--- a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-liberty.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-ADAPTER = 'openstack_liberty'
-FLAVOR = 'HA-ansible-multinodes-liberty'
-METADATA = {
- 'ha_proxy': {
- '_self': {
- },
- 'vip': {
- '_self': {
- 'is_required': True,
- 'field': 'general',
- 'mapping_to': 'ha_vip'
- }
- },
- 'test': {
- '_self': {
- },
- }
- }
-}
diff --git a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-mitaka.conf b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-mitaka.conf
deleted file mode 100755
index 1558b516..00000000
--- a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-mitaka.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-ADAPTER = 'openstack_mitaka'
-FLAVOR = 'HA-ansible-multinodes-mitaka'
-METADATA = {
- 'ha_proxy': {
- '_self': {
- },
- 'vip': {
- '_self': {
- 'is_required': True,
- 'field': 'general',
- 'mapping_to': 'ha_vip'
- }
- },
- 'test': {
- '_self': {
- },
- }
- }
-}
diff --git a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-mitaka_xenial.conf b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-mitaka_xenial.conf
deleted file mode 100755
index e844e162..00000000
--- a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-mitaka_xenial.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-ADAPTER = 'openstack_mitaka_xenial'
-FLAVOR = 'HA-ansible-multinodes-mitaka_xenial'
-METADATA = {
- 'ha_proxy': {
- '_self': {
- },
- 'vip': {
- '_self': {
- 'is_required': True,
- 'field': 'general',
- 'mapping_to': 'ha_vip'
- }
- },
- 'test': {
- '_self': {
- },
- }
- }
-}
diff --git a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-juno.conf b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-newton.conf
index e3ff468b..f98be259 100755
--- a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-juno.conf
+++ b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-newton.conf
@@ -1,5 +1,5 @@
-ADAPTER = 'openstack_juno'
-FLAVOR = 'HA-ansible-multinodes-juno'
+ADAPTER = 'openstack_newton'
+FLAVOR = 'HA-ansible-multinodes-newton'
METADATA = {
'ha_proxy': {
'_self': {
diff --git a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-newton_xenial.conf b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-newton_xenial.conf
deleted file mode 100755
index c6466577..00000000
--- a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-newton_xenial.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-ADAPTER = 'openstack_newton_xenial'
-FLAVOR = 'HA-ansible-multinodes-newton_xenial'
-METADATA = {
- 'ha_proxy': {
- '_self': {
- },
- 'vip': {
- '_self': {
- 'is_required': True,
- 'field': 'general',
- 'mapping_to': 'ha_vip'
- }
- },
- 'test': {
- '_self': {
- },
- }
- }
-}
diff --git a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-osp9.conf b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-osp9.conf
deleted file mode 100755
index 20e9f901..00000000
--- a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-osp9.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-ADAPTER = 'openstack_osp9'
-FLAVOR = 'HA-ansible-multinodes-osp9'
-METADATA = {
- 'ha_proxy': {
- '_self': {
- },
- 'vip': {
- '_self': {
- 'is_required': True,
- 'field': 'general',
- 'mapping_to': 'ha_vip'
- }
- },
- 'test': {
- '_self': {
- },
- }
- }
-}
diff --git a/deploy/compass_conf/os/centos6.5.conf b/deploy/compass_conf/os/centos6.5.conf
deleted file mode 100755
index 75d4eb17..00000000
--- a/deploy/compass_conf/os/centos6.5.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-NAME = 'CentOS-6.5-x86_64'
-PARENT = 'CentOS'
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/os/centos6.6.conf b/deploy/compass_conf/os/centos6.6.conf
deleted file mode 100755
index 0f072786..00000000
--- a/deploy/compass_conf/os/centos6.6.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-NAME = 'CentOS-6.6-x86_64'
-PARENT = 'CentOS'
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/os/general.conf b/deploy/compass_conf/os/general.conf
deleted file mode 100755
index 655beb06..00000000
--- a/deploy/compass_conf/os/general.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-NAME = 'general'
-PARENT = ''
diff --git a/deploy/compass_conf/os/sles11sp3.conf b/deploy/compass_conf/os/sles11sp3.conf
deleted file mode 100755
index 2c1218d2..00000000
--- a/deploy/compass_conf/os/sles11sp3.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-NAME = 'sles-11sp3-x86_64'
-PARENT = 'suse'
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/os/suse.conf b/deploy/compass_conf/os/suse.conf
deleted file mode 100755
index af891b31..00000000
--- a/deploy/compass_conf/os/suse.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-NAME = 'suse'
-PARENT = 'general'
diff --git a/deploy/compass_conf/os/ubuntu12.04.conf b/deploy/compass_conf/os/ubuntu12.04.conf
deleted file mode 100755
index db810061..00000000
--- a/deploy/compass_conf/os/ubuntu12.04.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-NAME = 'Ubuntu-12.04-x86_64'
-PARENT = 'Ubuntu'
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/os/ubuntu14.04.3.conf b/deploy/compass_conf/os/ubuntu14.04.3.conf
deleted file mode 100755
index 54b94a7c..00000000
--- a/deploy/compass_conf/os/ubuntu14.04.3.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-NAME = 'ubuntu-14.04.3-server-x86_64'
-PARENT = 'Ubuntu'
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/os/ubuntu14.04.conf b/deploy/compass_conf/os/ubuntu14.04.conf
deleted file mode 100755
index 0fa90fb3..00000000
--- a/deploy/compass_conf/os/ubuntu14.04.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-NAME = 'Ubuntu-14.04-x86_64'
-PARENT = 'Ubuntu'
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/os/uvp11sp3.conf b/deploy/compass_conf/os/uvp11sp3.conf
deleted file mode 100755
index 41a99b15..00000000
--- a/deploy/compass_conf/os/uvp11sp3.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-NAME = 'uvp-11sp3-x86_64'
-PARENT = 'suse'
-DEPLOYABLE = True
diff --git a/deploy/compass_conf/package_installer/ansible-kilo.conf b/deploy/compass_conf/package_installer/ansible-kilo.conf
deleted file mode 100755
index cfe21478..00000000
--- a/deploy/compass_conf/package_installer/ansible-kilo.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_kilo'
-SETTINGS = {
- 'ansible_dir': '/var/ansible',
- 'ansible_run_dir': '/var/ansible/run',
- 'ansible_config': 'ansible.cfg',
- 'playbook_file': 'site.yml',
- 'inventory_file': 'inventory.yml',
- 'group_variable': 'all',
- 'etc_hosts_path': 'roles/common/templates/hosts',
- 'runner_dirs': ['roles','openstack_kilo/templates','openstack_kilo/roles']
-}
-
diff --git a/deploy/compass_conf/package_installer/ansible-liberty.conf b/deploy/compass_conf/package_installer/ansible-liberty.conf
deleted file mode 100755
index f0c8fb39..00000000
--- a/deploy/compass_conf/package_installer/ansible-liberty.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_liberty'
-SETTINGS = {
- 'ansible_dir': '/var/ansible',
- 'ansible_run_dir': '/var/ansible/run',
- 'ansible_config': 'ansible.cfg',
- 'playbook_file': 'site.yml',
- 'inventory_file': 'inventory.yml',
- 'group_variable': 'all',
- 'etc_hosts_path': 'roles/common/templates/hosts',
- 'runner_dirs': ['roles','openstack_liberty/templates','openstack_liberty/roles']
-}
-
diff --git a/deploy/compass_conf/package_installer/ansible-mitaka.conf b/deploy/compass_conf/package_installer/ansible-mitaka.conf
deleted file mode 100755
index e83f8886..00000000
--- a/deploy/compass_conf/package_installer/ansible-mitaka.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_mitaka'
-SETTINGS = {
- 'ansible_dir': '/var/ansible',
- 'ansible_run_dir': '/var/ansible/run',
- 'ansible_config': 'ansible.cfg',
- 'playbook_file': 'site.yml',
- 'inventory_file': 'inventory.yml',
- 'group_variable': 'all',
- 'etc_hosts_path': 'roles/common/templates/hosts',
- 'runner_dirs': ['roles','openstack_mitaka/templates','openstack_mitaka/roles']
-}
-
diff --git a/deploy/compass_conf/package_installer/ansible-mitaka_xenial.conf b/deploy/compass_conf/package_installer/ansible-mitaka_xenial.conf
deleted file mode 100755
index 03c3b3bb..00000000
--- a/deploy/compass_conf/package_installer/ansible-mitaka_xenial.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_mitaka_xenial'
-SETTINGS = {
- 'ansible_dir': '/var/ansible',
- 'ansible_run_dir': '/var/ansible/run',
- 'ansible_config': 'ansible.cfg',
- 'playbook_file': 'site.yml',
- 'inventory_file': 'inventory.yml',
- 'group_variable': 'all',
- 'etc_hosts_path': 'roles/common/templates/hosts',
- 'runner_dirs': ['roles','openstack_mitaka_xenial/templates','openstack_mitaka_xenial/roles']
-}
-
diff --git a/deploy/compass_conf/package_installer/ansible-juno.conf b/deploy/compass_conf/package_installer/ansible-newton.conf
index 0c74b2ed..242193fb 100755
--- a/deploy/compass_conf/package_installer/ansible-juno.conf
+++ b/deploy/compass_conf/package_installer/ansible-newton.conf
@@ -1,5 +1,5 @@
NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_juno'
+INSTANCE_NAME = 'ansible_installer_newton'
SETTINGS = {
'ansible_dir': '/var/ansible',
'ansible_run_dir': '/var/ansible/run',
@@ -8,6 +8,6 @@ SETTINGS = {
'inventory_file': 'inventory.yml',
'group_variable': 'all',
'etc_hosts_path': 'roles/common/templates/hosts',
- 'runner_dirs': ['roles','openstack_juno/templates','openstack_juno/roles']
+ 'runner_dirs': ['roles','openstack_newton/templates','openstack_newton/roles']
}
diff --git a/deploy/compass_conf/package_installer/ansible-newton_xenial.conf b/deploy/compass_conf/package_installer/ansible-newton_xenial.conf
deleted file mode 100755
index d51f167d..00000000
--- a/deploy/compass_conf/package_installer/ansible-newton_xenial.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_newton_xenial'
-SETTINGS = {
- 'ansible_dir': '/var/ansible',
- 'ansible_run_dir': '/var/ansible/run',
- 'ansible_config': 'ansible.cfg',
- 'playbook_file': 'site.yml',
- 'inventory_file': 'inventory.yml',
- 'group_variable': 'all',
- 'etc_hosts_path': 'roles/common/templates/hosts',
- 'runner_dirs': ['roles','openstack_newton_xenial/templates','openstack_newton_xenial/roles']
-}
-
diff --git a/deploy/compass_conf/package_installer/ansible-osp9.conf b/deploy/compass_conf/package_installer/ansible-osp9.conf
deleted file mode 100755
index 65f83515..00000000
--- a/deploy/compass_conf/package_installer/ansible-osp9.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-NAME = 'ansible_installer'
-INSTANCE_NAME = 'ansible_installer_osp9'
-SETTINGS = {
- 'ansible_dir': '/var/ansible',
- 'ansible_run_dir': '/var/ansible/run',
- 'ansible_config': 'ansible.cfg',
- 'playbook_file': 'site.yml',
- 'inventory_file': 'inventory.yml',
- 'group_variable': 'all',
- 'etc_hosts_path': 'roles/common/templates/hosts',
- 'runner_dirs': ['roles','openstack_osp9/templates','openstack_osp9/roles']
-}
-
diff --git a/deploy/compass_conf/role/openstack_juno_ansible.conf b/deploy/compass_conf/role/openstack_juno_ansible.conf
deleted file mode 100755
index 48c171cf..00000000
--- a/deploy/compass_conf/role/openstack_juno_ansible.conf
+++ /dev/null
@@ -1,110 +0,0 @@
-ADAPTER_NAME = 'openstack_juno'
-ROLES = [{
- 'role': 'allinone-compute',
- 'display_name': 'all in one',
- 'description': 'All in One'
-}, {
- 'role': 'controller',
- 'display_name': 'controller node',
- 'description': 'Controller Node'
-}, {
- 'role': 'compute',
- 'display_name': 'compute node',
- 'description': 'Compute Node'
-}, {
- 'role': 'storage',
- 'display_name': 'storage node',
- 'description': 'Storage Node'
-}, {
- 'role': 'network',
- 'display_name': 'network node',
- 'description': 'Network Node'
-}, {
- 'role': 'compute-worker',
- 'display_name': 'Compute worker node',
- 'description': 'Compute worker node'
-}, {
- 'role': 'compute-controller',
- 'display_name': 'Compute controller node',
- 'description': 'Compute controller node'
-}, {
- 'role': 'network-server',
- 'display_name': 'Network server node',
- 'description': 'Network server node'
-}, {
- 'role': 'database',
- 'display_name': 'Database node',
- 'description': 'Database node'
-}, {
- 'role': 'messaging',
- 'display_name': 'Messaging queue node',
- 'description': 'Messaging queue node'
-}, {
- 'role': 'image',
- 'display': 'Image node',
- 'description': 'Image node'
-}, {
- 'role': 'dashboard',
- 'display': 'Dashboard node',
- 'description': 'Dashboard node'
-}, {
- 'role': 'identity',
- 'display': 'Identity node',
- 'description': 'Identity node'
-}, {
- 'role': 'storage-controller',
- 'display': 'Storage controller node',
- 'description': 'Storage controller node'
-}, {
- 'role': 'storage-volume',
- 'display': 'Storage volume node',
- 'description': 'Storage volume node'
-}, {
- 'role': 'network-worker',
- 'display': 'Network worker node',
- 'description': 'Network worker node'
-}, {
- 'role': 'odl',
- 'display': 'open day light',
- 'description': 'odl node',
- 'optional': True
-}, {
- 'role': 'onos',
- 'display': 'open network operating system',
- 'description': 'onos node',
- 'optional': True
-}, {
- 'role': 'ha',
- 'display': 'Cluster with HA',
- 'description': 'Cluster with HA node'
-}, {
- 'role': 'ceph-adm',
- 'display': 'Ceph Admin Node',
- 'description': 'Ceph Admin Node',
- 'optional': True
-}, {
- 'role': 'ceph-mon',
- 'display': 'Ceph Monitor Node',
- 'description': 'Ceph Monitor Node',
- 'optional': True
-}, {
- 'role': 'ceph-osd',
- 'display': 'Ceph Storage Node',
- 'description': 'Ceph Storage Node',
- 'optional': True
-}, {
- 'role': 'ceph-osd-node',
- 'display': 'Ceph osd install from node',
- 'description': '',
- 'optional': True
-}, {
- 'role': 'ceph',
- 'display': 'ceph node',
- 'description': 'ceph node',
- 'optional': True
-}, {
- 'role': 'sec-patch',
- 'display': 'sec-patch node',
- 'description': 'Security Patch Node',
- 'optional': True
-}]
diff --git a/deploy/compass_conf/role/openstack_kilo_ansible.conf b/deploy/compass_conf/role/openstack_kilo_ansible.conf
deleted file mode 100755
index ac3af5a3..00000000
--- a/deploy/compass_conf/role/openstack_kilo_ansible.conf
+++ /dev/null
@@ -1,110 +0,0 @@
-ADAPTER_NAME = 'openstack_kilo'
-ROLES = [{
- 'role': 'allinone-compute',
- 'display_name': 'all in one',
- 'description': 'All in One'
-}, {
- 'role': 'controller',
- 'display_name': 'controller node',
- 'description': 'Controller Node'
-}, {
- 'role': 'compute',
- 'display_name': 'compute node',
- 'description': 'Compute Node'
-}, {
- 'role': 'storage',
- 'display_name': 'storage node',
- 'description': 'Storage Node'
-}, {
- 'role': 'network',
- 'display_name': 'network node',
- 'description': 'Network Node'
-}, {
- 'role': 'compute-worker',
- 'display_name': 'Compute worker node',
- 'description': 'Compute worker node'
-}, {
- 'role': 'compute-controller',
- 'display_name': 'Compute controller node',
- 'description': 'Compute controller node'
-}, {
- 'role': 'network-server',
- 'display_name': 'Network server node',
- 'description': 'Network server node'
-}, {
- 'role': 'database',
- 'display_name': 'Database node',
- 'description': 'Database node'
-}, {
- 'role': 'messaging',
- 'display_name': 'Messaging queue node',
- 'description': 'Messaging queue node'
-}, {
- 'role': 'image',
- 'display': 'Image node',
- 'description': 'Image node'
-}, {
- 'role': 'dashboard',
- 'display': 'Dashboard node',
- 'description': 'Dashboard node'
-}, {
- 'role': 'identity',
- 'display': 'Identity node',
- 'description': 'Identity node'
-}, {
- 'role': 'storage-controller',
- 'display': 'Storage controller node',
- 'description': 'Storage controller node'
-}, {
- 'role': 'storage-volume',
- 'display': 'Storage volume node',
- 'description': 'Storage volume node'
-}, {
- 'role': 'network-worker',
- 'display': 'Network worker node',
- 'description': 'Network worker node'
-}, {
- 'role': 'odl',
- 'display': 'open day light',
- 'description': 'odl node',
- 'optional': True
-}, {
- 'role': 'onos',
- 'display': 'open network operating system',
- 'description': 'onos node',
- 'optional': True
-}, {
- 'role': 'ha',
- 'display': 'Cluster with HA',
- 'description': 'Cluster with HA node'
-}, {
- 'role': 'ceph-adm',
- 'display': 'Ceph Admin Node',
- 'description': 'Ceph Admin Node',
- 'optional': True
-}, {
- 'role': 'ceph-mon',
- 'display': 'Ceph Monitor Node',
- 'description': 'Ceph Monitor Node',
- 'optional': True
-}, {
- 'role': 'ceph-osd',
- 'display': 'Ceph Storage Node',
- 'description': 'Ceph Storage Node',
- 'optional': True
-}, {
- 'role': 'ceph-osd-node',
- 'display': 'Ceph osd install from node',
- 'description': '',
- 'optional': True
-}, {
- 'role': 'ceph',
- 'display': 'ceph node',
- 'description': 'ceph node',
- 'optional': True
-}, {
- 'role': 'sec-patch',
- 'display': 'sec-patch node',
- 'description': 'Security Patch Node',
- 'optional': True
-}]
diff --git a/deploy/compass_conf/role/openstack_liberty_ansible.conf b/deploy/compass_conf/role/openstack_liberty_ansible.conf
deleted file mode 100755
index c481c8a7..00000000
--- a/deploy/compass_conf/role/openstack_liberty_ansible.conf
+++ /dev/null
@@ -1,115 +0,0 @@
-ADAPTER_NAME = 'openstack_liberty'
-ROLES = [{
- 'role': 'allinone-compute',
- 'display_name': 'all in one',
- 'description': 'All in One'
-}, {
- 'role': 'controller',
- 'display_name': 'controller node',
- 'description': 'Controller Node'
-}, {
- 'role': 'compute',
- 'display_name': 'compute node',
- 'description': 'Compute Node'
-}, {
- 'role': 'storage',
- 'display_name': 'storage node',
- 'description': 'Storage Node'
-}, {
- 'role': 'network',
- 'display_name': 'network node',
- 'description': 'Network Node'
-}, {
- 'role': 'compute-worker',
- 'display_name': 'Compute worker node',
- 'description': 'Compute worker node'
-}, {
- 'role': 'compute-controller',
- 'display_name': 'Compute controller node',
- 'description': 'Compute controller node'
-}, {
- 'role': 'network-server',
- 'display_name': 'Network server node',
- 'description': 'Network server node'
-}, {
- 'role': 'database',
- 'display_name': 'Database node',
- 'description': 'Database node'
-}, {
- 'role': 'messaging',
- 'display_name': 'Messaging queue node',
- 'description': 'Messaging queue node'
-}, {
- 'role': 'image',
- 'display': 'Image node',
- 'description': 'Image node'
-}, {
- 'role': 'dashboard',
- 'display': 'Dashboard node',
- 'description': 'Dashboard node'
-}, {
- 'role': 'identity',
- 'display': 'Identity node',
- 'description': 'Identity node'
-}, {
- 'role': 'storage-controller',
- 'display': 'Storage controller node',
- 'description': 'Storage controller node'
-}, {
- 'role': 'storage-volume',
- 'display': 'Storage volume node',
- 'description': 'Storage volume node'
-}, {
- 'role': 'network-worker',
- 'display': 'Network worker node',
- 'description': 'Network worker node'
-}, {
- 'role': 'odl',
- 'display': 'open day light',
- 'description': 'odl node',
- 'optional': True
-}, {
- 'role': 'onos',
- 'display': 'open network operating system',
- 'description': 'onos node',
- 'optional': True
-}, {
- 'role': 'opencontrail',
- 'display': 'open contrail',
- 'description': 'opencontrail node',
- 'optional': True
-}, {
- 'role': 'ha',
- 'display': 'Cluster with HA',
- 'description': 'Cluster with HA node'
-}, {
- 'role': 'ceph-adm',
- 'display': 'Ceph Admin Node',
- 'description': 'Ceph Admin Node',
- 'optional': True
-}, {
- 'role': 'ceph-mon',
- 'display': 'Ceph Monitor Node',
- 'description': 'Ceph Monitor Node',
- 'optional': True
-}, {
- 'role': 'ceph-osd',
- 'display': 'Ceph Storage Node',
- 'description': 'Ceph Storage Node',
- 'optional': True
-}, {
- 'role': 'ceph-osd-node',
- 'display': 'Ceph osd install from node',
- 'description': '',
- 'optional': True
-}, {
- 'role': 'ceph',
- 'display': 'ceph node',
- 'description': 'ceph node',
- 'optional': True
-}, {
- 'role': 'sec-patch',
- 'display': 'sec-patch node',
- 'description': 'Security Patch Node',
- 'optional': True
-}]
diff --git a/deploy/compass_conf/role/openstack_mitaka_ansible.conf b/deploy/compass_conf/role/openstack_mitaka_ansible.conf
deleted file mode 100755
index 4ab8dac5..00000000
--- a/deploy/compass_conf/role/openstack_mitaka_ansible.conf
+++ /dev/null
@@ -1,115 +0,0 @@
-ADAPTER_NAME = 'openstack_mitaka'
-ROLES = [{
- 'role': 'allinone-compute',
- 'display_name': 'all in one',
- 'description': 'All in One'
-}, {
- 'role': 'controller',
- 'display_name': 'controller node',
- 'description': 'Controller Node'
-}, {
- 'role': 'compute',
- 'display_name': 'compute node',
- 'description': 'Compute Node'
-}, {
- 'role': 'storage',
- 'display_name': 'storage node',
- 'description': 'Storage Node'
-}, {
- 'role': 'network',
- 'display_name': 'network node',
- 'description': 'Network Node'
-}, {
- 'role': 'compute-worker',
- 'display_name': 'Compute worker node',
- 'description': 'Compute worker node'
-}, {
- 'role': 'compute-controller',
- 'display_name': 'Compute controller node',
- 'description': 'Compute controller node'
-}, {
- 'role': 'network-server',
- 'display_name': 'Network server node',
- 'description': 'Network server node'
-}, {
- 'role': 'database',
- 'display_name': 'Database node',
- 'description': 'Database node'
-}, {
- 'role': 'messaging',
- 'display_name': 'Messaging queue node',
- 'description': 'Messaging queue node'
-}, {
- 'role': 'image',
- 'display': 'Image node',
- 'description': 'Image node'
-}, {
- 'role': 'dashboard',
- 'display': 'Dashboard node',
- 'description': 'Dashboard node'
-}, {
- 'role': 'identity',
- 'display': 'Identity node',
- 'description': 'Identity node'
-}, {
- 'role': 'storage-controller',
- 'display': 'Storage controller node',
- 'description': 'Storage controller node'
-}, {
- 'role': 'storage-volume',
- 'display': 'Storage volume node',
- 'description': 'Storage volume node'
-}, {
- 'role': 'network-worker',
- 'display': 'Network worker node',
- 'description': 'Network worker node'
-}, {
- 'role': 'odl',
- 'display': 'open day light',
- 'description': 'odl node',
- 'optional': True
-}, {
- 'role': 'onos',
- 'display': 'open network operating system',
- 'description': 'onos node',
- 'optional': True
-}, {
- 'role': 'opencontrail',
- 'display': 'open contrail',
- 'description': 'opencontrail node',
- 'optional': True
-}, {
- 'role': 'ha',
- 'display': 'Cluster with HA',
- 'description': 'Cluster with HA node'
-}, {
- 'role': 'ceph-adm',
- 'display': 'Ceph Admin Node',
- 'description': 'Ceph Admin Node',
- 'optional': True
-}, {
- 'role': 'ceph-mon',
- 'display': 'Ceph Monitor Node',
- 'description': 'Ceph Monitor Node',
- 'optional': True
-}, {
- 'role': 'ceph-osd',
- 'display': 'Ceph Storage Node',
- 'description': 'Ceph Storage Node',
- 'optional': True
-}, {
- 'role': 'ceph-osd-node',
- 'display': 'Ceph osd install from node',
- 'description': '',
- 'optional': True
-}, {
- 'role': 'ceph',
- 'display': 'ceph node',
- 'description': 'ceph node',
- 'optional': True
-}, {
- 'role': 'sec-patch',
- 'display': 'sec-patch node',
- 'description': 'Security Patch Node',
- 'optional': True
-}]
diff --git a/deploy/compass_conf/role/openstack_mitaka_xenial_ansible.conf b/deploy/compass_conf/role/openstack_mitaka_xenial_ansible.conf
deleted file mode 100755
index 3448eb75..00000000
--- a/deploy/compass_conf/role/openstack_mitaka_xenial_ansible.conf
+++ /dev/null
@@ -1,115 +0,0 @@
-ADAPTER_NAME = 'openstack_mitaka_xenial'
-ROLES = [{
- 'role': 'allinone-compute',
- 'display_name': 'all in one',
- 'description': 'All in One'
-}, {
- 'role': 'controller',
- 'display_name': 'controller node',
- 'description': 'Controller Node'
-}, {
- 'role': 'compute',
- 'display_name': 'compute node',
- 'description': 'Compute Node'
-}, {
- 'role': 'storage',
- 'display_name': 'storage node',
- 'description': 'Storage Node'
-}, {
- 'role': 'network',
- 'display_name': 'network node',
- 'description': 'Network Node'
-}, {
- 'role': 'compute-worker',
- 'display_name': 'Compute worker node',
- 'description': 'Compute worker node'
-}, {
- 'role': 'compute-controller',
- 'display_name': 'Compute controller node',
- 'description': 'Compute controller node'
-}, {
- 'role': 'network-server',
- 'display_name': 'Network server node',
- 'description': 'Network server node'
-}, {
- 'role': 'database',
- 'display_name': 'Database node',
- 'description': 'Database node'
-}, {
- 'role': 'messaging',
- 'display_name': 'Messaging queue node',
- 'description': 'Messaging queue node'
-}, {
- 'role': 'image',
- 'display': 'Image node',
- 'description': 'Image node'
-}, {
- 'role': 'dashboard',
- 'display': 'Dashboard node',
- 'description': 'Dashboard node'
-}, {
- 'role': 'identity',
- 'display': 'Identity node',
- 'description': 'Identity node'
-}, {
- 'role': 'storage-controller',
- 'display': 'Storage controller node',
- 'description': 'Storage controller node'
-}, {
- 'role': 'storage-volume',
- 'display': 'Storage volume node',
- 'description': 'Storage volume node'
-}, {
- 'role': 'network-worker',
- 'display': 'Network worker node',
- 'description': 'Network worker node'
-}, {
- 'role': 'odl',
- 'display': 'open day light',
- 'description': 'odl node',
- 'optional': True
-}, {
- 'role': 'onos',
- 'display': 'open network operating system',
- 'description': 'onos node',
- 'optional': True
-}, {
- 'role': 'opencontrail',
- 'display': 'open contrail',
- 'description': 'opencontrail node',
- 'optional': True
-}, {
- 'role': 'ha',
- 'display': 'Cluster with HA',
- 'description': 'Cluster with HA node'
-}, {
- 'role': 'ceph-adm',
- 'display': 'Ceph Admin Node',
- 'description': 'Ceph Admin Node',
- 'optional': True
-}, {
- 'role': 'ceph-mon',
- 'display': 'Ceph Monitor Node',
- 'description': 'Ceph Monitor Node',
- 'optional': True
-}, {
- 'role': 'ceph-osd',
- 'display': 'Ceph Storage Node',
- 'description': 'Ceph Storage Node',
- 'optional': True
-}, {
- 'role': 'ceph-osd-node',
- 'display': 'Ceph osd install from node',
- 'description': '',
- 'optional': True
-}, {
- 'role': 'ceph',
- 'display': 'ceph node',
- 'description': 'ceph node',
- 'optional': True
-}, {
- 'role': 'sec-patch',
- 'display': 'sec-patch node',
- 'description': 'Security Patch Node',
- 'optional': True
-}]
diff --git a/deploy/compass_conf/role/openstack_osp9_ansible.conf b/deploy/compass_conf/role/openstack_newton_ansible.conf
index 0a5f67b3..508ccf24 100755
--- a/deploy/compass_conf/role/openstack_osp9_ansible.conf
+++ b/deploy/compass_conf/role/openstack_newton_ansible.conf
@@ -1,4 +1,4 @@
-ADAPTER_NAME = 'openstack_osp9'
+ADAPTER_NAME = 'openstack_newton'
ROLES = [{
'role': 'allinone-compute',
'display_name': 'all in one',
diff --git a/deploy/compass_conf/role/openstack_newton_xenial_ansible.conf b/deploy/compass_conf/role/openstack_newton_xenial_ansible.conf
deleted file mode 100755
index 385f025f..00000000
--- a/deploy/compass_conf/role/openstack_newton_xenial_ansible.conf
+++ /dev/null
@@ -1,115 +0,0 @@
-ADAPTER_NAME = 'openstack_newton_xenial'
-ROLES = [{
- 'role': 'allinone-compute',
- 'display_name': 'all in one',
- 'description': 'All in One'
-}, {
- 'role': 'controller',
- 'display_name': 'controller node',
- 'description': 'Controller Node'
-}, {
- 'role': 'compute',
- 'display_name': 'compute node',
- 'description': 'Compute Node'
-}, {
- 'role': 'storage',
- 'display_name': 'storage node',
- 'description': 'Storage Node'
-}, {
- 'role': 'network',
- 'display_name': 'network node',
- 'description': 'Network Node'
-}, {
- 'role': 'compute-worker',
- 'display_name': 'Compute worker node',
- 'description': 'Compute worker node'
-}, {
- 'role': 'compute-controller',
- 'display_name': 'Compute controller node',
- 'description': 'Compute controller node'
-}, {
- 'role': 'network-server',
- 'display_name': 'Network server node',
- 'description': 'Network server node'
-}, {
- 'role': 'database',
- 'display_name': 'Database node',
- 'description': 'Database node'
-}, {
- 'role': 'messaging',
- 'display_name': 'Messaging queue node',
- 'description': 'Messaging queue node'
-}, {
- 'role': 'image',
- 'display': 'Image node',
- 'description': 'Image node'
-}, {
- 'role': 'dashboard',
- 'display': 'Dashboard node',
- 'description': 'Dashboard node'
-}, {
- 'role': 'identity',
- 'display': 'Identity node',
- 'description': 'Identity node'
-}, {
- 'role': 'storage-controller',
- 'display': 'Storage controller node',
- 'description': 'Storage controller node'
-}, {
- 'role': 'storage-volume',
- 'display': 'Storage volume node',
- 'description': 'Storage volume node'
-}, {
- 'role': 'network-worker',
- 'display': 'Network worker node',
- 'description': 'Network worker node'
-}, {
- 'role': 'odl',
- 'display': 'open day light',
- 'description': 'odl node',
- 'optional': True
-}, {
- 'role': 'onos',
- 'display': 'open network operating system',
- 'description': 'onos node',
- 'optional': True
-}, {
- 'role': 'opencontrail',
- 'display': 'open contrail',
- 'description': 'opencontrail node',
- 'optional': True
-}, {
- 'role': 'ha',
- 'display': 'Cluster with HA',
- 'description': 'Cluster with HA node'
-}, {
- 'role': 'ceph-adm',
- 'display': 'Ceph Admin Node',
- 'description': 'Ceph Admin Node',
- 'optional': True
-}, {
- 'role': 'ceph-mon',
- 'display': 'Ceph Monitor Node',
- 'description': 'Ceph Monitor Node',
- 'optional': True
-}, {
- 'role': 'ceph-osd',
- 'display': 'Ceph Storage Node',
- 'description': 'Ceph Storage Node',
- 'optional': True
-}, {
- 'role': 'ceph-osd-node',
- 'display': 'Ceph osd install from node',
- 'description': '',
- 'optional': True
-}, {
- 'role': 'ceph',
- 'display': 'ceph node',
- 'description': 'ceph node',
- 'optional': True
-}, {
- 'role': 'sec-patch',
- 'display': 'sec-patch node',
- 'description': 'Security Patch Node',
- 'optional': True
-}]
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 264d4397..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_juno-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
-library = /opt/openstack-ansible-modules
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/allinone.tmpl
deleted file mode 100755
index 35b8e0e4..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/allinone.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_juno-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/multinodes.tmpl
deleted file mode 100755
index 35b8e0e4..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/multinodes.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_juno-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/single-controller.tmpl
deleted file mode 100755
index 35b8e0e4..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/ansible_cfg/single-controller.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_juno-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/inventories/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_juno/inventories/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 9197f501..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/inventories/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,110 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set has = $getVar('ha', [])
-#set odls = $getVar('odl', [])
-#set onoss = $getVar('onos', [])
-#set ceph_adm_list = $getVar('ceph_adm',[])
-#set ceph_mon_list = $getVar('ceph_mon',[])
-#set ceph_osd_list = $getVar('ceph_osd',[])
-#set sec_patch_list = $getVar('sec_patch',[])
-#set ceph_osd_node_list = $getVar('ceph_osd_node',[])
-
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance(has, list)
- #set has = [has]
-#end if
-#if not $isinstance(odls, list)
- #set odls = [odls]
-#end if
-#if not $isinstance(onoss, list)
- #set onoss = [onoss]
-#end if
-#if not $isinstance(ceph_adm_list, list)
- #set ceph_adm_list = [ceph_adm_list]
-#end if
-#if not $isinstance(ceph_mon_list, list)
- #set ceph_mon_list = [ceph_mon_list]
-#end if
-#if not $isinstance(ceph_osd_list, list)
- #set ceph_osd_list = [ceph_osd_list]
-#end if
-#if not $isinstance(sec_patch_list, list)
- #set sec_patch_list = [sec_patch_list]
-#end if
-#if not $isinstance(ceph_osd_node_list, list)
- #set ceph_osd_node_list = [ceph_osd_node_list]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.install.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.install.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ha]
-#for ha in $has
- #set ha_ip = $ha.install.ip
- #set ha_hostname = $ha.hostname
-$ha_hostname ansible_ssh_host=$ha_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[odl]
-#for odl in $odls
- #set odl_ip = $odl.install.ip
- #set odl_hostname = $odl.hostname
-$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[onos]
-#for onos in $onoss
- #set onos_ip = $onos.install.ip
- #set onos_hostname = $onos.hostname
-$onos_hostname ansible_ssh_host=$onos_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_adm]
-#for ceph_adm in $ceph_adm_list
- #set ceph_adm_ip = $ceph_adm.install.ip
- #set ceph_adm_hostname = $ceph_adm.hostname
-$ceph_adm_hostname ansible_ssh_host=$ceph_adm_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_mon]
-#for ceph_mon in $ceph_mon_list
- #set ceph_mon_ip = $ceph_mon.install.ip
- #set ceph_mon_hostname = $ceph_mon.hostname
-$ceph_mon_hostname ansible_ssh_host=$ceph_mon_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_osd]
-#for ceph_osd in $ceph_osd_list
- #set ceph_osd_ip = $ceph_osd.install.ip
- #set ceph_osd_hostname = $ceph_osd.hostname
-$ceph_osd_hostname ansible_ssh_host=$ceph_osd_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[sec_patch]
-#for sec_patch in $sec_patch_list
- #set sec_patch_ip = $sec_patch.install.ip
- #set sec_patch_hostname = $sec_patch.hostname
-$sec_patch_hostname ansible_ssh_host=$sec_patch_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_osd_node]
-#for ceph_osd_node in $ceph_osd_node_list
- #set ceph_osd_node_ip = $ceph_osd_node.install.ip
- #set ceph_osd_node_hostname = $ceph_osd_node.hostname
-$ceph_osd_node_hostname ansible_ssh_host=$ceph_osd_node_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[ceph:children]
-ceph_adm
-ceph_mon
-ceph_osd
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_juno/vars/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 5987f44d..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/vars/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,202 +0,0 @@
-#from random import randint
-#set cluster_name = $getVar('name', '')
-#set network_cfg = $getVar('network_cfg', {})
-#set ntp_server = $getVar('ntp_server', "")
-#set ceph_disk = $getVar('ceph_disk',"")
-#set $sys_intf_mappings= {}
-#for $intf_info in $network_cfg.sys_intf_mappings
-#set $sys_intf_mappings[$intf_info["name"]] = $intf_info
-#end for
-
-#set ip_settings={}
-#for k,v in $getVar('ip_settings', {}).items()
-#set host_ip_settings={}
-#for intf in v
-#set $host_ip_settings[$intf["alias"]]=intf
-#end for
-#set $ip_settings[$k]=$host_ip_settings
-#end for
-
-#set neutron_cfg = $getVar('neutron_config', {})
-#set ovs_config = $neutron_cfg.openvswitch
-
-#set has = $getVar('ha', [])
-#set ha_vip = $getVar('ha_vip', [])
-
-#set controllers = $getVar('controller', [])
-#set computers = $getVar('compute', [])
-
-enable_secgroup: $getVar('enable_secgroup', True)
-enable_fwaas: $getVar('enable_fwaas', True)
-enable_vpnaas: $getVar('enable_vpnaas', True)
-onos_nic: $getVar('onos_nic', 'eth2')
-ip_settings: $ip_settings
-network_cfg: $network_cfg
-sys_intf_mappings: $sys_intf_mappings
-deploy_type: $getVar('deploy_type', 'virtual')
-
-public_cidr: $computers[0]['install']['subnet']
-storage_cidr: "{{ ip_settings[inventory_hostname]['storage']['cidr'] }}"
-mgmt_cidr: "{{ ip_settings[inventory_hostname]['mgmt']['cidr'] }}"
-
-public_net_info: "{{ network_cfg.public_net_info }}"
-host_ip_settings: "{{ ip_settings[inventory_hostname] }}"
-
-ntp_server: $ntp_server
-internal_vip:
- ip: $network_cfg["internal_vip"]["ip"]
- netmask: $network_cfg["internal_vip"]["netmask"]
-#if "vlan_tag" in $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]
- interface: $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]["name"]
-#else
- interface: $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]["interface"]
-#end if
-
-public_vip:
- ip: $network_cfg["public_vip"]["ip"]
- netmask: $network_cfg["public_vip"]["netmask"]
-#if "vlan_tag" in $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]
- interface: $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]["name"]
-#else
- interface: $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]["interface"]
-#end if
-
-db_host: "{{ internal_vip.ip }}"
-rabbit_host: "{{ internal_vip.ip }}"
-
-internal_ip: "{{ ip_settings[inventory_hostname]['mgmt']['ip'] }}"
-internal_nic: mgmt
-
-#set random_id = randint(1, 255)
-vrouter_id_internal: $random_id
-vrouter_id_public: $random_id
-
-identity_host: "{{ internal_ip }}"
-controllers_host: "{{ internal_ip }}"
-storage_controller_host: "{{ internal_ip }}"
-compute_controller_host: "{{ internal_ip }}"
-image_host: "{{ internal_ip }}"
-network_server_host: "{{ internal_ip }}"
-dashboard_host: "{{ internal_ip }}"
-
-haproxy_hosts:
-#for $item in $has
-#set $hostname=$item["hostname"]
- $hostname: $ip_settings[$hostname]["mgmt"]["ip"]
-#end for
-
-host_index:
-#for $index, $item in enumerate($has)
- $item["hostname"]: $index
-#end for
-
-ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set keystone_pass = $console_credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set heat_dbpass = $credentials.heat.password
-#set heat_pass = $console_credentials.heat.password
-#set neutron_dbpass = $credentials.network.password
-#set neutron_pass = $console_credentials.network.password
-#set ceilometer_dbpass = $credentials.metering.password
-#set ceilometer_pass = $console_credentials.metering.password
-#set admin_pass = $console_credentials.admin.password
-#set demo_pass = $console_credentials.demo.password
-
-cluster_name: $cluster_name
-
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controllers_host }}"
-DB_HOST: "{{ db_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-juno.list
-juno_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/juno main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-erlang.cookie: DJJVECFMCJPVYQTJTDWG
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-KEYSTONE_PASS: $keystone_pass
-CEILOMETER_DBPASS: $ceilometer_dbpass
-CEILOMETER_PASS: $ceilometer_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_dbpass
-NEUTRON_PASS: $neutron_pass
-HEAT_DBPASS: $heat_dbpass
-HEAT_PASS: $heat_pass
-DEMO_PASS: $demo_pass
-ADMIN_PASS: $admin_pass
-
-#set neutron_service_plugins=['router']
-
-#if $getVar('enable_fwaas', True)
-#neutron_service_plugins.append('firewall')
-#end if
-
-#if $getVar('enable_vpnaas', True)
-#neutron_service_plugins.append('vpnaas')
-#end if
-
-NEUTRON_SERVICE_PLUGINS: $neutron_service_plugins
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan', 'vlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['$ovs_config["tenant_network_type"]']
-NEUTRON_OVS_BRIDGE_MAPPINGS: $ovs_config['bridge_mappings']
-#if 'vlan_ranges' in $ovs_config
-NEUTRON_VLAN_RANGES: $ovs_config['vlan_ranges']
-#else
-NEUTRON_VLAN_RANGES: []
-#end if
-#if 'tunnel_id_ranges' in $ovs_config
-NEUTRON_TUNNEL_ID_RANGES: $ovs_config['tunnel_id_ranges']
-#else
-NEUTRON_TUNNEL_ID_RANGES: []
-#end if
-
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-WSREP_SST_USER: wsrep_sst
-WSREP_SST_PASS: wsrep_sst_sercet
-
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: "{{ internal_ip }}"
-
-#build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image: http://192.168.121.12:9999/img/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
-
-odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
-odl_pkg_name: karaf.tar.gz
-odl_home: "/opt/opendaylight-0.2.2/"
-odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management', 'http', 'odl-base-all','odl-aaa-authn','odl-restconf','odl-nsf-all','odl-adsal-northbound','odl-mdsal-apidocs', 'odl-openflowplugin-all']
-odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
-odl_features: "{{ odl_base_features + odl_extra_features }}"
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/vars/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_juno/vars/allinone.tmpl
deleted file mode 100755
index 740397ca..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/vars/allinone.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set controllers = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-controller_host: $controller_ip
-#end for
-#for network in $controllers
- #set network_external_nic = $network.external.interface
- #set network_external_subnet = $network.external.subnet
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-compute_controller_host: "{{ controller_host }}"
-db_host: "{{ controller_host }}"
-rabbit_host: "{{ controller_host }}"
-storage_controller_host: "{{ controller_host }}"
-image_host: "{{ controller_host }}"
-identity_host: "{{ controller_host }}"
-network_server_host: "{{ controller_host }}"
-dashboard_host: "{{ controller_host }}"
-
-cluster_name: $cluster_name
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controller_host }}"
-DB_HOST: "{{ controller_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-juno.list
-juno_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/juno main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/vars/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_juno/vars/multinodes.tmpl
deleted file mode 100755
index da266a79..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/vars/multinodes.tmpl
+++ /dev/null
@@ -1,165 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
-compute_controller_host: $worker_ip
-#end for
-#for worker in $databases
- #set worker_ip = $worker.management.ip
-db_host: $worker_ip
-#end for
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
-rabbit_host: $worker_ip
-#end for
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
-storage_controller_host: $worker_ip
-#end for
-#for worker in $images
- #set worker_ip = $worker.management.ip
-image_host: $worker_ip
-#end for
-#for worker in $identities
- #set worker_ip = $worker.management.ip
-identity_host: $worker_ip
-#end for
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
-compute_controller_host: $worker_ip
-#end for
-#for worker in $network_servers
- #set worker_ip = $worker.management.ip
-network_server_host: $worker_ip
-#end for
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
-dashboard_host: $worker_ip
-#end for
-#for network in $network_workers
- #set network_external_nic = $network.external.interface
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-cluster_name: $cluster_name
-
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ compute_controller_host }}"
-DB_HOST: "{{ db_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-juno.list
-juno_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/juno main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
-
-odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
-odl_pkg_name: karaf.tar.gz
-odl_home: "/opt/opendaylight-0.2.2/"
-odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management', 'http', 'odl-base-all','odl-aaa-authn','odl-restconf','odl-nsf-all','odl-adsal-northbound','odl-mdsal-apidocs', 'odl-openflowplugin-all']
-odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
-odl_features: "{{ odl_base_features + odl_extra_features }}"
-odl_api_port: 8080
-
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/vars/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_juno/vars/single-controller.tmpl
deleted file mode 100755
index b24bc811..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/vars/single-controller.tmpl
+++ /dev/null
@@ -1,108 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set networks = $getVar('network', [])
-#set storages = $getVar('storage', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-controller_host: $controller_ip
-#end for
-#for network in $networks
- #set network_external_nic = $network.external.interface
- #set network_external_subnet = $network.external.subnet
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-cluster_name: $cluster_name
-deploy_type: $getVar('deploy_type', 'virtual')
-compute_controller_host: "{{ controller_host }}"
-db_host: "{{ controller_host }}"
-rabbit_host: "{{ controller_host }}"
-storage_controller_host: "{{ controller_host }}"
-image_host: "{{ controller_host }}"
-identity_host: "{{ controller_host }}"
-network_server_host: "{{ controller_host }}"
-dashboard_host: "{{ controller_host }}"
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controller_host }}"
-DB_HOST: "{{ controller_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-juno.list
-juno_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/juno main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-# EXTERNAL_NETWORK_CIDR: $network_external_subnet
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 81f55aba..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_kilo-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
-library = /opt/openstack-ansible-modules
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/allinone.tmpl
deleted file mode 100755
index 35b8e0e4..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/allinone.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_juno-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/multinodes.tmpl
deleted file mode 100755
index 35b8e0e4..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/multinodes.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_juno-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/single-controller.tmpl
deleted file mode 100755
index 35b8e0e4..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/ansible_cfg/single-controller.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_juno-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 9d628b5e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-#set ip_settings={}
-#for k,v in $getVar('ip_settings', {}).items()
-#set host_ip_settings={}
-#for intf in v
-#set $host_ip_settings[$intf["alias"]]=intf
-#end for
-#set $ip_settings[$k]=$host_ip_settings
-#end for
-
-# localhost
-127.0.0.1 localhost
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($compute, list)
- #set computes = [$computes]
-#end if
-# controller
-#for worker in $controllers
- #set worker_hostname = $worker.hostname
- #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
-# compute
-#for worker in $computes
- #set worker_hostname = $worker.hostname
- #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/allinone.tmpl
deleted file mode 100755
index b777815e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/allinone.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-#set controllers = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-# allinone
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/multinodes.tmpl
deleted file mode 100755
index ca8c793f..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/multinodes.tmpl
+++ /dev/null
@@ -1,110 +0,0 @@
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-# compute-controller
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# database
-#for worker in $databases
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# messaging
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-controller
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# image
-#for worker in $images
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# identity
-#for worker in $identities
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-server
-#for worker in $network_servers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# dashboard
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-volume
-#for worker in $storage_volumes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-worker
-#for worker in $network_workers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# compute-worker
-#for worker in $compute_workers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/single-controller.tmpl
deleted file mode 100755
index 3ed94694..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/hosts/single-controller.tmpl
+++ /dev/null
@@ -1,40 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set storages = $getVar('storage', [])
-#set networks = $getVar('network', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-# controller
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
-# compute
-#for worker in $computes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage
-#for worker in $storages
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network
-#for worker in $networks
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 277b4521..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,109 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set has = $getVar('ha', [])
-#set odls = $getVar('odl', [])
-#set onoss = $getVar('onos', [])
-#set ceph_adm_list = $getVar('ceph_adm',[])
-#set ceph_mon_list = $getVar('ceph_mon',[])
-#set ceph_osd_list = $getVar('ceph_osd',[])
-#set sec_patch_list = $getVar('sec_patch',[])
-#set ceph_osd_node_list = $getVar('ceph_osd_node',[])
-
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance(has, list)
- #set has = [has]
-#end if
-#if not $isinstance(odls, list)
- #set odls = [odls]
-#end if
-#if not $isinstance(onoss, list)
- #set onoss = [onoss]
-#end if
-#if not $isinstance(ceph_adm_list, list)
- #set ceph_adm_list = [ceph_adm_list]
-#end if
-#if not $isinstance(ceph_mon_list, list)
- #set ceph_mon_list = [ceph_mon_list]
-#end if
-#if not $isinstance(ceph_osd_list, list)
- #set ceph_osd_list = [ceph_osd_list]
-#end if
-#if not $isinstance(sec_patch_list, list)
- #set sec_patch_list = [sec_patch_list]
-#end if
-#if not $isinstance(ceph_osd_node_list, list)
- #set ceph_osd_node_list = [ceph_osd_node_list]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.install.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.install.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ha]
-#for ha in $has
- #set ha_ip = $ha.install.ip
- #set ha_hostname = $ha.hostname
-$ha_hostname ansible_ssh_host=$ha_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[odl]
-#for odl in $odls
- #set odl_ip = $odl.install.ip
- #set odl_hostname = $odl.hostname
-$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[onos]
-#for onos in $onoss
- #set onos_ip = $onos.install.ip
- #set onos_hostname = $onos.hostname
-$onos_hostname ansible_ssh_host=$onos_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_adm]
-#for ceph_adm in $ceph_adm_list
- #set ceph_adm_ip = $ceph_adm.install.ip
- #set ceph_adm_hostname = $ceph_adm.hostname
-$ceph_adm_hostname ansible_ssh_host=$ceph_adm_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_mon]
-#for ceph_mon in $ceph_mon_list
- #set ceph_mon_ip = $ceph_mon.install.ip
- #set ceph_mon_hostname = $ceph_mon.hostname
-$ceph_mon_hostname ansible_ssh_host=$ceph_mon_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_osd]
-#for ceph_osd in $ceph_osd_list
- #set ceph_osd_ip = $ceph_osd.install.ip
- #set ceph_osd_hostname = $ceph_osd.hostname
-$ceph_osd_hostname ansible_ssh_host=$ceph_osd_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[sec_patch]
-#for sec_patch in $sec_patch_list
- #set sec_patch_ip = $sec_patch.install.ip
- #set sec_patch_hostname = $sec_patch.hostname
-$sec_patch_hostname ansible_ssh_host=$sec_patch_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_osd_node]
-#for ceph_osd_node in $ceph_osd_node_list
- #set ceph_osd_node_ip = $ceph_osd_node.install.ip
- #set ceph_osd_node_hostname = $ceph_osd_node.hostname
-$ceph_osd_node_hostname ansible_ssh_host=$ceph_osd_node_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph:children]
-ceph_adm
-ceph_mon
-ceph_osd
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/allinone.tmpl
deleted file mode 100755
index 38e0038b..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/allinone.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-#set controllers = $getVar('allinone_compute', [])
-#set computes = $getVar('allinone_compute', [])
-#set storages = $getVar('allinone_compute', [])
-#set networks = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network]
-#for network in $networks
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/multinodes.tmpl
deleted file mode 100755
index 7cdfbef3..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/multinodes.tmpl
+++ /dev/null
@@ -1,123 +0,0 @@
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[compute-controller]
-#for controller in $compute_controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute-worker]
-#for compute in $compute_workers
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network-server]
-#for network in $network_servers
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network-worker]
-#for network in $network_workers
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[database]
-#for worker in $databases
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[messaging]
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[image]
-#for worker in $images
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[dashboard]
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[identity]
-#for worker in $identities
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage-controller]
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage-volume]
-#for worker in $storage_volumes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/single-controller.tmpl
deleted file mode 100755
index e1bf72c4..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/inventories/single-controller.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set storages = $getVar('storage', [])
-#set networks = $getVar('network', [])
-#set odls = $getVar('odl', [])
-#set onoss = $getVar('onos', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-#if not $isinstance($odls, list)
- #set odls = [$odls]
-#end if
-#if not $isinstance($onoss, list)
- #set onoss = [$onoss]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network]
-#for network in $networks
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[odl]
-#for odl in odls
- #set odl_ip = $odl.management.ip
- #set odl_hostname = $odl.hostname
-$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 5987f44d..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,202 +0,0 @@
-#from random import randint
-#set cluster_name = $getVar('name', '')
-#set network_cfg = $getVar('network_cfg', {})
-#set ntp_server = $getVar('ntp_server', "")
-#set ceph_disk = $getVar('ceph_disk',"")
-#set $sys_intf_mappings= {}
-#for $intf_info in $network_cfg.sys_intf_mappings
-#set $sys_intf_mappings[$intf_info["name"]] = $intf_info
-#end for
-
-#set ip_settings={}
-#for k,v in $getVar('ip_settings', {}).items()
-#set host_ip_settings={}
-#for intf in v
-#set $host_ip_settings[$intf["alias"]]=intf
-#end for
-#set $ip_settings[$k]=$host_ip_settings
-#end for
-
-#set neutron_cfg = $getVar('neutron_config', {})
-#set ovs_config = $neutron_cfg.openvswitch
-
-#set has = $getVar('ha', [])
-#set ha_vip = $getVar('ha_vip', [])
-
-#set controllers = $getVar('controller', [])
-#set computers = $getVar('compute', [])
-
-enable_secgroup: $getVar('enable_secgroup', True)
-enable_fwaas: $getVar('enable_fwaas', True)
-enable_vpnaas: $getVar('enable_vpnaas', True)
-onos_nic: $getVar('onos_nic', 'eth2')
-ip_settings: $ip_settings
-network_cfg: $network_cfg
-sys_intf_mappings: $sys_intf_mappings
-deploy_type: $getVar('deploy_type', 'virtual')
-
-public_cidr: $computers[0]['install']['subnet']
-storage_cidr: "{{ ip_settings[inventory_hostname]['storage']['cidr'] }}"
-mgmt_cidr: "{{ ip_settings[inventory_hostname]['mgmt']['cidr'] }}"
-
-public_net_info: "{{ network_cfg.public_net_info }}"
-host_ip_settings: "{{ ip_settings[inventory_hostname] }}"
-
-ntp_server: $ntp_server
-internal_vip:
- ip: $network_cfg["internal_vip"]["ip"]
- netmask: $network_cfg["internal_vip"]["netmask"]
-#if "vlan_tag" in $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]
- interface: $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]["name"]
-#else
- interface: $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]["interface"]
-#end if
-
-public_vip:
- ip: $network_cfg["public_vip"]["ip"]
- netmask: $network_cfg["public_vip"]["netmask"]
-#if "vlan_tag" in $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]
- interface: $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]["name"]
-#else
- interface: $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]["interface"]
-#end if
-
-db_host: "{{ internal_vip.ip }}"
-rabbit_host: "{{ internal_vip.ip }}"
-
-internal_ip: "{{ ip_settings[inventory_hostname]['mgmt']['ip'] }}"
-internal_nic: mgmt
-
-#set random_id = randint(1, 255)
-vrouter_id_internal: $random_id
-vrouter_id_public: $random_id
-
-identity_host: "{{ internal_ip }}"
-controllers_host: "{{ internal_ip }}"
-storage_controller_host: "{{ internal_ip }}"
-compute_controller_host: "{{ internal_ip }}"
-image_host: "{{ internal_ip }}"
-network_server_host: "{{ internal_ip }}"
-dashboard_host: "{{ internal_ip }}"
-
-haproxy_hosts:
-#for $item in $has
-#set $hostname=$item["hostname"]
- $hostname: $ip_settings[$hostname]["mgmt"]["ip"]
-#end for
-
-host_index:
-#for $index, $item in enumerate($has)
- $item["hostname"]: $index
-#end for
-
-ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set keystone_pass = $console_credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set heat_dbpass = $credentials.heat.password
-#set heat_pass = $console_credentials.heat.password
-#set neutron_dbpass = $credentials.network.password
-#set neutron_pass = $console_credentials.network.password
-#set ceilometer_dbpass = $credentials.metering.password
-#set ceilometer_pass = $console_credentials.metering.password
-#set admin_pass = $console_credentials.admin.password
-#set demo_pass = $console_credentials.demo.password
-
-cluster_name: $cluster_name
-
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controllers_host }}"
-DB_HOST: "{{ db_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-juno.list
-juno_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/juno main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-erlang.cookie: DJJVECFMCJPVYQTJTDWG
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-KEYSTONE_PASS: $keystone_pass
-CEILOMETER_DBPASS: $ceilometer_dbpass
-CEILOMETER_PASS: $ceilometer_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_dbpass
-NEUTRON_PASS: $neutron_pass
-HEAT_DBPASS: $heat_dbpass
-HEAT_PASS: $heat_pass
-DEMO_PASS: $demo_pass
-ADMIN_PASS: $admin_pass
-
-#set neutron_service_plugins=['router']
-
-#if $getVar('enable_fwaas', True)
-#neutron_service_plugins.append('firewall')
-#end if
-
-#if $getVar('enable_vpnaas', True)
-#neutron_service_plugins.append('vpnaas')
-#end if
-
-NEUTRON_SERVICE_PLUGINS: $neutron_service_plugins
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan', 'vlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['$ovs_config["tenant_network_type"]']
-NEUTRON_OVS_BRIDGE_MAPPINGS: $ovs_config['bridge_mappings']
-#if 'vlan_ranges' in $ovs_config
-NEUTRON_VLAN_RANGES: $ovs_config['vlan_ranges']
-#else
-NEUTRON_VLAN_RANGES: []
-#end if
-#if 'tunnel_id_ranges' in $ovs_config
-NEUTRON_TUNNEL_ID_RANGES: $ovs_config['tunnel_id_ranges']
-#else
-NEUTRON_TUNNEL_ID_RANGES: []
-#end if
-
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-WSREP_SST_USER: wsrep_sst
-WSREP_SST_PASS: wsrep_sst_sercet
-
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: "{{ internal_ip }}"
-
-#build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image: http://192.168.121.12:9999/img/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
-
-odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
-odl_pkg_name: karaf.tar.gz
-odl_home: "/opt/opendaylight-0.2.2/"
-odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management', 'http', 'odl-base-all','odl-aaa-authn','odl-restconf','odl-nsf-all','odl-adsal-northbound','odl-mdsal-apidocs', 'odl-openflowplugin-all']
-odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
-odl_features: "{{ odl_base_features + odl_extra_features }}"
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/allinone.tmpl
deleted file mode 100755
index 740397ca..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/allinone.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set controllers = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-controller_host: $controller_ip
-#end for
-#for network in $controllers
- #set network_external_nic = $network.external.interface
- #set network_external_subnet = $network.external.subnet
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-compute_controller_host: "{{ controller_host }}"
-db_host: "{{ controller_host }}"
-rabbit_host: "{{ controller_host }}"
-storage_controller_host: "{{ controller_host }}"
-image_host: "{{ controller_host }}"
-identity_host: "{{ controller_host }}"
-network_server_host: "{{ controller_host }}"
-dashboard_host: "{{ controller_host }}"
-
-cluster_name: $cluster_name
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controller_host }}"
-DB_HOST: "{{ controller_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-juno.list
-juno_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/juno main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/multinodes.tmpl
deleted file mode 100755
index da266a79..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/multinodes.tmpl
+++ /dev/null
@@ -1,165 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
-compute_controller_host: $worker_ip
-#end for
-#for worker in $databases
- #set worker_ip = $worker.management.ip
-db_host: $worker_ip
-#end for
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
-rabbit_host: $worker_ip
-#end for
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
-storage_controller_host: $worker_ip
-#end for
-#for worker in $images
- #set worker_ip = $worker.management.ip
-image_host: $worker_ip
-#end for
-#for worker in $identities
- #set worker_ip = $worker.management.ip
-identity_host: $worker_ip
-#end for
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
-compute_controller_host: $worker_ip
-#end for
-#for worker in $network_servers
- #set worker_ip = $worker.management.ip
-network_server_host: $worker_ip
-#end for
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
-dashboard_host: $worker_ip
-#end for
-#for network in $network_workers
- #set network_external_nic = $network.external.interface
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-cluster_name: $cluster_name
-
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ compute_controller_host }}"
-DB_HOST: "{{ db_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-juno.list
-juno_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/juno main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
-
-odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
-odl_pkg_name: karaf.tar.gz
-odl_home: "/opt/opendaylight-0.2.2/"
-odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management', 'http', 'odl-base-all','odl-aaa-authn','odl-restconf','odl-nsf-all','odl-adsal-northbound','odl-mdsal-apidocs', 'odl-openflowplugin-all']
-odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
-odl_features: "{{ odl_base_features + odl_extra_features }}"
-odl_api_port: 8080
-
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/single-controller.tmpl
deleted file mode 100755
index b24bc811..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_kilo/vars/single-controller.tmpl
+++ /dev/null
@@ -1,108 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set networks = $getVar('network', [])
-#set storages = $getVar('storage', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-controller_host: $controller_ip
-#end for
-#for network in $networks
- #set network_external_nic = $network.external.interface
- #set network_external_subnet = $network.external.subnet
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-cluster_name: $cluster_name
-deploy_type: $getVar('deploy_type', 'virtual')
-compute_controller_host: "{{ controller_host }}"
-db_host: "{{ controller_host }}"
-rabbit_host: "{{ controller_host }}"
-storage_controller_host: "{{ controller_host }}"
-image_host: "{{ controller_host }}"
-identity_host: "{{ controller_host }}"
-network_server_host: "{{ controller_host }}"
-dashboard_host: "{{ controller_host }}"
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controller_host }}"
-DB_HOST: "{{ controller_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-juno.list
-juno_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/juno main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-# EXTERNAL_NETWORK_CIDR: $network_external_subnet
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/HA-ansible-multinodes.tmpl
deleted file mode 100755
index f8dbfa1b..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_liberty-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
-library = /opt/openstack-ansible-modules
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/HA-ansible-multinodes.tmplr b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/HA-ansible-multinodes.tmplr
deleted file mode 100755
index f8dbfa1b..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/HA-ansible-multinodes.tmplr
+++ /dev/null
@@ -1,7 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_liberty-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
-library = /opt/openstack-ansible-modules
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/allinone.tmpl
deleted file mode 100755
index 550a2ff0..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/allinone.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_liberty-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/allinone.tmplr b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/allinone.tmplr
deleted file mode 100755
index 550a2ff0..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/allinone.tmplr
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_liberty-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/multinodes.tmpl
deleted file mode 100755
index 550a2ff0..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/multinodes.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_liberty-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/multinodes.tmplr b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/multinodes.tmplr
deleted file mode 100755
index 550a2ff0..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/multinodes.tmplr
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_liberty-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/single-controller.tmpl
deleted file mode 100755
index 550a2ff0..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/single-controller.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_liberty-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/single-controller.tmplr b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/single-controller.tmplr
deleted file mode 100755
index 550a2ff0..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/ansible_cfg/single-controller.tmplr
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_liberty-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 9d628b5e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-#set ip_settings={}
-#for k,v in $getVar('ip_settings', {}).items()
-#set host_ip_settings={}
-#for intf in v
-#set $host_ip_settings[$intf["alias"]]=intf
-#end for
-#set $ip_settings[$k]=$host_ip_settings
-#end for
-
-# localhost
-127.0.0.1 localhost
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($compute, list)
- #set computes = [$computes]
-#end if
-# controller
-#for worker in $controllers
- #set worker_hostname = $worker.hostname
- #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
-# compute
-#for worker in $computes
- #set worker_hostname = $worker.hostname
- #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/allinone.tmpl
deleted file mode 100755
index b777815e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/allinone.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-#set controllers = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-# allinone
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/multinodes.tmpl
deleted file mode 100755
index ca8c793f..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/multinodes.tmpl
+++ /dev/null
@@ -1,110 +0,0 @@
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-# compute-controller
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# database
-#for worker in $databases
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# messaging
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-controller
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# image
-#for worker in $images
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# identity
-#for worker in $identities
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-server
-#for worker in $network_servers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# dashboard
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-volume
-#for worker in $storage_volumes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-worker
-#for worker in $network_workers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# compute-worker
-#for worker in $compute_workers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/single-controller.tmpl
deleted file mode 100755
index 3ed94694..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/hosts/single-controller.tmpl
+++ /dev/null
@@ -1,40 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set storages = $getVar('storage', [])
-#set networks = $getVar('network', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-# controller
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
-# compute
-#for worker in $computes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage
-#for worker in $storages
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network
-#for worker in $networks
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/allinone.tmpl
deleted file mode 100755
index 38e0038b..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/allinone.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-#set controllers = $getVar('allinone_compute', [])
-#set computes = $getVar('allinone_compute', [])
-#set storages = $getVar('allinone_compute', [])
-#set networks = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network]
-#for network in $networks
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/multinodes.tmpl
deleted file mode 100755
index 7cdfbef3..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/multinodes.tmpl
+++ /dev/null
@@ -1,123 +0,0 @@
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[compute-controller]
-#for controller in $compute_controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute-worker]
-#for compute in $compute_workers
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network-server]
-#for network in $network_servers
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network-worker]
-#for network in $network_workers
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[database]
-#for worker in $databases
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[messaging]
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[image]
-#for worker in $images
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[dashboard]
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[identity]
-#for worker in $identities
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage-controller]
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage-volume]
-#for worker in $storage_volumes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/single-controller.tmpl
deleted file mode 100755
index e1bf72c4..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/single-controller.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set storages = $getVar('storage', [])
-#set networks = $getVar('network', [])
-#set odls = $getVar('odl', [])
-#set onoss = $getVar('onos', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-#if not $isinstance($odls, list)
- #set odls = [$odls]
-#end if
-#if not $isinstance($onoss, list)
- #set onoss = [$onoss]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network]
-#for network in $networks
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[odl]
-#for odl in odls
- #set odl_ip = $odl.management.ip
- #set odl_hostname = $odl.hostname
-$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 154cd444..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,203 +0,0 @@
-#from random import randint
-#set cluster_name = $getVar('name', '')
-#set network_cfg = $getVar('network_cfg', {})
-#set ntp_server = $getVar('ntp_server', "")
-#set ceph_disk = $getVar('ceph_disk',"")
-#set $sys_intf_mappings= {}
-#for $intf_info in $network_cfg.sys_intf_mappings
-#set $sys_intf_mappings[$intf_info["name"]] = $intf_info
-#end for
-
-#set ip_settings={}
-#for k,v in $getVar('ip_settings', {}).items()
-#set host_ip_settings={}
-#for intf in v
-#set $host_ip_settings[$intf["alias"]]=intf
-#end for
-#set $ip_settings[$k]=$host_ip_settings
-#end for
-
-#set neutron_cfg = $getVar('neutron_config', {})
-#set ovs_config = $neutron_cfg.openvswitch
-
-#set has = $getVar('ha', [])
-#set ha_vip = $getVar('ha_vip', [])
-
-#set controllers = $getVar('controller', [])
-#set computers = $getVar('compute', [])
-
-enable_secgroup: $getVar('enable_secgroup', True)
-enable_fwaas: $getVar('enable_fwaas', True)
-enable_vpnaas: $getVar('enable_vpnaas', True)
-odl_l3_agent: $getVar('odl_l3_agent', 'Disable')
-onos_nic: $getVar('onos_nic', 'eth2')
-ip_settings: $ip_settings
-network_cfg: $network_cfg
-sys_intf_mappings: $sys_intf_mappings
-deploy_type: $getVar('deploy_type', 'virtual')
-
-public_cidr: $computers[0]['install']['subnet']
-storage_cidr: "{{ ip_settings[inventory_hostname]['storage']['cidr'] }}"
-mgmt_cidr: "{{ ip_settings[inventory_hostname]['mgmt']['cidr'] }}"
-
-public_net_info: "{{ network_cfg.public_net_info }}"
-host_ip_settings: "{{ ip_settings[inventory_hostname] }}"
-
-ntp_server: $ntp_server
-internal_vip:
- ip: $network_cfg["internal_vip"]["ip"]
- netmask: $network_cfg["internal_vip"]["netmask"]
-#if "vlan_tag" in $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]
- interface: $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]["name"]
-#else
- interface: $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]["interface"]
-#end if
-
-public_vip:
- ip: $network_cfg["public_vip"]["ip"]
- netmask: $network_cfg["public_vip"]["netmask"]
-#if "vlan_tag" in $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]
- interface: $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]["name"]
-#else
- interface: $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]["interface"]
-#end if
-
-db_host: "{{ internal_vip.ip }}"
-rabbit_host: "{{ internal_vip.ip }}"
-
-internal_ip: "{{ ip_settings[inventory_hostname]['mgmt']['ip'] }}"
-internal_nic: mgmt
-
-#set random_id = randint(1, 255)
-vrouter_id_internal: $random_id
-vrouter_id_public: $random_id
-
-identity_host: "{{ internal_ip }}"
-controllers_host: "{{ internal_ip }}"
-storage_controller_host: "{{ internal_ip }}"
-compute_controller_host: "{{ internal_ip }}"
-image_host: "{{ internal_ip }}"
-network_server_host: "{{ internal_ip }}"
-dashboard_host: "{{ internal_ip }}"
-
-haproxy_hosts:
-#for $item in $has
-#set $hostname=$item["hostname"]
- $hostname: $ip_settings[$hostname]["mgmt"]["ip"]
-#end for
-
-host_index:
-#for $index, $item in enumerate($has)
- $item["hostname"]: $index
-#end for
-
-ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set keystone_pass = $console_credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set heat_dbpass = $credentials.heat.password
-#set heat_pass = $console_credentials.heat.password
-#set neutron_dbpass = $credentials.network.password
-#set neutron_pass = $console_credentials.network.password
-#set ceilometer_dbpass = $credentials.metering.password
-#set ceilometer_pass = $console_credentials.metering.password
-#set admin_pass = $console_credentials.admin.password
-#set demo_pass = $console_credentials.demo.password
-
-cluster_name: $cluster_name
-
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controllers_host }}"
-DB_HOST: "{{ db_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-juno.list
-juno_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/juno main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-erlang.cookie: DJJVECFMCJPVYQTJTDWG
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-KEYSTONE_PASS: $keystone_pass
-CEILOMETER_DBPASS: $ceilometer_dbpass
-CEILOMETER_PASS: $ceilometer_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_dbpass
-NEUTRON_PASS: $neutron_pass
-HEAT_DBPASS: $heat_dbpass
-HEAT_PASS: $heat_pass
-DEMO_PASS: $demo_pass
-ADMIN_PASS: $admin_pass
-
-#set neutron_service_plugins=['router']
-
-#if $getVar('enable_fwaas', True)
-#neutron_service_plugins.append('firewall')
-#end if
-
-#if $getVar('enable_vpnaas', True)
-#neutron_service_plugins.append('vpnaas')
-#end if
-
-NEUTRON_SERVICE_PLUGINS: $neutron_service_plugins
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan', 'vlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['$ovs_config["tenant_network_type"]']
-NEUTRON_OVS_BRIDGE_MAPPINGS: $ovs_config['bridge_mappings']
-#if 'vlan_ranges' in $ovs_config
-NEUTRON_VLAN_RANGES: $ovs_config['vlan_ranges']
-#else
-NEUTRON_VLAN_RANGES: []
-#end if
-#if 'tunnel_id_ranges' in $ovs_config
-NEUTRON_TUNNEL_ID_RANGES: $ovs_config['tunnel_id_ranges']
-#else
-NEUTRON_TUNNEL_ID_RANGES: []
-#end if
-
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-WSREP_SST_USER: wsrep_sst
-WSREP_SST_PASS: wsrep_sst_sercet
-
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: "{{ internal_ip }}"
-
-#build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image: http://192.168.121.12:9999/img/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
-
-odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
-odl_pkg_name: karaf.tar.gz
-odl_home: "/opt/opendaylight-0.2.2/"
-odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management', 'http', 'odl-base-all','odl-aaa-authn','odl-restconf','odl-nsf-all','odl-adsal-northbound','odl-mdsal-apidocs', 'odl-openflowplugin-all']
-odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
-odl_features: "{{ odl_base_features + odl_extra_features }}"
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/allinone.tmpl
deleted file mode 100755
index 09e4808d..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/allinone.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set controllers = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-controller_host: $controller_ip
-#end for
-#for network in $controllers
- #set network_external_nic = $network.external.interface
- #set network_external_subnet = $network.external.subnet
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-compute_controller_host: "{{ controller_host }}"
-db_host: "{{ controller_host }}"
-rabbit_host: "{{ controller_host }}"
-storage_controller_host: "{{ controller_host }}"
-image_host: "{{ controller_host }}"
-identity_host: "{{ controller_host }}"
-network_server_host: "{{ controller_host }}"
-dashboard_host: "{{ controller_host }}"
-
-cluster_name: $cluster_name
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controller_host }}"
-DB_HOST: "{{ controller_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-liberty.list
-liberty_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/liberty main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/multinodes.tmpl
deleted file mode 100755
index eab6401f..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/multinodes.tmpl
+++ /dev/null
@@ -1,165 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
-compute_controller_host: $worker_ip
-#end for
-#for worker in $databases
- #set worker_ip = $worker.management.ip
-db_host: $worker_ip
-#end for
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
-rabbit_host: $worker_ip
-#end for
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
-storage_controller_host: $worker_ip
-#end for
-#for worker in $images
- #set worker_ip = $worker.management.ip
-image_host: $worker_ip
-#end for
-#for worker in $identities
- #set worker_ip = $worker.management.ip
-identity_host: $worker_ip
-#end for
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
-compute_controller_host: $worker_ip
-#end for
-#for worker in $network_servers
- #set worker_ip = $worker.management.ip
-network_server_host: $worker_ip
-#end for
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
-dashboard_host: $worker_ip
-#end for
-#for network in $network_workers
- #set network_external_nic = $network.external.interface
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-cluster_name: $cluster_name
-
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ compute_controller_host }}"
-DB_HOST: "{{ db_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-liberty.list
-liberty_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/liberty main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
-
-odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
-odl_pkg_name: karaf.tar.gz
-odl_home: "/opt/opendaylight-0.2.2/"
-odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management', 'http', 'odl-base-all','odl-aaa-authn','odl-restconf','odl-nsf-all','odl-adsal-northbound','odl-mdsal-apidocs', 'odl-openflowplugin-all']
-odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
-odl_features: "{{ odl_base_features + odl_extra_features }}"
-odl_api_port: 8080
-
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/single-controller.tmpl
deleted file mode 100755
index fe176047..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/vars/single-controller.tmpl
+++ /dev/null
@@ -1,108 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set networks = $getVar('network', [])
-#set storages = $getVar('storage', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-controller_host: $controller_ip
-#end for
-#for network in $networks
- #set network_external_nic = $network.external.interface
- #set network_external_subnet = $network.external.subnet
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-cluster_name: $cluster_name
-deploy_type: $getVar('deploy_type', 'virtual')
-compute_controller_host: "{{ controller_host }}"
-db_host: "{{ controller_host }}"
-rabbit_host: "{{ controller_host }}"
-storage_controller_host: "{{ controller_host }}"
-image_host: "{{ controller_host }}"
-identity_host: "{{ controller_host }}"
-network_server_host: "{{ controller_host }}"
-dashboard_host: "{{ controller_host }}"
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controller_host }}"
-DB_HOST: "{{ controller_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-liberty.list
-liberty_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/liberty main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-# EXTERNAL_NETWORK_CIDR: $network_external_subnet
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/allinone.tmpl
deleted file mode 100755
index ab1a0d71..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/allinone.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_mitaka-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/multinodes.tmpl
deleted file mode 100755
index ab1a0d71..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/multinodes.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_mitaka-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 9d628b5e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-#set ip_settings={}
-#for k,v in $getVar('ip_settings', {}).items()
-#set host_ip_settings={}
-#for intf in v
-#set $host_ip_settings[$intf["alias"]]=intf
-#end for
-#set $ip_settings[$k]=$host_ip_settings
-#end for
-
-# localhost
-127.0.0.1 localhost
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($compute, list)
- #set computes = [$computes]
-#end if
-# controller
-#for worker in $controllers
- #set worker_hostname = $worker.hostname
- #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
-# compute
-#for worker in $computes
- #set worker_hostname = $worker.hostname
- #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/allinone.tmpl
deleted file mode 100755
index b777815e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/allinone.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-#set controllers = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-# allinone
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/multinodes.tmpl
deleted file mode 100755
index ca8c793f..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/multinodes.tmpl
+++ /dev/null
@@ -1,110 +0,0 @@
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-# compute-controller
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# database
-#for worker in $databases
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# messaging
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-controller
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# image
-#for worker in $images
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# identity
-#for worker in $identities
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-server
-#for worker in $network_servers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# dashboard
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-volume
-#for worker in $storage_volumes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-worker
-#for worker in $network_workers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# compute-worker
-#for worker in $compute_workers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/single-controller.tmpl
deleted file mode 100755
index 3ed94694..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/hosts/single-controller.tmpl
+++ /dev/null
@@ -1,40 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set storages = $getVar('storage', [])
-#set networks = $getVar('network', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-# controller
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
-# compute
-#for worker in $computes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage
-#for worker in $storages
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network
-#for worker in $networks
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 94a6a153..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,100 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set has = $getVar('ha', [])
-#set odls = $getVar('odl', [])
-#set onoss = $getVar('onos', [])
-#set opencontrails = $getVar('opencontrail', [])
-#set ceph_adm_list = $getVar('ceph_adm',[])
-#set ceph_mon_list = $getVar('ceph_mon',[])
-#set ceph_osd_list = $getVar('ceph_osd',[])
-
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance(has, list)
- #set has = [has]
-#end if
-#if not $isinstance(odls, list)
- #set odls = [odls]
-#end if
-#if not $isinstance(onoss, list)
- #set onoss = [onoss]
-#end if
-#if not $isinstance(opencontrails, list)
- #set opencontrails = [opencontrails]
-#end if
-#if not $isinstance(ceph_adm_list, list)
- #set ceph_adm_list = [ceph_adm_list]
-#end if
-#if not $isinstance(ceph_mon_list, list)
- #set ceph_mon_list = [ceph_mon_list]
-#end if
-#if not $isinstance(ceph_osd_list, list)
- #set ceph_osd_list = [ceph_osd_list]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.install.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.install.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ha]
-#for ha in $has
- #set ha_ip = $ha.install.ip
- #set ha_hostname = $ha.hostname
-$ha_hostname ansible_ssh_host=$ha_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[odl]
-#for odl in $odls
- #set odl_ip = $odl.install.ip
- #set odl_hostname = $odl.hostname
-$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[onos]
-#for onos in $onoss
- #set onos_ip = $onos.install.ip
- #set onos_hostname = $onos.hostname
-$onos_hostname ansible_ssh_host=$onos_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[opencontrail]
-#for opencontrail in $opencontrails
- #set opencontrail_ip = $opencontrail.install.ip
- #set opencontrail_hostname = $opencontrail.hostname
-$opencontrail_hostname ansible_ssh_host=$opencontrail_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_adm]
-#for ceph_adm in $ceph_adm_list
- #set ceph_adm_ip = $ceph_adm.install.ip
- #set ceph_adm_hostname = $ceph_adm.hostname
-$ceph_adm_hostname ansible_ssh_host=$ceph_adm_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_mon]
-#for ceph_mon in $ceph_mon_list
- #set ceph_mon_ip = $ceph_mon.install.ip
- #set ceph_mon_hostname = $ceph_mon.hostname
-$ceph_mon_hostname ansible_ssh_host=$ceph_mon_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_osd]
-#for ceph_osd in $ceph_osd_list
- #set ceph_osd_ip = $ceph_osd.install.ip
- #set ceph_osd_hostname = $ceph_osd.hostname
-$ceph_osd_hostname ansible_ssh_host=$ceph_osd_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph:children]
-ceph_adm
-ceph_mon
-ceph_osd
-
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/allinone.tmpl
deleted file mode 100755
index 38e0038b..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/allinone.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-#set controllers = $getVar('allinone_compute', [])
-#set computes = $getVar('allinone_compute', [])
-#set storages = $getVar('allinone_compute', [])
-#set networks = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network]
-#for network in $networks
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/multinodes.tmpl
deleted file mode 100755
index 7cdfbef3..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/multinodes.tmpl
+++ /dev/null
@@ -1,123 +0,0 @@
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[compute-controller]
-#for controller in $compute_controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute-worker]
-#for compute in $compute_workers
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network-server]
-#for network in $network_servers
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network-worker]
-#for network in $network_workers
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[database]
-#for worker in $databases
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[messaging]
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[image]
-#for worker in $images
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[dashboard]
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[identity]
-#for worker in $identities
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage-controller]
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage-volume]
-#for worker in $storage_volumes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/single-controller.tmpl
deleted file mode 100755
index e1bf72c4..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/inventories/single-controller.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set storages = $getVar('storage', [])
-#set networks = $getVar('network', [])
-#set odls = $getVar('odl', [])
-#set onoss = $getVar('onos', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-#if not $isinstance($odls, list)
- #set odls = [$odls]
-#end if
-#if not $isinstance($onoss, list)
- #set onoss = [$onoss]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network]
-#for network in $networks
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[odl]
-#for odl in odls
- #set odl_ip = $odl.management.ip
- #set odl_hostname = $odl.hostname
-$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 605106ba..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,213 +0,0 @@
-#from random import randint
-#set cluster_name = $getVar('name', '')
-#set network_cfg = $getVar('network_cfg', {})
-#set ntp_server = $getVar('ntp_server', "")
-#set ceph_disk = $getVar('ceph_disk',"")
-#set $sys_intf_mappings= {}
-#for $intf_info in $network_cfg.sys_intf_mappings
-#set $sys_intf_mappings[$intf_info["name"]] = $intf_info
-#end for
-
-#set ip_settings={}
-#for k,v in $getVar('ip_settings', {}).items()
-#set host_ip_settings={}
-#for intf in v
-#set $host_ip_settings[$intf["alias"]]=intf
-#end for
-#set $ip_settings[$k]=$host_ip_settings
-#end for
-
-#set neutron_cfg = $getVar('neutron_config', {})
-#set ovs_config = $neutron_cfg.openvswitch
-
-#set has = $getVar('ha', [])
-#set ha_vip = $getVar('ha_vip', [])
-
-#set controllers = $getVar('controller', [])
-#set computers = $getVar('compute', [])
-
-enable_secgroup: $getVar('enable_secgroup', True)
-enable_fwaas: $getVar('enable_fwaas', True)
-enable_vpnaas: $getVar('enable_vpnaas', True)
-odl_l3_agent: $getVar('odl_l3_agent', 'Disable')
-onos_sfc: $getVar('onos_sfc', 'Disable')
-onos_nic: $getVar('onos_nic', 'eth2')
-odl_sfc: $getVar('odl_sfc', 'Disable')
-ip_settings: $ip_settings
-network_cfg: $network_cfg
-sys_intf_mappings: $sys_intf_mappings
-deploy_type: $getVar('deploy_type', 'virtual')
-
-public_cidr: $computers[0]['install']['subnet']
-storage_cidr: "{{ ip_settings[inventory_hostname]['storage']['cidr'] }}"
-mgmt_cidr: "{{ ip_settings[inventory_hostname]['mgmt']['cidr'] }}"
-
-public_net_info: "{{ network_cfg.public_net_info }}"
-host_ip_settings: "{{ ip_settings[inventory_hostname] }}"
-
-ntp_server: $ntp_server
-internal_vip:
- ip: $network_cfg["internal_vip"]["ip"]
- netmask: $network_cfg["internal_vip"]["netmask"]
-#if "vlan_tag" in $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]
- interface: $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]["name"]
-#else
- interface: $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]["interface"]
-#end if
-
-public_vip:
- ip: $network_cfg["public_vip"]["ip"]
- netmask: $network_cfg["public_vip"]["netmask"]
-#if "vlan_tag" in $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]
- interface: $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]["name"]
-#else
- interface: $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]["interface"]
-#end if
-
-db_host: "{{ internal_vip.ip }}"
-rabbit_host: "{{ internal_vip.ip }}"
-
-internal_ip: "{{ ip_settings[inventory_hostname]['mgmt']['ip'] }}"
-internal_nic: mgmt
-
-#set random_id = randint(1, 255)
-vrouter_id_internal: $random_id
-vrouter_id_public: $random_id
-
-identity_host: "{{ internal_ip }}"
-controllers_host: "{{ internal_ip }}"
-storage_controller_host: "{{ internal_ip }}"
-compute_controller_host: "{{ internal_ip }}"
-image_host: "{{ internal_ip }}"
-network_server_host: "{{ internal_ip }}"
-dashboard_host: "{{ internal_ip }}"
-
-haproxy_hosts:
-#for $item in $has
-#set $hostname=$item["hostname"]
- $hostname: $ip_settings[$hostname]["mgmt"]["ip"]
-#end for
-
-host_index:
-#for $index, $item in enumerate($has)
- $item["hostname"]: $index
-#end for
-
-ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set keystone_pass = $console_credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set heat_dbpass = $credentials.heat.password
-#set heat_pass = $console_credentials.heat.password
-#set neutron_dbpass = $credentials.network.password
-#set neutron_pass = $console_credentials.network.password
-#set ceilometer_dbpass = $credentials.metering.password
-#set ceilometer_pass = $console_credentials.metering.password
-#set aodh_dbpass = $credentials.alarming.password
-#set aodh_pass = $console_credentials.alarming.password
-#set congress_dbpass = $credentials.policy.password
-#set congress_pass = $console_credentials.policy.password
-#set admin_pass = $console_credentials.admin.password
-#set demo_pass = $console_credentials.demo.password
-
-cluster_name: $cluster_name
-
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controllers_host }}"
-DB_HOST: "{{ db_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-mitaka.list
-mitaka_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-erlang.cookie: DJJVECFMCJPVYQTJTDWG
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-KEYSTONE_PASS: $keystone_pass
-CEILOMETER_DBPASS: $ceilometer_dbpass
-CEILOMETER_PASS: $ceilometer_pass
-AODH_DBPASS: $aodh_dbpass
-AODH_PASS: $aodh_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_dbpass
-NEUTRON_PASS: $neutron_pass
-HEAT_DBPASS: $heat_dbpass
-HEAT_PASS: $heat_pass
-CONGRESS_DBPASS: $congress_dbpass
-CONGRESS_PASS: $congress_pass
-DEMO_PASS: $demo_pass
-ADMIN_PASS: $admin_pass
-
-#set neutron_service_plugins=['router']
-
-#if $getVar('enable_fwaas', True)
-#neutron_service_plugins.append('firewall')
-#end if
-
-#if $getVar('enable_vpnaas', True)
-#neutron_service_plugins.append('vpnaas')
-#end if
-
-NEUTRON_SERVICE_PLUGINS: $neutron_service_plugins
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan', 'vlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['$ovs_config["tenant_network_type"]']
-NEUTRON_OVS_BRIDGE_MAPPINGS: $ovs_config['bridge_mappings']
-#if 'vlan_ranges' in $ovs_config
-NEUTRON_VLAN_RANGES: $ovs_config['vlan_ranges']
-#else
-NEUTRON_VLAN_RANGES: []
-#end if
-#if 'tunnel_id_ranges' in $ovs_config
-NEUTRON_TUNNEL_ID_RANGES: $ovs_config['tunnel_id_ranges']
-#else
-NEUTRON_TUNNEL_ID_RANGES: []
-#end if
-
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-WSREP_SST_USER: wsrep_sst
-WSREP_SST_PASS: wsrep_sst_sercet
-
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: "{{ internal_ip }}"
-
-#build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image: http://192.168.121.12:9999/img/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
-
-odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
-odl_pkg_name: karaf.tar.gz
-odl_home: "/opt/opendaylight-0.2.2/"
-odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management', 'http', 'odl-base-all','odl-aaa-authn','odl-restconf','odl-nsf-all','odl-adsal-northbound','odl-mdsal-apidocs', 'odl-openflowplugin-all']
-odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
-odl_features: "{{ odl_base_features + odl_extra_features }}"
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/allinone.tmpl
deleted file mode 100755
index b13973d7..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/allinone.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set controllers = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-controller_host: $controller_ip
-#end for
-#for network in $controllers
- #set network_external_nic = $network.external.interface
- #set network_external_subnet = $network.external.subnet
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-compute_controller_host: "{{ controller_host }}"
-db_host: "{{ controller_host }}"
-rabbit_host: "{{ controller_host }}"
-storage_controller_host: "{{ controller_host }}"
-image_host: "{{ controller_host }}"
-identity_host: "{{ controller_host }}"
-network_server_host: "{{ controller_host }}"
-dashboard_host: "{{ controller_host }}"
-
-cluster_name: $cluster_name
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controller_host }}"
-DB_HOST: "{{ controller_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-mitaka.list
-mitaka_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/multinodes.tmpl
deleted file mode 100755
index 3828c0d6..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/multinodes.tmpl
+++ /dev/null
@@ -1,165 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
-compute_controller_host: $worker_ip
-#end for
-#for worker in $databases
- #set worker_ip = $worker.management.ip
-db_host: $worker_ip
-#end for
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
-rabbit_host: $worker_ip
-#end for
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
-storage_controller_host: $worker_ip
-#end for
-#for worker in $images
- #set worker_ip = $worker.management.ip
-image_host: $worker_ip
-#end for
-#for worker in $identities
- #set worker_ip = $worker.management.ip
-identity_host: $worker_ip
-#end for
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
-compute_controller_host: $worker_ip
-#end for
-#for worker in $network_servers
- #set worker_ip = $worker.management.ip
-network_server_host: $worker_ip
-#end for
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
-dashboard_host: $worker_ip
-#end for
-#for network in $network_workers
- #set network_external_nic = $network.external.interface
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-cluster_name: $cluster_name
-
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ compute_controller_host }}"
-DB_HOST: "{{ db_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-mitaka.list
-mitaka_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
-
-odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
-odl_pkg_name: karaf.tar.gz
-odl_home: "/opt/opendaylight-0.2.2/"
-odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management', 'http', 'odl-base-all','odl-aaa-authn','odl-restconf','odl-nsf-all','odl-adsal-northbound','odl-mdsal-apidocs', 'odl-openflowplugin-all']
-odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
-odl_features: "{{ odl_base_features + odl_extra_features }}"
-odl_api_port: 8080
-
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/single-controller.tmpl
deleted file mode 100755
index 99860224..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/vars/single-controller.tmpl
+++ /dev/null
@@ -1,108 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set networks = $getVar('network', [])
-#set storages = $getVar('storage', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-controller_host: $controller_ip
-#end for
-#for network in $networks
- #set network_external_nic = $network.external.interface
- #set network_external_subnet = $network.external.subnet
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-cluster_name: $cluster_name
-deploy_type: $getVar('deploy_type', 'virtual')
-compute_controller_host: "{{ controller_host }}"
-db_host: "{{ controller_host }}"
-rabbit_host: "{{ controller_host }}"
-storage_controller_host: "{{ controller_host }}"
-image_host: "{{ controller_host }}"
-identity_host: "{{ controller_host }}"
-network_server_host: "{{ controller_host }}"
-dashboard_host: "{{ controller_host }}"
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controller_host }}"
-DB_HOST: "{{ controller_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-mitaka.list
-mitaka_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-# EXTERNAL_NETWORK_CIDR: $network_external_subnet
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 4f9fd710..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_mitaka_xenial-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
-library = /opt/openstack-ansible-modules
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/allinone.tmpl
deleted file mode 100755
index 60c0946f..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/allinone.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_mitaka_xenial-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/multinodes.tmpl
deleted file mode 100755
index 60c0946f..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/multinodes.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_mitaka_xenial-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/single-controller.tmpl
deleted file mode 100755
index 60c0946f..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/ansible_cfg/single-controller.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_mitaka_xenial-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 9d628b5e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-#set ip_settings={}
-#for k,v in $getVar('ip_settings', {}).items()
-#set host_ip_settings={}
-#for intf in v
-#set $host_ip_settings[$intf["alias"]]=intf
-#end for
-#set $ip_settings[$k]=$host_ip_settings
-#end for
-
-# localhost
-127.0.0.1 localhost
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($compute, list)
- #set computes = [$computes]
-#end if
-# controller
-#for worker in $controllers
- #set worker_hostname = $worker.hostname
- #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
-# compute
-#for worker in $computes
- #set worker_hostname = $worker.hostname
- #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/allinone.tmpl
deleted file mode 100755
index b777815e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/allinone.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-#set controllers = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-# allinone
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/multinodes.tmpl
deleted file mode 100755
index ca8c793f..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/multinodes.tmpl
+++ /dev/null
@@ -1,110 +0,0 @@
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-# compute-controller
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# database
-#for worker in $databases
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# messaging
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-controller
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# image
-#for worker in $images
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# identity
-#for worker in $identities
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-server
-#for worker in $network_servers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# dashboard
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-volume
-#for worker in $storage_volumes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-worker
-#for worker in $network_workers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# compute-worker
-#for worker in $compute_workers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/single-controller.tmpl
deleted file mode 100755
index 3ed94694..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/hosts/single-controller.tmpl
+++ /dev/null
@@ -1,40 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set storages = $getVar('storage', [])
-#set networks = $getVar('network', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-# controller
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
-# compute
-#for worker in $computes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage
-#for worker in $storages
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network
-#for worker in $networks
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 94a6a153..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,100 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set has = $getVar('ha', [])
-#set odls = $getVar('odl', [])
-#set onoss = $getVar('onos', [])
-#set opencontrails = $getVar('opencontrail', [])
-#set ceph_adm_list = $getVar('ceph_adm',[])
-#set ceph_mon_list = $getVar('ceph_mon',[])
-#set ceph_osd_list = $getVar('ceph_osd',[])
-
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance(has, list)
- #set has = [has]
-#end if
-#if not $isinstance(odls, list)
- #set odls = [odls]
-#end if
-#if not $isinstance(onoss, list)
- #set onoss = [onoss]
-#end if
-#if not $isinstance(opencontrails, list)
- #set opencontrails = [opencontrails]
-#end if
-#if not $isinstance(ceph_adm_list, list)
- #set ceph_adm_list = [ceph_adm_list]
-#end if
-#if not $isinstance(ceph_mon_list, list)
- #set ceph_mon_list = [ceph_mon_list]
-#end if
-#if not $isinstance(ceph_osd_list, list)
- #set ceph_osd_list = [ceph_osd_list]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.install.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.install.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ha]
-#for ha in $has
- #set ha_ip = $ha.install.ip
- #set ha_hostname = $ha.hostname
-$ha_hostname ansible_ssh_host=$ha_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[odl]
-#for odl in $odls
- #set odl_ip = $odl.install.ip
- #set odl_hostname = $odl.hostname
-$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[onos]
-#for onos in $onoss
- #set onos_ip = $onos.install.ip
- #set onos_hostname = $onos.hostname
-$onos_hostname ansible_ssh_host=$onos_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[opencontrail]
-#for opencontrail in $opencontrails
- #set opencontrail_ip = $opencontrail.install.ip
- #set opencontrail_hostname = $opencontrail.hostname
-$opencontrail_hostname ansible_ssh_host=$opencontrail_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_adm]
-#for ceph_adm in $ceph_adm_list
- #set ceph_adm_ip = $ceph_adm.install.ip
- #set ceph_adm_hostname = $ceph_adm.hostname
-$ceph_adm_hostname ansible_ssh_host=$ceph_adm_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_mon]
-#for ceph_mon in $ceph_mon_list
- #set ceph_mon_ip = $ceph_mon.install.ip
- #set ceph_mon_hostname = $ceph_mon.hostname
-$ceph_mon_hostname ansible_ssh_host=$ceph_mon_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_osd]
-#for ceph_osd in $ceph_osd_list
- #set ceph_osd_ip = $ceph_osd.install.ip
- #set ceph_osd_hostname = $ceph_osd.hostname
-$ceph_osd_hostname ansible_ssh_host=$ceph_osd_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph:children]
-ceph_adm
-ceph_mon
-ceph_osd
-
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/allinone.tmpl
deleted file mode 100755
index 38e0038b..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/allinone.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-#set controllers = $getVar('allinone_compute', [])
-#set computes = $getVar('allinone_compute', [])
-#set storages = $getVar('allinone_compute', [])
-#set networks = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network]
-#for network in $networks
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/multinodes.tmpl
deleted file mode 100755
index 7cdfbef3..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/multinodes.tmpl
+++ /dev/null
@@ -1,123 +0,0 @@
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[compute-controller]
-#for controller in $compute_controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute-worker]
-#for compute in $compute_workers
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network-server]
-#for network in $network_servers
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network-worker]
-#for network in $network_workers
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[database]
-#for worker in $databases
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[messaging]
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[image]
-#for worker in $images
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[dashboard]
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[identity]
-#for worker in $identities
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage-controller]
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage-volume]
-#for worker in $storage_volumes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/single-controller.tmpl
deleted file mode 100755
index e1bf72c4..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/inventories/single-controller.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set storages = $getVar('storage', [])
-#set networks = $getVar('network', [])
-#set odls = $getVar('odl', [])
-#set onoss = $getVar('onos', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-#if not $isinstance($odls, list)
- #set odls = [$odls]
-#end if
-#if not $isinstance($onoss, list)
- #set onoss = [$onoss]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network]
-#for network in $networks
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[odl]
-#for odl in odls
- #set odl_ip = $odl.management.ip
- #set odl_hostname = $odl.hostname
-$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 3e9a684a..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,209 +0,0 @@
-#from random import randint
-#set cluster_name = $getVar('name', '')
-#set network_cfg = $getVar('network_cfg', {})
-#set ntp_server = $getVar('ntp_server', "")
-#set ceph_disk = $getVar('ceph_disk',"")
-#set $sys_intf_mappings= {}
-#for $intf_info in $network_cfg.sys_intf_mappings
-#set $sys_intf_mappings[$intf_info["name"]] = $intf_info
-#end for
-
-#set ip_settings={}
-#for k,v in $getVar('ip_settings', {}).items()
-#set host_ip_settings={}
-#for intf in v
-#set $host_ip_settings[$intf["alias"]]=intf
-#end for
-#set $ip_settings[$k]=$host_ip_settings
-#end for
-
-#set neutron_cfg = $getVar('neutron_config', {})
-#set ovs_config = $neutron_cfg.openvswitch
-
-#set has = $getVar('ha', [])
-#set ha_vip = $getVar('ha_vip', [])
-
-#set controllers = $getVar('controller', [])
-#set computers = $getVar('compute', [])
-
-enable_secgroup: $getVar('enable_secgroup', True)
-enable_fwaas: $getVar('enable_fwaas', True)
-enable_vpnaas: $getVar('enable_vpnaas', True)
-odl_l3_agent: $getVar('odl_l3_agent', 'Disable')
-moon: $getVar('moon', 'Disable')
-ha_network: $getVar('ha_network', 'Disable')
-onos_nic: $getVar('onos_nic', 'eth2')
-ip_settings: $ip_settings
-network_cfg: $network_cfg
-sys_intf_mappings: $sys_intf_mappings
-deploy_type: $getVar('deploy_type', 'virtual')
-
-public_cidr: $computers[0]['install']['subnet']
-storage_cidr: "{{ ip_settings[inventory_hostname]['storage']['cidr'] }}"
-mgmt_cidr: "{{ ip_settings[inventory_hostname]['mgmt']['cidr'] }}"
-
-public_net_info: "{{ network_cfg.public_net_info }}"
-host_ip_settings: "{{ ip_settings[inventory_hostname] }}"
-
-ntp_server: $ntp_server
-internal_vip:
- ip: $network_cfg["internal_vip"]["ip"]
- netmask: $network_cfg["internal_vip"]["netmask"]
-#if "vlan_tag" in $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]
- interface: $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]["name"]
-#else
- interface: $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]["interface"]
-#end if
-
-public_vip:
- ip: $network_cfg["public_vip"]["ip"]
- netmask: $network_cfg["public_vip"]["netmask"]
-#if "vlan_tag" in $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]
- interface: $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]["name"]
-#else
- interface: $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]["interface"]
-#end if
-
-db_host: "{{ internal_vip.ip }}"
-rabbit_host: "{{ internal_vip.ip }}"
-
-internal_ip: "{{ ip_settings[inventory_hostname]['mgmt']['ip'] }}"
-internal_nic: mgmt
-
-#set random_id = randint(1, 255)
-vrouter_id_internal: $random_id
-vrouter_id_public: $random_id
-
-identity_host: "{{ internal_ip }}"
-controllers_host: "{{ internal_ip }}"
-storage_controller_host: "{{ internal_ip }}"
-compute_controller_host: "{{ internal_ip }}"
-image_host: "{{ internal_ip }}"
-network_server_host: "{{ internal_ip }}"
-dashboard_host: "{{ internal_ip }}"
-
-haproxy_hosts:
-#for $item in $has
-#set $hostname=$item["hostname"]
- $hostname: $ip_settings[$hostname]["mgmt"]["ip"]
-#end for
-
-host_index:
-#for $index, $item in enumerate($has)
- $item["hostname"]: $index
-#end for
-
-ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set keystone_pass = $console_credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set heat_dbpass = $credentials.heat.password
-#set heat_pass = $console_credentials.heat.password
-#set neutron_dbpass = $credentials.network.password
-#set neutron_pass = $console_credentials.network.password
-#set ceilometer_dbpass = $credentials.metering.password
-#set ceilometer_pass = $console_credentials.metering.password
-#set aodh_dbpass = $credentials.alarming.password
-#set aodh_pass = $console_credentials.alarming.password
-#set admin_pass = $console_credentials.admin.password
-#set demo_pass = $console_credentials.demo.password
-
-cluster_name: $cluster_name
-
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controllers_host }}"
-DB_HOST: "{{ db_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-mitaka.list
-mitaka_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-erlang.cookie: DJJVECFMCJPVYQTJTDWG
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-KEYSTONE_PASS: $keystone_pass
-CEILOMETER_DBPASS: $ceilometer_dbpass
-CEILOMETER_PASS: $ceilometer_pass
-AODH_DBPASS: $aodh_dbpass
-AODH_PASS: $aodh_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_dbpass
-NEUTRON_PASS: $neutron_pass
-HEAT_DBPASS: $heat_dbpass
-HEAT_PASS: $heat_pass
-DEMO_PASS: $demo_pass
-ADMIN_PASS: $admin_pass
-
-#set neutron_service_plugins=['router']
-
-#if $getVar('enable_fwaas', True)
-#neutron_service_plugins.append('firewall')
-#end if
-
-#if $getVar('enable_vpnaas', True)
-#neutron_service_plugins.append('vpnaas')
-#end if
-
-NEUTRON_SERVICE_PLUGINS: $neutron_service_plugins
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan', 'vlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['$ovs_config["tenant_network_type"]']
-NEUTRON_OVS_BRIDGE_MAPPINGS: $ovs_config['bridge_mappings']
-#if 'vlan_ranges' in $ovs_config
-NEUTRON_VLAN_RANGES: $ovs_config['vlan_ranges']
-#else
-NEUTRON_VLAN_RANGES: []
-#end if
-#if 'tunnel_id_ranges' in $ovs_config
-NEUTRON_TUNNEL_ID_RANGES: $ovs_config['tunnel_id_ranges']
-#else
-NEUTRON_TUNNEL_ID_RANGES: []
-#end if
-
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-WSREP_SST_USER: wsrep_sst
-WSREP_SST_PASS: wsrep_sst_sercet
-
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: "{{ internal_ip }}"
-
-#build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image: http://192.168.121.12:9999/img/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
-
-odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
-odl_pkg_name: karaf.tar.gz
-odl_home: "/opt/opendaylight-0.2.2/"
-odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management', 'http', 'odl-base-all','odl-aaa-authn','odl-restconf','odl-nsf-all','odl-adsal-northbound','odl-mdsal-apidocs', 'odl-openflowplugin-all']
-odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
-odl_features: "{{ odl_base_features + odl_extra_features }}"
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/allinone.tmpl
deleted file mode 100755
index b13973d7..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/allinone.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set controllers = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-controller_host: $controller_ip
-#end for
-#for network in $controllers
- #set network_external_nic = $network.external.interface
- #set network_external_subnet = $network.external.subnet
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-compute_controller_host: "{{ controller_host }}"
-db_host: "{{ controller_host }}"
-rabbit_host: "{{ controller_host }}"
-storage_controller_host: "{{ controller_host }}"
-image_host: "{{ controller_host }}"
-identity_host: "{{ controller_host }}"
-network_server_host: "{{ controller_host }}"
-dashboard_host: "{{ controller_host }}"
-
-cluster_name: $cluster_name
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controller_host }}"
-DB_HOST: "{{ controller_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-mitaka.list
-mitaka_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/multinodes.tmpl
deleted file mode 100755
index 3828c0d6..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/multinodes.tmpl
+++ /dev/null
@@ -1,165 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
-compute_controller_host: $worker_ip
-#end for
-#for worker in $databases
- #set worker_ip = $worker.management.ip
-db_host: $worker_ip
-#end for
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
-rabbit_host: $worker_ip
-#end for
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
-storage_controller_host: $worker_ip
-#end for
-#for worker in $images
- #set worker_ip = $worker.management.ip
-image_host: $worker_ip
-#end for
-#for worker in $identities
- #set worker_ip = $worker.management.ip
-identity_host: $worker_ip
-#end for
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
-compute_controller_host: $worker_ip
-#end for
-#for worker in $network_servers
- #set worker_ip = $worker.management.ip
-network_server_host: $worker_ip
-#end for
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
-dashboard_host: $worker_ip
-#end for
-#for network in $network_workers
- #set network_external_nic = $network.external.interface
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-cluster_name: $cluster_name
-
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ compute_controller_host }}"
-DB_HOST: "{{ db_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-mitaka.list
-mitaka_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
-
-odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
-odl_pkg_name: karaf.tar.gz
-odl_home: "/opt/opendaylight-0.2.2/"
-odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management', 'http', 'odl-base-all','odl-aaa-authn','odl-restconf','odl-nsf-all','odl-adsal-northbound','odl-mdsal-apidocs', 'odl-openflowplugin-all']
-odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
-odl_features: "{{ odl_base_features + odl_extra_features }}"
-odl_api_port: 8080
-
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/single-controller.tmpl
deleted file mode 100755
index 99860224..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka_xenial/vars/single-controller.tmpl
+++ /dev/null
@@ -1,108 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set networks = $getVar('network', [])
-#set storages = $getVar('storage', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-controller_host: $controller_ip
-#end for
-#for network in $networks
- #set network_external_nic = $network.external.interface
- #set network_external_subnet = $network.external.subnet
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-cluster_name: $cluster_name
-deploy_type: $getVar('deploy_type', 'virtual')
-compute_controller_host: "{{ controller_host }}"
-db_host: "{{ controller_host }}"
-rabbit_host: "{{ controller_host }}"
-storage_controller_host: "{{ controller_host }}"
-image_host: "{{ controller_host }}"
-identity_host: "{{ controller_host }}"
-network_server_host: "{{ controller_host }}"
-dashboard_host: "{{ controller_host }}"
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controller_host }}"
-DB_HOST: "{{ controller_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-mitaka.list
-mitaka_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-# EXTERNAL_NETWORK_CIDR: $network_external_subnet
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/ansible_cfg/HA-ansible-multinodes.tmpl
index ec9adb6d..d5a6d966 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/HA-ansible-multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/ansible_cfg/HA-ansible-multinodes.tmpl
@@ -1,6 +1,6 @@
#set cluster_name = $getVar('name', '')
[defaults]
-log_path = /var/ansible/run/openstack_mitaka-$cluster_name/ansible.log
+log_path = /var/ansible/run/openstack_newton-$cluster_name/ansible.log
host_key_checking = False
callback_plugins = /opt/compass/bin/ansible_callbacks
pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/ansible_cfg/allinone.tmpl
index ab1a0d71..8f0d3db3 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/allinone.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/ansible_cfg/allinone.tmpl
@@ -1,6 +1,6 @@
#set cluster_name = $getVar('name', '')
[defaults]
-log_path = /var/ansible/run/openstack_mitaka-$cluster_name/ansible.log
+log_path = /var/ansible/run/openstack_newton-$cluster_name/ansible.log
host_key_checking = False
callback_plugins = /opt/compass/bin/ansible_callbacks
pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/ansible_cfg/multinodes.tmpl
index ab1a0d71..8f0d3db3 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/ansible_cfg/multinodes.tmpl
@@ -1,6 +1,6 @@
#set cluster_name = $getVar('name', '')
[defaults]
-log_path = /var/ansible/run/openstack_mitaka-$cluster_name/ansible.log
+log_path = /var/ansible/run/openstack_newton-$cluster_name/ansible.log
host_key_checking = False
callback_plugins = /opt/compass/bin/ansible_callbacks
pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/ansible_cfg/single-controller.tmpl
index ab1a0d71..8f0d3db3 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_mitaka/ansible_cfg/single-controller.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/ansible_cfg/single-controller.tmpl
@@ -1,6 +1,6 @@
#set cluster_name = $getVar('name', '')
[defaults]
-log_path = /var/ansible/run/openstack_mitaka-$cluster_name/ansible.log
+log_path = /var/ansible/run/openstack_newton-$cluster_name/ansible.log
host_key_checking = False
callback_plugins = /opt/compass/bin/ansible_callbacks
pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/hosts/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/hosts/HA-ansible-multinodes.tmpl
index 9d628b5e..9d628b5e 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/hosts/HA-ansible-multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/hosts/HA-ansible-multinodes.tmpl
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/hosts/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/hosts/allinone.tmpl
index b777815e..b777815e 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/hosts/allinone.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/hosts/allinone.tmpl
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/hosts/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/hosts/multinodes.tmpl
index ca8c793f..ca8c793f 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/hosts/multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/hosts/multinodes.tmpl
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/hosts/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/hosts/single-controller.tmpl
index 3ed94694..3ed94694 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/hosts/single-controller.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/hosts/single-controller.tmpl
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/HA-ansible-multinodes.tmpl
index 94a6a153..94a6a153 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_liberty/inventories/HA-ansible-multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/HA-ansible-multinodes.tmpl
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/inventories/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/allinone.tmpl
index 38e0038b..38e0038b 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/inventories/allinone.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/allinone.tmpl
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/inventories/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/multinodes.tmpl
index 7cdfbef3..7cdfbef3 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/inventories/multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/multinodes.tmpl
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_juno/inventories/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/single-controller.tmpl
index e1bf72c4..e1bf72c4 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_juno/inventories/single-controller.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/inventories/single-controller.tmpl
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl
index 2205431b..2205431b 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/vars/HA-ansible-multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/vars/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/allinone.tmpl
index a28897b3..a28897b3 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/vars/allinone.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/allinone.tmpl
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/vars/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/multinodes.tmpl
index 16134e71..16134e71 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/vars/multinodes.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/multinodes.tmpl
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/vars/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/single-controller.tmpl
index 70b01813..70b01813 100755
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/vars/single-controller.tmpl
+++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/single-controller.tmpl
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/HA-ansible-multinodes.tmpl
deleted file mode 100755
index aece7ae3..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_newton_xenial-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
-library = /opt/openstack-ansible-modules
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/allinone.tmpl
deleted file mode 100755
index 82657135..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/allinone.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_newton_xenial-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/multinodes.tmpl
deleted file mode 100755
index 82657135..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/multinodes.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_newton_xenial-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/single-controller.tmpl
deleted file mode 100755
index 82657135..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/ansible_cfg/single-controller.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_newton_xenial-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 9d628b5e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-#set ip_settings={}
-#for k,v in $getVar('ip_settings', {}).items()
-#set host_ip_settings={}
-#for intf in v
-#set $host_ip_settings[$intf["alias"]]=intf
-#end for
-#set $ip_settings[$k]=$host_ip_settings
-#end for
-
-# localhost
-127.0.0.1 localhost
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($compute, list)
- #set computes = [$computes]
-#end if
-# controller
-#for worker in $controllers
- #set worker_hostname = $worker.hostname
- #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
-# compute
-#for worker in $computes
- #set worker_hostname = $worker.hostname
- #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/allinone.tmpl
deleted file mode 100755
index b777815e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/allinone.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-#set controllers = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-# allinone
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/multinodes.tmpl
deleted file mode 100755
index ca8c793f..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/multinodes.tmpl
+++ /dev/null
@@ -1,110 +0,0 @@
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-# compute-controller
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# database
-#for worker in $databases
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# messaging
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-controller
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# image
-#for worker in $images
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# identity
-#for worker in $identities
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-server
-#for worker in $network_servers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# dashboard
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-volume
-#for worker in $storage_volumes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-worker
-#for worker in $network_workers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# compute-worker
-#for worker in $compute_workers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/single-controller.tmpl
deleted file mode 100755
index 3ed94694..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/hosts/single-controller.tmpl
+++ /dev/null
@@ -1,40 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set storages = $getVar('storage', [])
-#set networks = $getVar('network', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-# controller
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
-# compute
-#for worker in $computes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage
-#for worker in $storages
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network
-#for worker in $networks
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 94a6a153..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,100 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set has = $getVar('ha', [])
-#set odls = $getVar('odl', [])
-#set onoss = $getVar('onos', [])
-#set opencontrails = $getVar('opencontrail', [])
-#set ceph_adm_list = $getVar('ceph_adm',[])
-#set ceph_mon_list = $getVar('ceph_mon',[])
-#set ceph_osd_list = $getVar('ceph_osd',[])
-
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance(has, list)
- #set has = [has]
-#end if
-#if not $isinstance(odls, list)
- #set odls = [odls]
-#end if
-#if not $isinstance(onoss, list)
- #set onoss = [onoss]
-#end if
-#if not $isinstance(opencontrails, list)
- #set opencontrails = [opencontrails]
-#end if
-#if not $isinstance(ceph_adm_list, list)
- #set ceph_adm_list = [ceph_adm_list]
-#end if
-#if not $isinstance(ceph_mon_list, list)
- #set ceph_mon_list = [ceph_mon_list]
-#end if
-#if not $isinstance(ceph_osd_list, list)
- #set ceph_osd_list = [ceph_osd_list]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.install.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.install.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ha]
-#for ha in $has
- #set ha_ip = $ha.install.ip
- #set ha_hostname = $ha.hostname
-$ha_hostname ansible_ssh_host=$ha_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[odl]
-#for odl in $odls
- #set odl_ip = $odl.install.ip
- #set odl_hostname = $odl.hostname
-$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[onos]
-#for onos in $onoss
- #set onos_ip = $onos.install.ip
- #set onos_hostname = $onos.hostname
-$onos_hostname ansible_ssh_host=$onos_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[opencontrail]
-#for opencontrail in $opencontrails
- #set opencontrail_ip = $opencontrail.install.ip
- #set opencontrail_hostname = $opencontrail.hostname
-$opencontrail_hostname ansible_ssh_host=$opencontrail_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_adm]
-#for ceph_adm in $ceph_adm_list
- #set ceph_adm_ip = $ceph_adm.install.ip
- #set ceph_adm_hostname = $ceph_adm.hostname
-$ceph_adm_hostname ansible_ssh_host=$ceph_adm_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_mon]
-#for ceph_mon in $ceph_mon_list
- #set ceph_mon_ip = $ceph_mon.install.ip
- #set ceph_mon_hostname = $ceph_mon.hostname
-$ceph_mon_hostname ansible_ssh_host=$ceph_mon_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_osd]
-#for ceph_osd in $ceph_osd_list
- #set ceph_osd_ip = $ceph_osd.install.ip
- #set ceph_osd_hostname = $ceph_osd.hostname
-$ceph_osd_hostname ansible_ssh_host=$ceph_osd_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph:children]
-ceph_adm
-ceph_mon
-ceph_osd
-
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/allinone.tmpl
deleted file mode 100755
index 38e0038b..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/allinone.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-#set controllers = $getVar('allinone_compute', [])
-#set computes = $getVar('allinone_compute', [])
-#set storages = $getVar('allinone_compute', [])
-#set networks = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network]
-#for network in $networks
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/multinodes.tmpl
deleted file mode 100755
index 7cdfbef3..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/multinodes.tmpl
+++ /dev/null
@@ -1,123 +0,0 @@
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[compute-controller]
-#for controller in $compute_controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute-worker]
-#for compute in $compute_workers
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network-server]
-#for network in $network_servers
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network-worker]
-#for network in $network_workers
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[database]
-#for worker in $databases
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[messaging]
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[image]
-#for worker in $images
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[dashboard]
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[identity]
-#for worker in $identities
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage-controller]
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage-volume]
-#for worker in $storage_volumes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/single-controller.tmpl
deleted file mode 100755
index e1bf72c4..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_newton_xenial/inventories/single-controller.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set storages = $getVar('storage', [])
-#set networks = $getVar('network', [])
-#set odls = $getVar('odl', [])
-#set onoss = $getVar('onos', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-#if not $isinstance($odls, list)
- #set odls = [$odls]
-#end if
-#if not $isinstance($onoss, list)
- #set onoss = [$onoss]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network]
-#for network in $networks
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[odl]
-#for odl in odls
- #set odl_ip = $odl.management.ip
- #set odl_hostname = $odl.hostname
-$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 55d80ae1..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_osp9-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
-library = /opt/openstack-ansible-modules
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/single-controller.tmpl
deleted file mode 100755
index ab1a0d71..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/ansible_cfg/single-controller.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-#set cluster_name = $getVar('name', '')
-[defaults]
-log_path = /var/ansible/run/openstack_mitaka-$cluster_name/ansible.log
-host_key_checking = False
-callback_plugins = /opt/compass/bin/ansible_callbacks
-pipelining=True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 9d628b5e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-#set ip_settings={}
-#for k,v in $getVar('ip_settings', {}).items()
-#set host_ip_settings={}
-#for intf in v
-#set $host_ip_settings[$intf["alias"]]=intf
-#end for
-#set $ip_settings[$k]=$host_ip_settings
-#end for
-
-# localhost
-127.0.0.1 localhost
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($compute, list)
- #set computes = [$computes]
-#end if
-# controller
-#for worker in $controllers
- #set worker_hostname = $worker.hostname
- #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
-# compute
-#for worker in $computes
- #set worker_hostname = $worker.hostname
- #set worker_ip = $ip_settings[$worker_hostname].mgmt.ip
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/allinone.tmpl
deleted file mode 100755
index b777815e..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/allinone.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-#set controllers = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-# allinone
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/multinodes.tmpl
deleted file mode 100755
index ca8c793f..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/multinodes.tmpl
+++ /dev/null
@@ -1,110 +0,0 @@
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-# compute-controller
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# database
-#for worker in $databases
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# messaging
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-controller
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# image
-#for worker in $images
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# identity
-#for worker in $identities
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-server
-#for worker in $network_servers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# dashboard
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage-volume
-#for worker in $storage_volumes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network-worker
-#for worker in $network_workers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# compute-worker
-#for worker in $compute_workers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/single-controller.tmpl
deleted file mode 100755
index 3ed94694..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/hosts/single-controller.tmpl
+++ /dev/null
@@ -1,40 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set storages = $getVar('storage', [])
-#set networks = $getVar('network', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-# controller
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_ip $controller_hostname
-#end for
-# compute
-#for worker in $computes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# storage
-#for worker in $storages
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
-# network
-#for worker in $networks
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_ip $worker_hostname
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/HA-ansible-multinodes.tmpl
deleted file mode 100755
index 94a6a153..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,100 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set has = $getVar('ha', [])
-#set odls = $getVar('odl', [])
-#set onoss = $getVar('onos', [])
-#set opencontrails = $getVar('opencontrail', [])
-#set ceph_adm_list = $getVar('ceph_adm',[])
-#set ceph_mon_list = $getVar('ceph_mon',[])
-#set ceph_osd_list = $getVar('ceph_osd',[])
-
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance(has, list)
- #set has = [has]
-#end if
-#if not $isinstance(odls, list)
- #set odls = [odls]
-#end if
-#if not $isinstance(onoss, list)
- #set onoss = [onoss]
-#end if
-#if not $isinstance(opencontrails, list)
- #set opencontrails = [opencontrails]
-#end if
-#if not $isinstance(ceph_adm_list, list)
- #set ceph_adm_list = [ceph_adm_list]
-#end if
-#if not $isinstance(ceph_mon_list, list)
- #set ceph_mon_list = [ceph_mon_list]
-#end if
-#if not $isinstance(ceph_osd_list, list)
- #set ceph_osd_list = [ceph_osd_list]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.install.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.install.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ha]
-#for ha in $has
- #set ha_ip = $ha.install.ip
- #set ha_hostname = $ha.hostname
-$ha_hostname ansible_ssh_host=$ha_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[odl]
-#for odl in $odls
- #set odl_ip = $odl.install.ip
- #set odl_hostname = $odl.hostname
-$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[onos]
-#for onos in $onoss
- #set onos_ip = $onos.install.ip
- #set onos_hostname = $onos.hostname
-$onos_hostname ansible_ssh_host=$onos_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[opencontrail]
-#for opencontrail in $opencontrails
- #set opencontrail_ip = $opencontrail.install.ip
- #set opencontrail_hostname = $opencontrail.hostname
-$opencontrail_hostname ansible_ssh_host=$opencontrail_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_adm]
-#for ceph_adm in $ceph_adm_list
- #set ceph_adm_ip = $ceph_adm.install.ip
- #set ceph_adm_hostname = $ceph_adm.hostname
-$ceph_adm_hostname ansible_ssh_host=$ceph_adm_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_mon]
-#for ceph_mon in $ceph_mon_list
- #set ceph_mon_ip = $ceph_mon.install.ip
- #set ceph_mon_hostname = $ceph_mon.hostname
-$ceph_mon_hostname ansible_ssh_host=$ceph_mon_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph_osd]
-#for ceph_osd in $ceph_osd_list
- #set ceph_osd_ip = $ceph_osd.install.ip
- #set ceph_osd_hostname = $ceph_osd.hostname
-$ceph_osd_hostname ansible_ssh_host=$ceph_osd_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[ceph:children]
-ceph_adm
-ceph_mon
-ceph_osd
-
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/allinone.tmpl
deleted file mode 100755
index 38e0038b..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/allinone.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-#set controllers = $getVar('allinone_compute', [])
-#set computes = $getVar('allinone_compute', [])
-#set storages = $getVar('allinone_compute', [])
-#set networks = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network]
-#for network in $networks
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/multinodes.tmpl
deleted file mode 100755
index 7cdfbef3..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/multinodes.tmpl
+++ /dev/null
@@ -1,123 +0,0 @@
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[compute-controller]
-#for controller in $compute_controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute-worker]
-#for compute in $compute_workers
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network-server]
-#for network in $network_servers
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network-worker]
-#for network in $network_workers
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[database]
-#for worker in $databases
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[messaging]
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[image]
-#for worker in $images
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[dashboard]
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[identity]
-#for worker in $identities
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage-controller]
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage-volume]
-#for worker in $storage_volumes
- #set worker_ip = $worker.management.ip
- #set worker_hostname = $worker.hostname
-$worker_hostname ansible_ssh_host=$worker_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/single-controller.tmpl
deleted file mode 100755
index e1bf72c4..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/inventories/single-controller.tmpl
+++ /dev/null
@@ -1,67 +0,0 @@
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set storages = $getVar('storage', [])
-#set networks = $getVar('network', [])
-#set odls = $getVar('odl', [])
-#set onoss = $getVar('onos', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-#if not $isinstance($odls, list)
- #set odls = [$odls]
-#end if
-#if not $isinstance($onoss, list)
- #set onoss = [$onoss]
-#end if
-
-#set credentials = $getVar('server_credentials', {})
-#set username = $credentials.get('username', 'root')
-#set password = $credentials.get('password', 'root')
-[controller]
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-$controller_hostname ansible_ssh_host=$controller_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[compute]
-#for compute in $computes
- #set compute_ip = $compute.management.ip
- #set compute_hostname = $compute.hostname
-$compute_hostname ansible_ssh_host=$compute_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[network]
-#for network in $networks
- #set network_ip = $network.management.ip
- #set network_hostname = $network.hostname
-$network_hostname ansible_ssh_host=$network_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[odl]
-#for odl in odls
- #set odl_ip = $odl.management.ip
- #set odl_hostname = $odl.hostname
-$odl_hostname ansible_ssh_host=$odl_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
-[storage]
-#for storage in storages
- #set storage_ip = $storage.management.ip
- #set storage_hostname = $storage.hostname
-$storage_hostname ansible_ssh_host=$storage_ip ansible_ssh_user=$username ansible_ssh_password=$password
-#end for
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/HA-ansible-multinodes.tmpl
deleted file mode 100755
index b5b63e69..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/HA-ansible-multinodes.tmpl
+++ /dev/null
@@ -1,210 +0,0 @@
-#from random import randint
-#set cluster_name = $getVar('name', '')
-#set network_cfg = $getVar('network_cfg', {})
-#set ntp_server = $getVar('ntp_server', "")
-#set ceph_disk = $getVar('ceph_disk',"")
-#set $sys_intf_mappings= {}
-#for $intf_info in $network_cfg.sys_intf_mappings
-#set $sys_intf_mappings[$intf_info["name"]] = $intf_info
-#end for
-
-#set ip_settings={}
-#for k,v in $getVar('ip_settings', {}).items()
-#set host_ip_settings={}
-#for intf in v
-#set $host_ip_settings[$intf["alias"]]=intf
-#end for
-#set $ip_settings[$k]=$host_ip_settings
-#end for
-
-#set neutron_cfg = $getVar('neutron_config', {})
-#set ovs_config = $neutron_cfg.openvswitch
-
-#set has = $getVar('ha', [])
-#set ha_vip = $getVar('ha_vip', [])
-
-#set controllers = $getVar('controller', [])
-#set computers = $getVar('compute', [])
-
-enable_secgroup: $getVar('enable_secgroup', True)
-enable_fwaas: $getVar('enable_fwaas', True)
-enable_vpnaas: $getVar('enable_vpnaas', True)
-odl_l3_agent: $getVar('odl_l3_agent', 'Disable')
-onos_sfc: $getVar('onos_sfc', 'Disable')
-onos_nic: $getVar('onos_nic', 'eth2')
-odl_sfc: $getVar('odl_sfc', 'Disable')
-ip_settings: $ip_settings
-network_cfg: $network_cfg
-sys_intf_mappings: $sys_intf_mappings
-deploy_type: $getVar('deploy_type', 'virtual')
-
-public_cidr: $computers[0]['install']['subnet']
-storage_cidr: "{{ ip_settings[inventory_hostname]['storage']['cidr'] }}"
-mgmt_cidr: "{{ ip_settings[inventory_hostname]['mgmt']['cidr'] }}"
-
-public_net_info: "{{ network_cfg.public_net_info }}"
-host_ip_settings: "{{ ip_settings[inventory_hostname] }}"
-
-ntp_server: $ntp_server
-internal_vip:
- ip: $network_cfg["internal_vip"]["ip"]
- netmask: $network_cfg["internal_vip"]["netmask"]
-#if "vlan_tag" in $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]
- interface: $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]["name"]
-#else
- interface: $sys_intf_mappings[$network_cfg["internal_vip"]["interface"]]["interface"]
-#end if
-
-public_vip:
- ip: $network_cfg["public_vip"]["ip"]
- netmask: $network_cfg["public_vip"]["netmask"]
-#if "vlan_tag" in $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]
- interface: $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]["name"]
-#else
- interface: $sys_intf_mappings[$network_cfg["public_vip"]["interface"]]["interface"]
-#end if
-
-db_host: "{{ internal_vip.ip }}"
-rabbit_host: "{{ internal_vip.ip }}"
-
-internal_ip: "{{ ip_settings[inventory_hostname]['mgmt']['ip'] }}"
-internal_nic: mgmt
-
-#set random_id = randint(1, 255)
-vrouter_id_internal: $random_id
-vrouter_id_public: $random_id
-
-identity_host: "{{ internal_ip }}"
-controllers_host: "{{ internal_ip }}"
-storage_controller_host: "{{ internal_ip }}"
-compute_controller_host: "{{ internal_ip }}"
-image_host: "{{ internal_ip }}"
-network_server_host: "{{ internal_ip }}"
-dashboard_host: "{{ internal_ip }}"
-
-haproxy_hosts:
-#for $item in $has
-#set $hostname=$item["hostname"]
- $hostname: $ip_settings[$hostname]["mgmt"]["ip"]
-#end for
-
-host_index:
-#for $index, $item in enumerate($has)
- $item["hostname"]: $index
-#end for
-
-ERLANG_TOKEN: YOWSJSJIGGAUFZTIBRAD
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set keystone_pass = $console_credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set heat_dbpass = $credentials.heat.password
-#set heat_pass = $console_credentials.heat.password
-#set neutron_dbpass = $credentials.network.password
-#set neutron_pass = $console_credentials.network.password
-#set ceilometer_dbpass = $credentials.metering.password
-#set ceilometer_pass = $console_credentials.metering.password
-#set aodh_dbpass = $credentials.alarming.password
-#set aodh_pass = $console_credentials.alarming.password
-#set admin_pass = $console_credentials.admin.password
-#set demo_pass = $console_credentials.demo.password
-
-cluster_name: $cluster_name
-
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controllers_host }}"
-DB_HOST: "{{ db_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-mitaka.list
-mitaka_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-erlang.cookie: DJJVECFMCJPVYQTJTDWG
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-KEYSTONE_PASS: $keystone_pass
-CEILOMETER_DBPASS: $ceilometer_dbpass
-CEILOMETER_PASS: $ceilometer_pass
-AODH_DBPASS: $aodh_dbpass
-AODH_PASS: $aodh_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_dbpass
-NEUTRON_PASS: $neutron_pass
-HEAT_DBPASS: $heat_dbpass
-HEAT_PASS: $heat_pass
-DEMO_PASS: $demo_pass
-ADMIN_PASS: $admin_pass
-
-#set neutron_service_plugins=['router']
-
-#if $getVar('enable_fwaas', True)
-#neutron_service_plugins.append('firewall')
-#end if
-
-#if $getVar('enable_vpnaas', True)
-#neutron_service_plugins.append('vpnaas')
-#end if
-
-NEUTRON_SERVICE_PLUGINS: $neutron_service_plugins
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan', 'vlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['$ovs_config["tenant_network_type"]']
-NEUTRON_OVS_BRIDGE_MAPPINGS: $ovs_config['bridge_mappings']
-#if 'vlan_ranges' in $ovs_config
-NEUTRON_VLAN_RANGES: $ovs_config['vlan_ranges']
-#else
-NEUTRON_VLAN_RANGES: []
-#end if
-#if 'tunnel_id_ranges' in $ovs_config
-NEUTRON_TUNNEL_ID_RANGES: $ovs_config['tunnel_id_ranges']
-#else
-NEUTRON_TUNNEL_ID_RANGES: []
-#end if
-
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-WSREP_SST_USER: wsrep_sst
-WSREP_SST_PASS: wsrep_sst_sercet
-
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: "{{ internal_ip }}"
-
-#build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image: http://192.168.121.12:9999/img/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
-
-odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
-odl_pkg_name: karaf.tar.gz
-odl_home: "/opt/opendaylight-0.2.2/"
-odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management', 'http', 'odl-base-all','odl-aaa-authn','odl-restconf','odl-nsf-all','odl-adsal-northbound','odl-mdsal-apidocs', 'odl-openflowplugin-all']
-odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
-odl_features: "{{ odl_base_features + odl_extra_features }}"
-odl_api_port: 8080
-enable_ubuntu_theme: True
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/allinone.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/allinone.tmpl
deleted file mode 100755
index b13973d7..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/allinone.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set controllers = $getVar('allinone_compute', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-controller_host: $controller_ip
-#end for
-#for network in $controllers
- #set network_external_nic = $network.external.interface
- #set network_external_subnet = $network.external.subnet
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-compute_controller_host: "{{ controller_host }}"
-db_host: "{{ controller_host }}"
-rabbit_host: "{{ controller_host }}"
-storage_controller_host: "{{ controller_host }}"
-image_host: "{{ controller_host }}"
-identity_host: "{{ controller_host }}"
-network_server_host: "{{ controller_host }}"
-dashboard_host: "{{ controller_host }}"
-
-cluster_name: $cluster_name
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controller_host }}"
-DB_HOST: "{{ controller_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-mitaka.list
-mitaka_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/multinodes.tmpl
deleted file mode 100755
index 3828c0d6..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/multinodes.tmpl
+++ /dev/null
@@ -1,165 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set compute_controllers = $getVar('compute_controller', [])
-#set compute_workers = $getVar('compute_worker', [])
-#set network_servers = $getVar('network_server', [])
-#set network_workers = $getVar('network_worker', [])
-#set databases = $getVar('database', [])
-#set messagings = $getVar('messaging', [])
-#set images = $getVar('image', [])
-#set dashboards = $getVar('dashboard', [])
-#set identities = $getVar('identity', [])
-#set storage_controllers = $getVar('storage_controller', [])
-#set storage_volumes = $getVar('storage_volume', [])
-#if not $isinstance($compute_controllers, list)
- #set compute_controllers = [$compute_controllers]
-#end if
-#if not $isinstance($compute_workers, list)
- #set compute_workers = [$compute_workers]
-#end if
-#if not $isinstance($network_servers, list)
- #set network_servers = [$network_servers]
-#end if
-#if not $isinstance($network_workers, list)
- #set network_workers = [$network_workers]
-#end if
-#if not $isinstance($databases, list)
- #set databases = [$databases]
-#end if
-#if not $isinstance($messagings, list)
- #set messagings = [$messagings]
-#end if
-#if not $isinstance($images, list)
- #set images = [$images]
-#end if
-#if not $isinstance($dashboards, list)
- #set dashboards = [$dashboards]
-#end if
-#if not $isinstance($identities, list)
- #set identities = [$identities]
-#end if
-#if not $isinstance($storage_controllers, list)
- #set storage_controllers = [$storage_controllers]
-#end if
-#if not $isinstance($storage_volumes, list)
- #set storage_volumes = [$storage_volumes]
-#end if
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
-compute_controller_host: $worker_ip
-#end for
-#for worker in $databases
- #set worker_ip = $worker.management.ip
-db_host: $worker_ip
-#end for
-#for worker in $messagings
- #set worker_ip = $worker.management.ip
-rabbit_host: $worker_ip
-#end for
-#for worker in $storage_controllers
- #set worker_ip = $worker.management.ip
-storage_controller_host: $worker_ip
-#end for
-#for worker in $images
- #set worker_ip = $worker.management.ip
-image_host: $worker_ip
-#end for
-#for worker in $identities
- #set worker_ip = $worker.management.ip
-identity_host: $worker_ip
-#end for
-#for worker in $compute_controllers
- #set worker_ip = $worker.management.ip
-compute_controller_host: $worker_ip
-#end for
-#for worker in $network_servers
- #set worker_ip = $worker.management.ip
-network_server_host: $worker_ip
-#end for
-#for worker in $dashboards
- #set worker_ip = $worker.management.ip
-dashboard_host: $worker_ip
-#end for
-#for network in $network_workers
- #set network_external_nic = $network.external.interface
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-cluster_name: $cluster_name
-
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ compute_controller_host }}"
-DB_HOST: "{{ db_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-mitaka.list
-mitaka_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
-
-odl_pkg_url: https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz
-odl_pkg_name: karaf.tar.gz
-odl_home: "/opt/opendaylight-0.2.2/"
-odl_base_features: ['config', 'standard', 'region', 'package', 'kar', 'ssh', 'management', 'http', 'odl-base-all','odl-aaa-authn','odl-restconf','odl-nsf-all','odl-adsal-northbound','odl-mdsal-apidocs', 'odl-openflowplugin-all']
-odl_extra_features: ['odl-l2switch-switch', 'odl-ovsdb-plugin', 'odl-ovsdb-openstack', 'odl-ovsdb-northbound','odl-dlux-core', 'odl-restconf-all', 'odl-mdsal-clustering', 'odl-openflowplugin-flow-services', 'odl-netconf-connector', 'odl-netconf-connector-ssh', 'jolokia-osgi']
-odl_features: "{{ odl_base_features + odl_extra_features }}"
-odl_api_port: 8080
-
diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/single-controller.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/single-controller.tmpl
deleted file mode 100755
index 99860224..00000000
--- a/deploy/compass_conf/templates/ansible_installer/openstack_osp9/vars/single-controller.tmpl
+++ /dev/null
@@ -1,108 +0,0 @@
-#set cluster_name = $getVar('name', '')
-#set controllers = $getVar('controller', [])
-#set computes = $getVar('compute', [])
-#set networks = $getVar('network', [])
-#set storages = $getVar('storage', [])
-#if not $isinstance($controllers, list)
- #set controllers = [$controllers]
-#end if
-#if not $isinstance($computes, list)
- #set computes = [$computes]
-#end if
-#if not $isinstance($networks, list)
- #set networks = [$networks]
-#end if
-#if not $isinstance($storages, list)
- #set storages = [$storages]
-#end if
-
-#for controller in $controllers
- #set controller_ip = $controller.management.ip
- #set controller_hostname = $controller.hostname
-controller_host: $controller_ip
-#end for
-#for network in $networks
- #set network_external_nic = $network.external.interface
- #set network_external_subnet = $network.external.subnet
- #set network_internal_nic = $network.management.interface
-INTERFACE_NAME: $network_external_nic
-INTERNAL_INTERFACE: $network_internal_nic
-#end for
-
-#set credentials = $getVar('service_credentials', {})
-#set console_credentials = $getVar('console_credentials', {})
-#set rabbit_username = $credentials.rabbitmq.username
-#set rabbit_password = $credentials.rabbitmq.password
-#set keystone_dbpass = $credentials.identity.password
-#set glance_dbpass = $credentials.image.password
-#set glance_pass = $console_credentials.image.password
-#set nova_dbpass = $credentials.compute.password
-#set nova_pass = $console_credentials.compute.password
-#set dash_dbpass = $credentials.dashboard.password
-#set cinder_dbpass = $credentials.volume.password
-#set cinder_pass = $console_credentials.volume.password
-#set admin_pass = $console_credentials.admin.password
-#set neutron_pass = $console_credentials.network.password
-
-cluster_name: $cluster_name
-deploy_type: $getVar('deploy_type', 'virtual')
-compute_controller_host: "{{ controller_host }}"
-db_host: "{{ controller_host }}"
-rabbit_host: "{{ controller_host }}"
-storage_controller_host: "{{ controller_host }}"
-image_host: "{{ controller_host }}"
-identity_host: "{{ controller_host }}"
-network_server_host: "{{ controller_host }}"
-dashboard_host: "{{ controller_host }}"
-odl_controller: 10.1.0.15
-
-DEBUG: true
-VERBOSE: true
-NTP_SERVER_LOCAL: "{{ controller_host }}"
-DB_HOST: "{{ controller_host }}"
-MQ_BROKER: rabbitmq
-
-OPENSTACK_REPO: cloudarchive-mitaka.list
-mitaka_cloud_archive: deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/mitaka main
-ADMIN_TOKEN: admin
-CEILOMETER_TOKEN: c095d479023a0fd58a54
-
-RABBIT_USER: $rabbit_username
-RABBIT_PASS: $rabbit_password
-KEYSTONE_DBPASS: $keystone_dbpass
-DEMO_PASS: demo_secret
-ADMIN_PASS: $admin_pass
-GLANCE_DBPASS: $glance_dbpass
-GLANCE_PASS: $glance_pass
-NOVA_DBPASS: $nova_dbpass
-NOVA_PASS: $nova_pass
-DASH_DBPASS: $dash_dbpass
-CINDER_DBPASS: $cinder_dbpass
-CINDER_PASS: $cinder_pass
-NEUTRON_DBPASS: $neutron_pass
-NEUTRON_PASS: $neutron_pass
-NEUTRON_TYPE_DRIVERS: ['flat', 'gre', 'vxlan']
-NEUTRON_TENANT_NETWORK_TYPES: ['vxlan']
-#NEUTRON_MECHANISM_DRIVERS: ['opendaylight']
-NEUTRON_MECHANISM_DRIVERS: ['openvswitch']
-NEUTRON_TUNNEL_TYPES: ['vxlan']
-METADATA_SECRET: metadata_secret
-INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: 10.1.1.21
-
-EXTERNAL_NETWORK_CIDR: 203.0.113.0/24
-# EXTERNAL_NETWORK_CIDR: $network_external_subnet
-EXTERNAL_NETWORK_GATEWAY: 203.0.113.1
-FLOATING_IP_START: 203.0.113.101
-FLOATING_IP_END: 203.0.113.200
-
-build_in_image: http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
-build_in_image_name: cirros-0.3.3-x86_64-disk.img
-
-physical_device: /dev/sdb
-
-internal_interface: "ansible_{{ INTERNAL_INTERFACE }}"
-internal_ip: "{{ hostvars[inventory_hostname][internal_interface]['ipv4']['address'] }}"
-HA_VIP: "{{ internal_ip }}"
-odl_username: admin
-odl_password: admin
-odl_api_port: 8080
diff --git a/deploy/compass_conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl b/deploy/compass_conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl
deleted file mode 100755
index 8e4cbbbe..00000000
--- a/deploy/compass_conf/templates/cobbler/CentOS-6.5-x86_64/system.tmpl
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "name": "$hostname",
- "hostname": "$hostname",
- "profile": "$profile",
- "gateway": "$gateway",
- #import simplejson as json
- #set nameservers = json.dumps($nameservers, encoding='utf-8')
- "name_servers": $nameservers,
- #set search_path = ' '.join($search_path)
- "name_servers_search": "$search_path",
- "proxy": "$getVar('http_proxy', '')",
- "modify_interface":
- #set networks = $networks
- #set rekeyed = {}
- #set promic_nic = ""
- #for $nic, $val in $networks.iteritems():
- #set ip_key = '-'.join(('ipaddress', $nic))
- #set netmask_key = '-'.join(('netmask', $nic))
- #set mgmt_key = '-'.join(('management', $nic))
- #set static_key = '-'.join(('static', $nic))
- #set $rekeyed[$ip_key] = $val.ip
- #set $rekeyed[$netmask_key] = $val.netmask
- #set $rekeyed[$mgmt_key] = $val.is_mgmt
- #set $rekeyed[$static_key] = True
-
- #set dns_key = '-'.join(('dnsname', $nic))
- #if $val.is_mgmt
- #set $rekeyed[$dns_key] = $dns
- #else
- #if '.' in $dns
- #set $dns_name, $dns_domain = $dns.split('.', 1)
- #set $dns_nic = '%s-%s.%s' % ($dns_name, $nic, $dns_domain)
- #else
- #set $dns_nic = '%s-%s' % ($dns, $nic)
- #end if
- #set $rekeyed[$dns_key] = $dns_nic
- #end if
-
- #if $val.is_promiscuous:
- #set promic_nic = $nic
- #end if
- #if $val.is_mgmt:
- #set mac_key = '-'.join(('macaddress', $nic))
- #set $rekeyed[$mac_key] = $mac
- #end if
- #end for
- #set nic_info = json.dumps($rekeyed, encoding='utf-8')
- $nic_info
- ,
- "ksmeta":{
- #set partition_config = ''
- #for k, v in $partition.iteritems():
- #set path = ''
- #if v['vol_percentage']:
- #set $path = k + ' ' + str(v['vol_percentage']) + '%'
- #else:
- #set $path = k + ' ' + str(v['vol_size'])
- #end if
- #set partition_config = ';'.join((partition_config, $path))
- #end for
- #set partition_config = partition_config[1:]
- #import crypt
- #set $password = crypt.crypt($server_credentials.password, "az")
- #set no_proxy = ','.join($getVar('no_proxy', []))
- "username": "$server_credentials.username",
- "password": "$password",
- "promisc_nics": "$promic_nic",
- "partition": "$partition_config",
- "https_proxy": "$getVar('https_proxy', '')",
- "ntp_server": "$ntp_server",
- "timezone": "$timezone",
- "ignore_proxy": "$no_proxy",
- "local_repo": "$getVar('local_repo', '')",
- "disk_num": "1"
- }
-}
diff --git a/deploy/compass_conf/templates/cobbler/CentOS-6.6-x86_64/system.tmpl b/deploy/compass_conf/templates/cobbler/CentOS-6.6-x86_64/system.tmpl
deleted file mode 100755
index 8e4cbbbe..00000000
--- a/deploy/compass_conf/templates/cobbler/CentOS-6.6-x86_64/system.tmpl
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "name": "$hostname",
- "hostname": "$hostname",
- "profile": "$profile",
- "gateway": "$gateway",
- #import simplejson as json
- #set nameservers = json.dumps($nameservers, encoding='utf-8')
- "name_servers": $nameservers,
- #set search_path = ' '.join($search_path)
- "name_servers_search": "$search_path",
- "proxy": "$getVar('http_proxy', '')",
- "modify_interface":
- #set networks = $networks
- #set rekeyed = {}
- #set promic_nic = ""
- #for $nic, $val in $networks.iteritems():
- #set ip_key = '-'.join(('ipaddress', $nic))
- #set netmask_key = '-'.join(('netmask', $nic))
- #set mgmt_key = '-'.join(('management', $nic))
- #set static_key = '-'.join(('static', $nic))
- #set $rekeyed[$ip_key] = $val.ip
- #set $rekeyed[$netmask_key] = $val.netmask
- #set $rekeyed[$mgmt_key] = $val.is_mgmt
- #set $rekeyed[$static_key] = True
-
- #set dns_key = '-'.join(('dnsname', $nic))
- #if $val.is_mgmt
- #set $rekeyed[$dns_key] = $dns
- #else
- #if '.' in $dns
- #set $dns_name, $dns_domain = $dns.split('.', 1)
- #set $dns_nic = '%s-%s.%s' % ($dns_name, $nic, $dns_domain)
- #else
- #set $dns_nic = '%s-%s' % ($dns, $nic)
- #end if
- #set $rekeyed[$dns_key] = $dns_nic
- #end if
-
- #if $val.is_promiscuous:
- #set promic_nic = $nic
- #end if
- #if $val.is_mgmt:
- #set mac_key = '-'.join(('macaddress', $nic))
- #set $rekeyed[$mac_key] = $mac
- #end if
- #end for
- #set nic_info = json.dumps($rekeyed, encoding='utf-8')
- $nic_info
- ,
- "ksmeta":{
- #set partition_config = ''
- #for k, v in $partition.iteritems():
- #set path = ''
- #if v['vol_percentage']:
- #set $path = k + ' ' + str(v['vol_percentage']) + '%'
- #else:
- #set $path = k + ' ' + str(v['vol_size'])
- #end if
- #set partition_config = ';'.join((partition_config, $path))
- #end for
- #set partition_config = partition_config[1:]
- #import crypt
- #set $password = crypt.crypt($server_credentials.password, "az")
- #set no_proxy = ','.join($getVar('no_proxy', []))
- "username": "$server_credentials.username",
- "password": "$password",
- "promisc_nics": "$promic_nic",
- "partition": "$partition_config",
- "https_proxy": "$getVar('https_proxy', '')",
- "ntp_server": "$ntp_server",
- "timezone": "$timezone",
- "ignore_proxy": "$no_proxy",
- "local_repo": "$getVar('local_repo', '')",
- "disk_num": "1"
- }
-}
diff --git a/deploy/compass_conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl b/deploy/compass_conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl
deleted file mode 100755
index cfcc883e..00000000
--- a/deploy/compass_conf/templates/cobbler/Ubuntu-12.04-x86_64/system.tmpl
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- "name": "$hostname",
- "hostname": "$hostname",
- "profile": "$profile",
- "gateway": "$gateway",
- #import simplejson as json
- #set nameservers = json.dumps($nameservers, encoding='utf-8')
- "name_servers": $nameservers,
- #set search_path = ' '.join($search_path)
- "name_servers_search": "$search_path",
- "proxy": "$getVar('http_proxy', '')",
- "modify_interface":
- #set networks = $networks
- #set rekeyed = {}
- #set promic_nic = ""
- #for $nic, $val in $networks.iteritems():
- #set ip_key = '-'.join(('ipaddress', $nic))
- #set netmask_key = '-'.join(('netmask', $nic))
- #set mgmt_key = '-'.join(('management', $nic))
- #set static_key = '-'.join(('static', $nic))
- #set $rekeyed[$ip_key] = $val.ip
- #set $rekeyed[$netmask_key] = $val.netmask
- #set $rekeyed[$static_key] = True
-
- #set dns_key = '-'.join(('dnsname', $nic))
- #if $val.is_mgmt
- #set $rekeyed[$dns_key] = $dns
- #else
- #if '.' in $dns
- #set $dns_name, $dns_domain = $dns.split('.', 1)
- #set $dns_nic = '%s-%s.%s' % ($dns_name, $nic, $dns_domain)
- #else
- #set $dns_nic = '%s-%s' % ($dns, $nic)
- #end if
- #set $rekeyed[$dns_key] = $dns_nic
- #end if
-
- #if $val.is_promiscuous:
- #set promic_nic = $nic
- #end if
- #if $val.is_mgmt:
- #set mac_key = '-'.join(('macaddress', $nic))
- #set $rekeyed[$mac_key] = $mac
- #end if
- #end for
- #set nic_info = json.dumps($rekeyed, encoding='utf-8')
- $nic_info
- ,
- "ksmeta":{
- #set partition_config = ''
- #for k, v in $partition.iteritems():
- #set path = ''
- #if v['vol_percentage']:
- #set $path = k + ' ' + str(v['vol_percentage']) + '%'
- #else:
- #set $path = k + ' ' + str(v['vol_size'])
- #end if
- #set partition_config = ';'.join((partition_config, $path))
- #end for
- #set partition_config = partition_config[1:]
- #import crypt
- #set $password = crypt.crypt($server_credentials.password, "az")
- #set no_proxy = ','.join($getVar('no_proxy', []))
- "username": "$server_credentials.username",
- "password": "$password",
- "promisc_nics": "$promic_nic",
- "partition": "$partition_config",
- "https_proxy": "$getVar('https_proxy', '')",
- "ntp_server": "$ntp_server",
- "timezone": "$timezone",
- "ignore_proxy": "$no_proxy",
- "local_repo": "$getVar('local_repo', '')",
- "disk_num": "1"
- }
-}
diff --git a/deploy/compass_conf/templates/cobbler/Ubuntu-14.04-x86_64/system.tmpl b/deploy/compass_conf/templates/cobbler/Ubuntu-14.04-x86_64/system.tmpl
deleted file mode 100755
index cfcc883e..00000000
--- a/deploy/compass_conf/templates/cobbler/Ubuntu-14.04-x86_64/system.tmpl
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- "name": "$hostname",
- "hostname": "$hostname",
- "profile": "$profile",
- "gateway": "$gateway",
- #import simplejson as json
- #set nameservers = json.dumps($nameservers, encoding='utf-8')
- "name_servers": $nameservers,
- #set search_path = ' '.join($search_path)
- "name_servers_search": "$search_path",
- "proxy": "$getVar('http_proxy', '')",
- "modify_interface":
- #set networks = $networks
- #set rekeyed = {}
- #set promic_nic = ""
- #for $nic, $val in $networks.iteritems():
- #set ip_key = '-'.join(('ipaddress', $nic))
- #set netmask_key = '-'.join(('netmask', $nic))
- #set mgmt_key = '-'.join(('management', $nic))
- #set static_key = '-'.join(('static', $nic))
- #set $rekeyed[$ip_key] = $val.ip
- #set $rekeyed[$netmask_key] = $val.netmask
- #set $rekeyed[$static_key] = True
-
- #set dns_key = '-'.join(('dnsname', $nic))
- #if $val.is_mgmt
- #set $rekeyed[$dns_key] = $dns
- #else
- #if '.' in $dns
- #set $dns_name, $dns_domain = $dns.split('.', 1)
- #set $dns_nic = '%s-%s.%s' % ($dns_name, $nic, $dns_domain)
- #else
- #set $dns_nic = '%s-%s' % ($dns, $nic)
- #end if
- #set $rekeyed[$dns_key] = $dns_nic
- #end if
-
- #if $val.is_promiscuous:
- #set promic_nic = $nic
- #end if
- #if $val.is_mgmt:
- #set mac_key = '-'.join(('macaddress', $nic))
- #set $rekeyed[$mac_key] = $mac
- #end if
- #end for
- #set nic_info = json.dumps($rekeyed, encoding='utf-8')
- $nic_info
- ,
- "ksmeta":{
- #set partition_config = ''
- #for k, v in $partition.iteritems():
- #set path = ''
- #if v['vol_percentage']:
- #set $path = k + ' ' + str(v['vol_percentage']) + '%'
- #else:
- #set $path = k + ' ' + str(v['vol_size'])
- #end if
- #set partition_config = ';'.join((partition_config, $path))
- #end for
- #set partition_config = partition_config[1:]
- #import crypt
- #set $password = crypt.crypt($server_credentials.password, "az")
- #set no_proxy = ','.join($getVar('no_proxy', []))
- "username": "$server_credentials.username",
- "password": "$password",
- "promisc_nics": "$promic_nic",
- "partition": "$partition_config",
- "https_proxy": "$getVar('https_proxy', '')",
- "ntp_server": "$ntp_server",
- "timezone": "$timezone",
- "ignore_proxy": "$no_proxy",
- "local_repo": "$getVar('local_repo', '')",
- "disk_num": "1"
- }
-}
diff --git a/deploy/compass_conf/templates/cobbler/sles-11sp3-x86_64/system.tmpl b/deploy/compass_conf/templates/cobbler/sles-11sp3-x86_64/system.tmpl
deleted file mode 100755
index 8e4cbbbe..00000000
--- a/deploy/compass_conf/templates/cobbler/sles-11sp3-x86_64/system.tmpl
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "name": "$hostname",
- "hostname": "$hostname",
- "profile": "$profile",
- "gateway": "$gateway",
- #import simplejson as json
- #set nameservers = json.dumps($nameservers, encoding='utf-8')
- "name_servers": $nameservers,
- #set search_path = ' '.join($search_path)
- "name_servers_search": "$search_path",
- "proxy": "$getVar('http_proxy', '')",
- "modify_interface":
- #set networks = $networks
- #set rekeyed = {}
- #set promic_nic = ""
- #for $nic, $val in $networks.iteritems():
- #set ip_key = '-'.join(('ipaddress', $nic))
- #set netmask_key = '-'.join(('netmask', $nic))
- #set mgmt_key = '-'.join(('management', $nic))
- #set static_key = '-'.join(('static', $nic))
- #set $rekeyed[$ip_key] = $val.ip
- #set $rekeyed[$netmask_key] = $val.netmask
- #set $rekeyed[$mgmt_key] = $val.is_mgmt
- #set $rekeyed[$static_key] = True
-
- #set dns_key = '-'.join(('dnsname', $nic))
- #if $val.is_mgmt
- #set $rekeyed[$dns_key] = $dns
- #else
- #if '.' in $dns
- #set $dns_name, $dns_domain = $dns.split('.', 1)
- #set $dns_nic = '%s-%s.%s' % ($dns_name, $nic, $dns_domain)
- #else
- #set $dns_nic = '%s-%s' % ($dns, $nic)
- #end if
- #set $rekeyed[$dns_key] = $dns_nic
- #end if
-
- #if $val.is_promiscuous:
- #set promic_nic = $nic
- #end if
- #if $val.is_mgmt:
- #set mac_key = '-'.join(('macaddress', $nic))
- #set $rekeyed[$mac_key] = $mac
- #end if
- #end for
- #set nic_info = json.dumps($rekeyed, encoding='utf-8')
- $nic_info
- ,
- "ksmeta":{
- #set partition_config = ''
- #for k, v in $partition.iteritems():
- #set path = ''
- #if v['vol_percentage']:
- #set $path = k + ' ' + str(v['vol_percentage']) + '%'
- #else:
- #set $path = k + ' ' + str(v['vol_size'])
- #end if
- #set partition_config = ';'.join((partition_config, $path))
- #end for
- #set partition_config = partition_config[1:]
- #import crypt
- #set $password = crypt.crypt($server_credentials.password, "az")
- #set no_proxy = ','.join($getVar('no_proxy', []))
- "username": "$server_credentials.username",
- "password": "$password",
- "promisc_nics": "$promic_nic",
- "partition": "$partition_config",
- "https_proxy": "$getVar('https_proxy', '')",
- "ntp_server": "$ntp_server",
- "timezone": "$timezone",
- "ignore_proxy": "$no_proxy",
- "local_repo": "$getVar('local_repo', '')",
- "disk_num": "1"
- }
-}
diff --git a/deploy/compass_conf/templates/cobbler/ubuntu-14.04.3-server-x86_64/profile.tmpl b/deploy/compass_conf/templates/cobbler/ubuntu-14.04.3-server-x86_64/profile.tmpl
deleted file mode 100755
index cfa89004..00000000
--- a/deploy/compass_conf/templates/cobbler/ubuntu-14.04.3-server-x86_64/profile.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "repos": "$getVar('repo_name', '')"
-}
diff --git a/deploy/compass_conf/templates/cobbler/ubuntu-14.04.3-server-x86_64/system.tmpl b/deploy/compass_conf/templates/cobbler/ubuntu-14.04.3-server-x86_64/system.tmpl
deleted file mode 100755
index cfcc883e..00000000
--- a/deploy/compass_conf/templates/cobbler/ubuntu-14.04.3-server-x86_64/system.tmpl
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- "name": "$hostname",
- "hostname": "$hostname",
- "profile": "$profile",
- "gateway": "$gateway",
- #import simplejson as json
- #set nameservers = json.dumps($nameservers, encoding='utf-8')
- "name_servers": $nameservers,
- #set search_path = ' '.join($search_path)
- "name_servers_search": "$search_path",
- "proxy": "$getVar('http_proxy', '')",
- "modify_interface":
- #set networks = $networks
- #set rekeyed = {}
- #set promic_nic = ""
- #for $nic, $val in $networks.iteritems():
- #set ip_key = '-'.join(('ipaddress', $nic))
- #set netmask_key = '-'.join(('netmask', $nic))
- #set mgmt_key = '-'.join(('management', $nic))
- #set static_key = '-'.join(('static', $nic))
- #set $rekeyed[$ip_key] = $val.ip
- #set $rekeyed[$netmask_key] = $val.netmask
- #set $rekeyed[$static_key] = True
-
- #set dns_key = '-'.join(('dnsname', $nic))
- #if $val.is_mgmt
- #set $rekeyed[$dns_key] = $dns
- #else
- #if '.' in $dns
- #set $dns_name, $dns_domain = $dns.split('.', 1)
- #set $dns_nic = '%s-%s.%s' % ($dns_name, $nic, $dns_domain)
- #else
- #set $dns_nic = '%s-%s' % ($dns, $nic)
- #end if
- #set $rekeyed[$dns_key] = $dns_nic
- #end if
-
- #if $val.is_promiscuous:
- #set promic_nic = $nic
- #end if
- #if $val.is_mgmt:
- #set mac_key = '-'.join(('macaddress', $nic))
- #set $rekeyed[$mac_key] = $mac
- #end if
- #end for
- #set nic_info = json.dumps($rekeyed, encoding='utf-8')
- $nic_info
- ,
- "ksmeta":{
- #set partition_config = ''
- #for k, v in $partition.iteritems():
- #set path = ''
- #if v['vol_percentage']:
- #set $path = k + ' ' + str(v['vol_percentage']) + '%'
- #else:
- #set $path = k + ' ' + str(v['vol_size'])
- #end if
- #set partition_config = ';'.join((partition_config, $path))
- #end for
- #set partition_config = partition_config[1:]
- #import crypt
- #set $password = crypt.crypt($server_credentials.password, "az")
- #set no_proxy = ','.join($getVar('no_proxy', []))
- "username": "$server_credentials.username",
- "password": "$password",
- "promisc_nics": "$promic_nic",
- "partition": "$partition_config",
- "https_proxy": "$getVar('https_proxy', '')",
- "ntp_server": "$ntp_server",
- "timezone": "$timezone",
- "ignore_proxy": "$no_proxy",
- "local_repo": "$getVar('local_repo', '')",
- "disk_num": "1"
- }
-}
diff --git a/deploy/compass_conf/templates/cobbler/uvp-11sp3-x86_64/system.tmpl b/deploy/compass_conf/templates/cobbler/uvp-11sp3-x86_64/system.tmpl
deleted file mode 100755
index 8e4cbbbe..00000000
--- a/deploy/compass_conf/templates/cobbler/uvp-11sp3-x86_64/system.tmpl
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "name": "$hostname",
- "hostname": "$hostname",
- "profile": "$profile",
- "gateway": "$gateway",
- #import simplejson as json
- #set nameservers = json.dumps($nameservers, encoding='utf-8')
- "name_servers": $nameservers,
- #set search_path = ' '.join($search_path)
- "name_servers_search": "$search_path",
- "proxy": "$getVar('http_proxy', '')",
- "modify_interface":
- #set networks = $networks
- #set rekeyed = {}
- #set promic_nic = ""
- #for $nic, $val in $networks.iteritems():
- #set ip_key = '-'.join(('ipaddress', $nic))
- #set netmask_key = '-'.join(('netmask', $nic))
- #set mgmt_key = '-'.join(('management', $nic))
- #set static_key = '-'.join(('static', $nic))
- #set $rekeyed[$ip_key] = $val.ip
- #set $rekeyed[$netmask_key] = $val.netmask
- #set $rekeyed[$mgmt_key] = $val.is_mgmt
- #set $rekeyed[$static_key] = True
-
- #set dns_key = '-'.join(('dnsname', $nic))
- #if $val.is_mgmt
- #set $rekeyed[$dns_key] = $dns
- #else
- #if '.' in $dns
- #set $dns_name, $dns_domain = $dns.split('.', 1)
- #set $dns_nic = '%s-%s.%s' % ($dns_name, $nic, $dns_domain)
- #else
- #set $dns_nic = '%s-%s' % ($dns, $nic)
- #end if
- #set $rekeyed[$dns_key] = $dns_nic
- #end if
-
- #if $val.is_promiscuous:
- #set promic_nic = $nic
- #end if
- #if $val.is_mgmt:
- #set mac_key = '-'.join(('macaddress', $nic))
- #set $rekeyed[$mac_key] = $mac
- #end if
- #end for
- #set nic_info = json.dumps($rekeyed, encoding='utf-8')
- $nic_info
- ,
- "ksmeta":{
- #set partition_config = ''
- #for k, v in $partition.iteritems():
- #set path = ''
- #if v['vol_percentage']:
- #set $path = k + ' ' + str(v['vol_percentage']) + '%'
- #else:
- #set $path = k + ' ' + str(v['vol_size'])
- #end if
- #set partition_config = ';'.join((partition_config, $path))
- #end for
- #set partition_config = partition_config[1:]
- #import crypt
- #set $password = crypt.crypt($server_credentials.password, "az")
- #set no_proxy = ','.join($getVar('no_proxy', []))
- "username": "$server_credentials.username",
- "password": "$password",
- "promisc_nics": "$promic_nic",
- "partition": "$partition_config",
- "https_proxy": "$getVar('https_proxy', '')",
- "ntp_server": "$ntp_server",
- "timezone": "$timezone",
- "ignore_proxy": "$no_proxy",
- "local_repo": "$getVar('local_repo', '')",
- "disk_num": "1"
- }
-}
diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh
index 4c6ba3fe..294f2bee 100755
--- a/deploy/compass_vm.sh
+++ b/deploy/compass_vm.sh
@@ -53,39 +53,37 @@ function exec_cmd_on_compass() {
}
function _inject_dashboard_conf() {
- for os in mitaka mitaka_xenial newton_xenial; do
- CONF_TEMPLATES_DIR=/etc/compass/templates/ansible_installer/openstack_$os/vars
- if [[ "$ENABLE_UBUNTU_THEME" == "true" ]]; then
- cmd="
- sed -i '/enable_ubuntu_theme/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
- echo enable_ubuntu_theme: True >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl
- "
- else
- cmd="
- sed -i '/enable_ubuntu_theme/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
- echo enable_ubuntu_theme: False >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl
- "
- fi
- exec_cmd_on_compass $cmd
- done
+ os=newton
+ CONF_TEMPLATES_DIR=/etc/compass/templates/ansible_installer/openstack_$os/vars
+ if [[ "$ENABLE_UBUNTU_THEME" == "true" ]]; then
+ cmd="
+ sed -i '/enable_ubuntu_theme/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
+ echo enable_ubuntu_theme: True >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl
+ "
+ else
+ cmd="
+ sed -i '/enable_ubuntu_theme/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
+ echo enable_ubuntu_theme: False >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl
+ "
+ fi
+ exec_cmd_on_compass $cmd
}
function _inject_ceph_expansion_conf() {
- for os in mitaka mitaka_xenial newton_xenial osp9; do
- CONF_TEMPLATES_DIR=/etc/compass/templates/ansible_installer/openstack_$os/vars
- if [[ "$EXPANSION" == "true" ]]; then
- cmd="
- sed -i '/compute_expansion/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
- echo compute_expansion: True >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
- "
- else
- cmd="
- sed -i '/compute_expansion/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
- echo compute_expansion: False >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
- "
- fi
- exec_cmd_on_compass $cmd
- done
+ os=newton
+ CONF_TEMPLATES_DIR=/etc/compass/templates/ansible_installer/openstack_$os/vars
+ if [[ "$EXPANSION" == "true" ]]; then
+ cmd="
+ sed -i '/compute_expansion/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
+ echo compute_expansion: True >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
+ "
+ else
+ cmd="
+ sed -i '/compute_expansion/d' ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
+ echo compute_expansion: False >> ${CONF_TEMPLATES_DIR}/HA-ansible-multinodes.tmpl; \
+ "
+ fi
+ exec_cmd_on_compass $cmd
}
function inject_compass_conf() {
@@ -213,7 +211,6 @@ function launch_compass() {
function recover_compass() {
log_info "recover_compass enter"
-
sudo virsh start compass
if ! wait_ok 500;then
@@ -285,7 +282,7 @@ function wait_controller_nodes_ok() {
function get_public_vip () {
ssh $ssh_args root@$MGMT_IP "
- cd /var/ansible/run/openstack_newton_xenial-opnfv2
+ cd /var/ansible/run/$ADAPTER_NAME'-'$CLUSTER_NAME
cat group_vars/all | grep -A 3 public_vip: | sed -n '2p' |sed -e 's/ ip: //g'
"
}
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index 9107eb8a..ad21dcd8 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -1,33 +1,20 @@
-# trustry/centos7
-export OS_VERSION=${OS_VERSION:-"trusty"}
+# xenial/centos7
+export OS_VERSION=${OS_VERSION:-"xenial"}
# for Operating System
if [ $OS_VERSION = 'xenial' ]; then
export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-16\.04'}
-elif [ $OS_VERSION = 'trusty' ]; then
- export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)ubuntu-14\.04\.3.*'}
-elif [ $OS_VERSION = 'redhat7' ]; then
- export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)rhel-server-7\.2.*'}
else
export ADAPTER_OS_PATTERN=${ADAPTER_OS_PATTERN:-'(?i)CentOS-7.*15.*'}
fi
-# liberty/kilo/juno
-export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"liberty"}
+# newton
+export OPENSTACK_VERSION=${OPENSTACK_VERSION:-"newton"}
# don't touch this
export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
-if [ $OPENSTACK_VERSION = 'mitaka_xenial' ]; then
- export REPO_NAME="xenial-mitaka-ppa"
-elif [ $OPENSTACK_VERSION = 'newton_xenial' ]; then
- export REPO_NAME="xenial-newton-ppa"
-elif [ $OPENSTACK_VERSION = 'osp9' ]; then
- unset REPO_NAME
-else
- export REPO_NAME="$OS_VERSION-$OPENSTACK_VERSION-ppa"
-fi
-
+export REPO_NAME="$OS_VERSION-$OPENSTACK_VERSION-ppa"
export ADAPTER_NAME="openstack_$OPENSTACK_VERSION"
export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes-$OPENSTACK_VERSION"