Update moon role for moonv4

JIRA: -

To deploy moon(master/slave) scenario configure moon role in DHA file like:

  - name: host4
    roles:
      - moon

To deploy moon master, export MOON_CFG env like below compass deploy:
export MOON_CFG="master:flag=Disable,slave:flag=Enable,slave:name=slave1,slave:master_ip=master_ip"

To deploy moon slave, export MOON_CFG env like below compass deploy:
export MOON_CFG="master:flag=Enable,slave:flag=Disable,slave:name=slave1,slave:master_ip=master_ip"

Change-Id: Ie300a85979af31634ab0660ccee1ee8b094110b5
Signed-off-by: QiLiang <liangqi1@huawei.com>

2 files changed, 0 insertions, 333 deletions

diff --git a/deploy/adapters/ansible/roles/moon/vars/Debian.yml b/deploy/adapters/ansible/roles/moon/vars/Debian.yml
deleted file mode 100644
index 0da81179..00000000
--- a/deploy/adapters/ansible/roles/moon/vars/Debian.yml
+++ /dev/null
@@ -1,168 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-
-packages:
-  - adduser
-  - dbconfig-common
-  - init-system-helpers
-  - python-keystone
-  - q-text-as-data
-  - sqlite3
-  - ssl-cert
-  - debconf
-  - lsb-base
-  - python:any
-  - libjs-sphinxdoc
-  - python-pip
-  - unzip
-  - apache2
-  - libapache2-mod-wsgi
-
-dependency_packages:
-  - python-cryptography
-  - python-dateutil
-  - python-dogpile.cache
-  - python-eventlet
-  - python-greenlet
-  - python-jsonschema
-  - python-keystoneclient
-  - python-keystonemiddleware
-  - python-ldap
-  - python-ldappool
-  - python-lxml
-  - python-memcache
-  - python-migrate
-  - python-msgpack
-  - python-mysqldb
-  - python-oauthlib
-  - python-openstackclient
-  - python-oslo.cache
-  - python-oslo.concurrency
-  - python-oslo.config
-  - python-oslo.context
-  - python-oslo.db
-  - python-oslo.i18n
-  - python-oslo.log
-  - python-oslo.messaging
-  - python-oslo.middleware
-  - python-oslo.policy
-  - python-oslo.serialization
-  - python-oslo.service
-  - python-oslo.utils
-  - python-pam
-  - python-passlib
-  - python-paste
-  - python-pastedeploy
-  - python-pbr
-  - python-pycadf
-  - python-pymysql
-  - python-pysaml2
-  - python-pysqlite2
-  - python-routes
-  - python-six
-  - python-sqlalchemy
-  - python-stevedore
-  - python-webob
-  - unzip
-  - python3-keystoneauth1
-  - python3-keystoneclient
-  - python3-oslo.config
-  - python3-oslo.context
-  - python3-oslo.i18n
-  - python3-oslo.serialization
-  - python-oslo.service
-  - python-oslo.utils
-  - python-pam
-  - python-passlib
-  - python-paste
-  - python-pastedeploy
-  - python-pbr
-  - python-pycadf
-  - python-pymysql
-  - python-pysaml2
-  - python-pysqlite2
-  - python-routes
-  - python-six
-  - python-sqlalchemy
-  - python-stevedore
-  - python-webob
-  - unzip
-  - python3-keystoneauth1
-  - python3-keystoneclient
-  - python3-oslo.config
-  - python3-oslo.context
-  - python3-oslo.i18n
-  - python3-oslo.serialization
-  - python3-oslo.utils
-  - apache2
-  - libapache2-mod-wsgi
-  - python3-cryptography
-  - python3-dateutil
-  - python3-dogpile.cache
-  - python3-eventlet
-  - python3-greenlet
-  - python3-jsonschema
-  - python3-keystoneclient
-  - python3-keystonemiddleware
-  - python3-lxml
-  - python3-memcache
-  - python3-migrate
-  - python3-msgpack
-  - python3-mysqldb
-  - python3-oauthlib
-  - python3-openstackclient
-  - python3-oslo.cache
-  - python3-oslo.concurrency
-  - python3-oslo.config
-  - python3-oslo.context
-  - python3-oslo.db
-  - python3-oslo.i18n
-  - python3-oslo.log
-  - python3-oslo.messaging
-  - python3-oslo.middleware
-  - python3-oslo.policy
-  - python3-oslo.serialization
-  - python3-oslo.service
-  - python3-oslo.utils
-  - python3-pam
-  - python3-passlib
-  - python3-paste
-  - python3-pastedeploy
-  - python3-pbr
-  - python3-pycadf
-  - python3-pymysql
-  - python3-pysaml2
-  - python3-routes
-  - python3-six
-  - python3-sqlalchemy
-  - python3-stevedore
-  - python3-webob
-  - python3-oslo.service
-  - python3-oslo.utils
-  - python3-pam
-  - python3-passlib
-  - python3-paste
-  - python3-pastedeploy
-  - python3-pbr
-  - python3-pycadf
-  - python3-pymysql
-  - python3-pysaml2
-  - python3-routes
-  - python3-six
-  - python3-sqlalchemy
-  - python3-stevedore
-  - python3-webob
-
-services:
-  - apache2
-
-
-apache_config_dir: /etc/apache2
-http_service_name: apache2
diff --git a/deploy/adapters/ansible/roles/moon/vars/main.yml b/deploy/adapters/ansible/roles/moon/vars/main.yml
deleted file mode 100644
index 6793c189..00000000
--- a/deploy/adapters/ansible/roles/moon/vars/main.yml
+++ /dev/null
@@ -1,165 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-packages_noarch: []
-
-services_noarch: []
-
-os_services:
-  - name: keystone
-    type: identity
-    region: RegionOne
-    description: "OpenStack Identity"
-    publicurl: "http://{{ public_vip.ip }}:5000/v2.0"
-    internalurl: "http://{{ internal_vip.ip }}:5000/v2.0"
-    adminurl: "http://{{ internal_vip.ip }}:35357/v2.0"
-
-  - name: glance
-    type: image
-    region: RegionOne
-    description: "OpenStack Image Service"
-    publicurl: "http://{{ public_vip.ip }}:9292"
-    internalurl: "http://{{ internal_vip.ip }}:9292"
-    adminurl: "http://{{ internal_vip.ip }}:9292"
-
-  - name: nova
-    type: compute
-    region: RegionOne
-    description: "OpenStack Compute"
-    publicurl: "http://{{ public_vip.ip }}:8774/v2/%(tenant_id)s"
-    internalurl: "http://{{ internal_vip.ip }}:8774/v2/%(tenant_id)s"
-    adminurl: "http://{{ internal_vip.ip }}:8774/v2/%(tenant_id)s"
-
-  - name: neutron
-    type: network
-    region: RegionOne
-    description: "OpenStack Networking"
-    publicurl: "http://{{ public_vip.ip }}:9696"
-    internalurl: "http://{{ internal_vip.ip }}:9696"
-    adminurl: "http://{{ internal_vip.ip }}:9696"
-
-  - name: ceilometer
-    type: metering
-    region: RegionOne
-    description: "OpenStack Telemetry"
-    publicurl: "http://{{ public_vip.ip }}:8777"
-    internalurl: "http://{{ internal_vip.ip }}:8777"
-    adminurl: "http://{{ internal_vip.ip }}:8777"
-
-  - name: aodh
-    type: alarming
-    region: RegionOne
-    description: "OpenStack Telemetry"
-    publicurl: "http://{{ public_vip.ip }}:8042"
-    internalurl: "http://{{ internal_vip.ip }}:8042"
-    adminurl: "http://{{ internal_vip.ip }}:8042"
-
-  - name: heat
-    type: orchestration
-    region: RegionOne
-    description: "OpenStack Orchestration"
-    publicurl: "http://{{ public_vip.ip }}:8004/v1/%(tenant_id)s"
-    internalurl: "http://{{ internal_vip.ip }}:8004/v1/%(tenant_id)s"
-    adminurl: "http://{{ internal_vip.ip }}:8004/v1/%(tenant_id)s"
-
-  - name: heat-cfn
-    type: cloudformation
-    region: RegionOne
-    description: "OpenStack CloudFormation Orchestration"
-    publicurl: "http://{{ public_vip.ip }}:8000/v1"
-    internalurl: "http://{{ internal_vip.ip }}:8000/v1"
-    adminurl: "http://{{ internal_vip.ip }}:8000/v1"
-
-#  - name: cinder
-#    type: volume
-#    region: RegionOne
-#    description: "OpenStack Block Storage"
-#    publicurl: "http://{{ public_vip.ip }}:8776/v1/%(tenant_id)s"
-#    internalurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s"
-#    adminurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s"
-
-#  - name: cinderv2
-#    type: volumev2
-#    region: RegionOne
-#    description: "OpenStack Block Storage v2"
-#    publicurl: "http://{{ public_vip.ip }}:8776/v2/%(tenant_id)s"
-#    internalurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s"
-#    adminurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s"
-
-#  - name: swift
-#    type: object-store
-#    region: RegionOne
-#    description: "OpenStack Object Storage"
-#    publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
-#    internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
-#    adminurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
-
-os_users:
-  - user: admin
-    password: "{{ ADMIN_PASS }}"
-    email: admin@admin.com
-    role: admin
-    tenant: admin
-    tenant_description: "Admin Tenant"
-
-  - user: glance
-    password: "{{ GLANCE_PASS }}"
-    email: glance@admin.com
-    role: admin
-    tenant: service
-    tenant_description: "Service Tenant"
-
-  - user: nova
-    password: "{{ NOVA_PASS }}"
-    email: nova@admin.com
-    role: admin
-    tenant: service
-    tenant_description: "Service Tenant"
-
-  - user: keystone
-    password: "{{ KEYSTONE_PASS }}"
-    email: keystone@admin.com
-    role: admin
-    tenant: service
-    tenant_description: "Service Tenant"
-
-  - user: neutron
-    password: "{{ NEUTRON_PASS }}"
-    email: neutron@admin.com
-    role: admin
-    tenant: service
-    tenant_description: "Service Tenant"
-
-  - user: ceilometer
-    password: "{{ CEILOMETER_PASS }}"
-    email: ceilometer@admin.com
-    role: admin
-    tenant: service
-    tenant_description: "Service Tenant"
-
-  - user: cinder
-    password: "{{ CINDER_PASS }}"
-    email: cinder@admin.com
-    role: admin
-    tenant: service
-    tenant_description: "Service Tenant"
-
-  - user: heat
-    password: "{{ HEAT_PASS }}"
-    email: heat@admin.com
-    role: admin
-    tenant: service
-    tenant_description: "Service Tenant"
-
-  - user: demo
-    password: ""
-    email: heat@demo.com
-    role: heat_stack_user
-    tenant: demo
-    tenant_description: "Demo Tenant"