summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-07-21 20:39:26 -0400
committerchenshuai@huawei.com <chenshuai@huawei.com>2016-07-21 21:57:58 -0400
commite342b6a5da6a8602e19721e30d3e0a2c44041e19 (patch)
tree31600ce2fb3c5a62972324bd363497124efce6ad /deploy
parentc15131e20fbdd9abc469a11dd5f817a7ff1f8be6 (diff)
Add moon in Compass
JIRA: COMPASS-443 Change-Id: Ief63570287d81664442f79b775067a5747e948fc Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
Diffstat (limited to 'deploy')
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml12
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/keystone-moon-install.yml7
2 files changed, 12 insertions, 7 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
index d374086a..82888e36 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
@@ -228,12 +228,12 @@
roles:
- odl_cluster_post
-- hosts: controller
- remote_user: root
- accelerate: true
- max_fail_percentage: 0
- roles:
- - moon
+#- hosts: controller
+# remote_user: root
+# accelerate: true
+# max_fail_percentage: 0
+# roles:
+# - moon
- hosts: controller
remote_user: root
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/keystone-moon-install.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/keystone-moon-install.yml
index 71315f82..a9b98c1a 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/keystone-moon-install.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/keystone-moon-install.yml
@@ -2,8 +2,13 @@
# Note (asteroide): this part is specific but when Keystone-Moon packages will be installed in a true repository
# we will not have to do that.
+
+- name: get image http server
+ shell: awk -F'=' '/compass_server/ {print $2}' /etc/compass.conf
+ register: http_server
+
- name: download keystone-moon packages
- get_url: url=https://github.com/dthom/moon-bin/archive/master.zip dest=/tmp/master.zip mode=0444
+ get_url: url="http://{{ http_server.stdout_lines[0] }}/packages/moon/master.zip" dest=/tmp/master.zip mode=0444
- name: extract keystone-moon packages
unarchive: src=/tmp/master.zip dest=/tmp copy=no