summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbaigk <baiguoku@huawei.com>2015-12-11 11:37:35 +0800
committerbaigk <baiguoku@huawei.com>2015-12-12 01:23:06 +0000
commit819b3f3c67c03508ed94526542d2306300e7ff40 (patch)
treea6caa9bfd841150e4aab859a89abdd6cd121205d
parentac0c791390e82449245f76bd1696a6465d0c6d2a (diff)
change compass-core repo to upstream
JIRA: COMPASS-197 Signed-off-by: baigk <baiguoku@huawei.com>
-rw-r--r--build/build.conf2
-rw-r--r--deploy/client.py9
2 files changed, 4 insertions, 7 deletions
diff --git a/build/build.conf b/build/build.conf
index de50c40f..4865eb6a 100644
--- a/build/build.conf
+++ b/build/build.conf
@@ -3,7 +3,7 @@ export PACKAGE_URL=${PACKAGE_URL:-http://205.177.226.235:9999}
#begin: package download
export CENTOS_BASE=${CENTOS_BASE:-$PACKAGE_URL/centos_base.iso}
-export COMPASS_CORE=${COMPASS_CORE:-http://github.com/baigk/compass-core.git}
+export COMPASS_CORE=${COMPASS_CORE:-https://github.com/openstack/compass-core.git}
export COMPASS_WEB=${COMPASS_WEB:-http://github.com/baigk/compass-web.git}
export COMPASS_INSTALL=${COMPASS_INSTALL:-http://github.com/baigk/compass-install.git}
export UBUNTU_ISO=${UBUNTU_ISO:-$PACKAGE_URL/ubuntu-14.04.3-server-amd64.iso}
diff --git a/deploy/client.py b/deploy/client.py
index 15f1ba8d..1952b3ab 100644
--- a/deploy/client.py
+++ b/deploy/client.py
@@ -307,19 +307,16 @@ class CompassClient(object):
if not self.is_ok(status) or not resp:
raise RuntimeError('failed to get adapters')
- adapter_name = CONF.adapter_name
os_re = re.compile(CONF.adapter_os_pattern)
flavor_re = re.compile(CONF.adapter_flavor_pattern)
adapter_id = None
os_id = None
- distributed_system_id = None
flavor_id = None
adapter = None
adapter = resp[0]
adapter_id = adapter['id']
- distributed_system_id = adapter['distributed_system_id']
for supported_os in adapter['supported_oses']:
if not os_re or os_re.match(supported_os['name']):
os_id = supported_os['os_id']
@@ -332,7 +329,7 @@ class CompassClient(object):
break
assert(os_id and flavor_id)
- return (adapter_id, os_id, distributed_system_id, flavor_id)
+ return (adapter_id, os_id, flavor_id)
def add_subnets(self):
subnets = [
@@ -872,14 +869,14 @@ def main():
LOG.info('machines are %s', machines)
client.add_subnets()
- adapter_id, os_id, distributed_system_id, flavor_id = client.get_adapter()
+ adapter_id, os_id, flavor_id = client.get_adapter()
cluster_id = client.add_cluster(adapter_id, os_id, flavor_id)
client.add_cluster_hosts(cluster_id, machines)
client.set_host_networking()
client.set_cluster_os_config(cluster_id)
- if distributed_system_id:
+ if flavor_id:
client.set_cluster_package_config(cluster_id)
client.set_all_hosts_roles(cluster_id)