From cceecd6920ae01d99dafb46d225f69e4546f278b Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Fri, 25 Nov 2016 04:08:19 +0800 Subject: add compass-core conf/ into compass4nfv JIRA: COMPASS-507 1.create deploy/compass_conf/ directory to keep local compass-core conf/ files. build.sh will add it into compass.iso 2.adjust conf files to support congress Change-Id: I91dde6f62f2385d1289a5cf9a39eafce945a1bc7 Signed-off-by: Harry Huang --- .../flavor_metadata/HA-ansible-multinodes-juno.conf | 19 +++++++++++++++++++ .../flavor_metadata/HA-ansible-multinodes-kilo.conf | 19 +++++++++++++++++++ .../HA-ansible-multinodes-liberty.conf | 19 +++++++++++++++++++ .../flavor_metadata/HA-ansible-multinodes-mitaka.conf | 19 +++++++++++++++++++ .../HA-ansible-multinodes-mitaka_xenial.conf | 19 +++++++++++++++++++ .../HA-ansible-multinodes-newton_xenial.conf | 19 +++++++++++++++++++ .../flavor_metadata/HA-ansible-multinodes-osp9.conf | 19 +++++++++++++++++++ .../compass_conf/flavor_metadata/HA-multinodes.conf | 19 +++++++++++++++++++ deploy/compass_conf/flavor_metadata/allinone.conf | 3 +++ deploy/compass_conf/flavor_metadata/multinodes.conf | 3 +++ .../single-contoller-multi-compute.conf | 3 +++ 11 files changed, 161 insertions(+) create mode 100755 deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-juno.conf create mode 100755 deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-kilo.conf create mode 100755 deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-liberty.conf create mode 100755 deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-mitaka.conf create mode 100755 deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-mitaka_xenial.conf create mode 100755 deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-newton_xenial.conf create mode 100755 deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-osp9.conf create mode 100755 deploy/compass_conf/flavor_metadata/HA-multinodes.conf create mode 100755 deploy/compass_conf/flavor_metadata/allinone.conf create mode 100755 deploy/compass_conf/flavor_metadata/multinodes.conf create mode 100755 deploy/compass_conf/flavor_metadata/single-contoller-multi-compute.conf (limited to 'deploy/compass_conf/flavor_metadata') diff --git a/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-juno.conf b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-juno.conf new file mode 100755 index 00000000..e3ff468b --- /dev/null +++ b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-juno.conf @@ -0,0 +1,19 @@ +ADAPTER = 'openstack_juno' +FLAVOR = 'HA-ansible-multinodes-juno' +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-kilo.conf b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-kilo.conf new file mode 100755 index 00000000..c944c0dc --- /dev/null +++ b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-kilo.conf @@ -0,0 +1,19 @@ +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 new file mode 100755 index 00000000..2d1cc7d3 --- /dev/null +++ b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-liberty.conf @@ -0,0 +1,19 @@ +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 new file mode 100755 index 00000000..1558b516 --- /dev/null +++ b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-mitaka.conf @@ -0,0 +1,19 @@ +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 new file mode 100755 index 00000000..e844e162 --- /dev/null +++ b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-mitaka_xenial.conf @@ -0,0 +1,19 @@ +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-newton_xenial.conf b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-newton_xenial.conf new file mode 100755 index 00000000..c6466577 --- /dev/null +++ b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-newton_xenial.conf @@ -0,0 +1,19 @@ +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 new file mode 100755 index 00000000..20e9f901 --- /dev/null +++ b/deploy/compass_conf/flavor_metadata/HA-ansible-multinodes-osp9.conf @@ -0,0 +1,19 @@ +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/flavor_metadata/HA-multinodes.conf b/deploy/compass_conf/flavor_metadata/HA-multinodes.conf new file mode 100755 index 00000000..c859c93f --- /dev/null +++ b/deploy/compass_conf/flavor_metadata/HA-multinodes.conf @@ -0,0 +1,19 @@ +ADAPTER = 'openstack_icehouse' +FLAVOR = 'HA-multinodes' +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/allinone.conf b/deploy/compass_conf/flavor_metadata/allinone.conf new file mode 100755 index 00000000..7d248ecf --- /dev/null +++ b/deploy/compass_conf/flavor_metadata/allinone.conf @@ -0,0 +1,3 @@ +ADAPTER = 'openstack_icehouse' +FLAVOR = 'allinone' +METADATA = {} diff --git a/deploy/compass_conf/flavor_metadata/multinodes.conf b/deploy/compass_conf/flavor_metadata/multinodes.conf new file mode 100755 index 00000000..7fb835f8 --- /dev/null +++ b/deploy/compass_conf/flavor_metadata/multinodes.conf @@ -0,0 +1,3 @@ +ADAPTER = 'openstack_icehouse' +FLAVOR = 'multinodes' +METADATA = {} diff --git a/deploy/compass_conf/flavor_metadata/single-contoller-multi-compute.conf b/deploy/compass_conf/flavor_metadata/single-contoller-multi-compute.conf new file mode 100755 index 00000000..69faf5d2 --- /dev/null +++ b/deploy/compass_conf/flavor_metadata/single-contoller-multi-compute.conf @@ -0,0 +1,3 @@ +ADAPTER = 'openstack_icehouse' +FLAVOR = 'single-contoller-multi-compute' +METADATA = {} -- cgit 1.2.3-korg