From d635bd1f5762acd78545b650b2f55c112643b486 Mon Sep 17 00:00:00 2001
From: huangxiangyu <huangxiangyu5@huawei.com>
Date: Thu, 18 May 2017 15:38:25 +0800
Subject: support Containerized compass-core
JIRA: COMPASS-534
1. rm compass vm and add ansible to bring up 5 compass
containers
2. use tar package instead of compass.iso which contains
compass docker images, OS ISO, PPA, pip packages.
3. modify client.py to communicate with containerized
compass-core
4. modify cobbler files and ansible callback files
to adapt with containerized compass-core
5. upgrade openstack version to ocata
6. use the openstack-ansible to deploy openstack
7. virtual deploy external use nat
Change-Id: Ifa2a3f5b8c7c32224ac4276fd3d4cc2b0d270a26
Signed-off-by: huangxiangyu <huangxiangyu5@huawei.com>
---
deploy/adapters/cobbler/snippets/kickstart_post_anamon | 2 +-
deploy/adapters/cobbler/snippets/preseed_post_anamon | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'deploy/adapters/cobbler')
diff --git a/deploy/adapters/cobbler/snippets/kickstart_post_anamon b/deploy/adapters/cobbler/snippets/kickstart_post_anamon
index d1dec7b4..379809a6 100644
--- a/deploy/adapters/cobbler/snippets/kickstart_post_anamon
+++ b/deploy/adapters/cobbler/snippets/kickstart_post_anamon
@@ -76,7 +76,7 @@ cat << EOF > /etc/init.d/set_state
#
#end raw
-curl -H "Content-Type: application/json" -X POST -d '{"ready": true}' "http://$srv/api/hosts/${hostname}/state_internal"
+curl -H "Content-Type: application/json" -X POST -d '{"ready": true}' "http://$srv:5050/api/hosts/${hostname}/state_internal"
chkconfig set_state off
mv /etc/init.d/set_state /tmp/set_state
EOF
diff --git a/deploy/adapters/cobbler/snippets/preseed_post_anamon b/deploy/adapters/cobbler/snippets/preseed_post_anamon
index 76bbfad4..a5658e12 100644
--- a/deploy/adapters/cobbler/snippets/preseed_post_anamon
+++ b/deploy/adapters/cobbler/snippets/preseed_post_anamon
@@ -67,7 +67,7 @@ cat << EOF > /etc/init.d/set_state
# installation.
#end raw
sleep 100
-wget -O /tmp/os_state --post-data='{"ready": true}' --header=Content-Type:application/json "http://$srv/api/hosts/${hostname}/state_internal"
+wget -O /tmp/os_state --post-data='{"ready": true}' --header=Content-Type:application/json "http://$srv:5050/api/hosts/${hostname}/state_internal"
update-rc.d -f set_state remove
mv /etc/init.d/set_state /tmp/set_state
EOF
--
cgit