Change newton_xenial to newton

JIRA: COMPASS-513

Change-Id: I937a02bcd69f0df1f5d951dd6630ef2e76e8d386
Signed-off-by: liyuenan <liyuenan@huawei.com>

6 files changed, 2 insertions, 574 deletions

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": [{