cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'devel' into fireball2

Browse source 
Conflicts:
	lib/ansible/playbook/__init__.py
	lib/ansible/playbook/play.py
This commit is contained in:
James Cammarata 2013-09-02 21:54:02 -05:00
commit 1b5ec0e224
2 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cloud/quantum_network
View file

@ -44,6 +44,11 @@ options:
- The tenant name of the login user - The tenant name of the login user
required: true required: true
default: 'yes' default: 'yes'
tenant_name:
description:
- The name of the tenant for whom the network is created
required: false
default: None
auth_url: auth_url:
description: description:
- The keystone url for authentication - The keystone url for authentication
@ -99,15 +104,15 @@ requirements: ["quantumclient", "keystoneclient"]
''' '''
EXAMPLES = ''' EXAMPLES = '''
# Creates an external,public network # Create a GRE backed Quantum network with tunnel id 1 for tenant1
- quantum_network: state=present login_username=admin login_password=admin - quantum_network: name=t1network tenant_name=tenant1 state=present
provider_network_type=gre login_tenant_name=admin provider_network_type=gre provider_segmentation_id=1
provider_segmentation_id=1 tenant_name=tenant1 name=t1network" login_username=admin login_password=admin login_tenant_name=admin
# Createss a GRE nework with tunnel id of 1 for tenant 1 # Create an external network
- quantum_network: state=present login_username=admin login_password=admin - quantum_network: name=external_network state=present
provider_network_type=local login_tenant_name=admin provider_network_type=local router_external=yes
provider_segmentation_id=1 router_external=yes name=external_network login_username=admin login_password=admin login_tenant_name=admin
''' '''
_os_keystone = None _os_keystone = None
@ -130,7 +135,7 @@ def _get_endpoint(module, ksclient):
try: try:
endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL') endpoint = ksclient.service_catalog.url_for(service_type='network', endpoint_type='publicURL')
except Exception as e: except Exception as e:
module.fail_json(msg = "Error getting endpoint for glance: %s " %e.message) module.fail_json(msg = "Error getting endpoint for Quantum: %s " %e.message)
return endpoint return endpoint
def _get_quantum_client(module, kwargs): def _get_quantum_client(module, kwargs):

26
system/user
View file

@ -1273,20 +1273,24 @@ class AIX(User):
if self.groups is not None: if self.groups is not None:
current_groups = self.user_group_membership() current_groups = self.user_group_membership()
groups = self.get_groups_set()
group_diff = set(current_groups).symmetric_difference(groups)
groups_need_mod = False groups_need_mod = False
groups = []
if group_diff: if self.groups == '':
if self.append: if current_groups and not self.append:
for g in groups:
if g in group_diff:
groups.extend(current_groups)
set(groups)
groups_need_mod = True
break
else:
groups_need_mod = True groups_need_mod = True
else:
groups = self.get_groups_set()
group_diff = set(current_groups).symmetric_difference(groups)
if group_diff:
if self.append:
for g in groups:
if g in group_diff:
groups_need_mod = True
break
else:
groups_need_mod = True
if groups_need_mod: if groups_need_mod:
cmd.append('-G') cmd.append('-G')