mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
85aee8d18d
- Refactors and simplifies systemvm codebase file structures keeping the same resultant systemvm.iso packaging - Password server systemd script and new postinit script that runs before sshd starts - Fixes to keepalived and conntrackd config to make rVRs work again - New /etc/issue featuring ascii based cloudmonkey logo/message and systemvmtemplate version - SystemVM python codebase linted and tested. Added pylint/pep to Travis. - iptables re-application fixes for non-VR systemvms. - SystemVM template build fixes. - Default secondary storage vm service offering boosted to have 2vCPUs and RAM equal to console proxy. - Fixes to several marvin based smoke tests, especially rVR related tests. rVR tests to consider 3*advert_int+skew timeout before status is checked. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
49 lines
1.5 KiB
Python
Executable File
49 lines
1.5 KiB
Python
Executable File
# -- coding: utf-8 --
|
|
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance
|
|
# with the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
from pprint import pprint
|
|
|
|
import copy
|
|
|
|
|
|
def merge(dbag, data):
|
|
dbagc = copy.deepcopy(dbag)
|
|
|
|
print dbag
|
|
print data
|
|
if "vpn_users" not in data:
|
|
return dbagc
|
|
|
|
# remove previously deleted user from the dict
|
|
for user in dbagc.keys():
|
|
if user == 'id':
|
|
continue
|
|
userrec = dbagc[user]
|
|
add = userrec['add']
|
|
if not add:
|
|
del(dbagc[user])
|
|
|
|
for user in data['vpn_users']:
|
|
username = user['user']
|
|
add = user['add']
|
|
if username not in dbagc.keys():
|
|
dbagc[username] = user
|
|
elif username in dbagc.keys() and not add:
|
|
dbagc[username] = user
|
|
|
|
return dbagc
|