modify moon

JIRA: COMPASS-451

Change-Id: I8b229ef6104d84e00ae2cf73b488edc779b73cf1
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>

2 files changed, 236 insertions, 2 deletions

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/Debian.yml
index 42177d42..0da81179 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/Debian.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/Debian.yml
@@ -9,6 +9,23 @@
 ---
 
 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
@@ -86,7 +103,66 @@ packages:
   - 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/openstack_mitaka_xenial/roles/moon/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml
index 3a22d268..9db404b9 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml
@@ -3,12 +3,170 @@
 #
 # 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 distributi
+# 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: 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: 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: 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"
+
+  - user: swift
+    password: "{{ CINDER_PASS }}"
+    email: swift@admin.com
+    role: admin
+    tenant: service
+    tenant_description: "Service Tenant"