aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/compass_conf/flavor_metadata
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/compass_conf/flavor_metadata
parent819912d0379f6cd2b2693c2968576f7514a117c5 (diff)
Change newton_xenial to newton
JIRA: COMPASS-513 Change-Id: I937a02bcd69f0df1f5d951dd6630ef2e76e8d386 Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/compass_conf/flavor_metadata')
-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
7 files changed, 2 insertions, 116 deletions
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': {
- },
- }
- }
-}