summaryrefslogtreecommitdiffstats
path: root/deploy/compass_conf/flavor
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
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')
-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
7 files changed, 3 insertions, 195 deletions
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'
- ],
-}]
-
-