x/compass-core
Code Issues Proposed changes

update switch state to 'under_monitoring'

Browse Source 
after inserting all machines

Change-Id: If96c9a5cd67e30c60e9f0c2daabc885714c1593e
This commit is contained in:
grace.yu 2014-09-10 18:15:36 -07:00
parent 03b87c0308
commit 4b013f01b9
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/refresh.sh
View File

@ -6,7 +6,7 @@ echo "You may run '/opt/compass/bin/clean_nodes.sh' to clean nodes on chef serve
echo "You may run '/opt/compass/bin/clean_clients.sh' to clean clients on chef server"
echo "you may run '/opt/compass/bin/clean_environments.sh' to clean environments on chef server"
echo "you may run '/opt/compass/bin/remove_systems.sh' to clean systems on cobbler"
/opt/compass/bin/clean_installation_logs.py
#/opt/compass/bin/clean_installation_logs.py
service httpd restart
service rsyslog restart
service redis restart

14
compass/actions/poll_switch.py
View File

@ -96,10 +96,8 @@ def _poll_switch(ip_addr, credentials, req_obj='mac', oper="SCAN"):
)
def poll_switch(
poller_email, ip_addr, credentials,
req_obj='mac', oper="SCAN"
):
def poll_switch(poller_email, ip_addr, credentials,
req_obj='mac', oper="SCAN"):
"""Query switch and update switch machines.
.. note::
@ -130,19 +128,15 @@ def poll_switch(
switch_dict, machine_dicts = _poll_switch(
ip_addr, credentials, req_obj=req_obj, oper=oper
)
switches = switch_api.list_switches(
poller, ip_int=ip_int
)
switches = switch_api.list_switches(poller, ip_int=ip_int)
if not switches:
logging.error('no switch found for %s', ip_addr)
return
for switch in switches:
switch_api.update_switch(
poller, switch['id'], **switch_dict
)
for machine_dict in machine_dicts:
print 'add machine: %s' % machine_dict
switch_api.add_switch_machine(
poller, switch['id'], False, **machine_dict
)
switch_api.update_switch(poller, switch['id'], **switch_dict)

4
conf/templates/chef_installer/openstack_icehouse/environments/multinodes.tmpl
View File

@ -19,7 +19,6 @@
## Network worker node management IP/interface
#set network_worker_ip = $network_worker_role.management.ip
#set network_worker_nic = $network_worker_role.management.interface
#set network_worker_tenant_nic = $network_worker_role.tenant.interface
#set network_worker_public_nic = $network_worker_role.public.interface
## Database node management IP
@ -278,9 +277,6 @@
"network-api-bind": {
"bind_interface": "$network_server_nic"
},
"network-openvswitch": {
"bind_interface": "$network_worker_tenant_nic"
},
"orchestration-api": {
"host": "$controller_ip",
"scheme": "http",