mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 01:32:18 +02:00
pre-commit: apply end-of-file-fixer to all files (#7551)
This commit is contained in:
John Bampton
GitHub
parent
e876ef096e
commit
6f4503488b
@ -36,7 +36,7 @@ repos:
|
||||
#- id: check-yaml
|
||||
#- id: detect-private-key
|
||||
- id: end-of-file-fixer
|
||||
files: \.(java|md|py|txt|yaml|yml)$
|
||||
exclude: \.vhd$
|
||||
#- id: fix-byte-order-marker
|
||||
- id: mixed-line-ending
|
||||
files: \.(java|md|py|txt|yaml|yml)$
|
||||
|
||||
1
LICENSE
1
LICENSE
@ -624,4 +624,3 @@ Within the utils/src/main/java/org/apache/commons/httpclient/contrib/ssl directo
|
||||
from The Apache Software Foundation http://www.apache.org/
|
||||
EasySSLProtocolSocketFactory.java
|
||||
EasyX509TrustManager.java
|
||||
|
||||
|
||||
@ -17,4 +17,3 @@
|
||||
|
||||
INSERT INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'default.page.size', '500', 'Default page size for API list* commands');
|
||||
DELETE FROM `cloud`.`op_host_capacity` WHERE `capacity_type` in (2,6);
|
||||
|
||||
|
||||
@ -198,4 +198,3 @@ CREATE TABLE `cloud`.`disk_offering_21` (
|
||||
`created` datetime COMMENT 'date the disk offering was created',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
|
||||
@ -79,5 +79,3 @@ UPDATE `cloud`.`vm_instance` SET last_host_id=NULL WHERE last_host_id NOT IN (SE
|
||||
|
||||
UPDATE `cloud`.`vm_instance` SET domain_id=1, account_id=1 where account_id not in (select distinct id from account) or domain_id not in (select distinct id from domain);
|
||||
ALTER TABLE `cloud`.`vm_instance` ADD CONSTRAINT `fk_vm_instance__account_id` FOREIGN KEY `fk_vm_instance__account_id` (`account_id`) REFERENCES `account` (`id`);
|
||||
|
||||
|
||||
|
||||
@ -76,6 +76,3 @@ CREATE TABLE `cloud_usage`.`usage_network_offering` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
update `cloud_usage`.`usage_volume` set size = (size * 1048576);
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1016,4 +1016,3 @@ INSERT INTO configuration (category, instance, component, name, value, descripti
|
||||
|
||||
DELETE FROM load_balancer_vm_map WHERE load_balancer_id NOT IN (SELECT id FROM load_balancer);
|
||||
DELETE FROM vm_instance WHERE type='User' AND id NOT IN (SELECT id FROM user_vm);
|
||||
|
||||
|
||||
@ -14,4 +14,3 @@
|
||||
-- KIND, either express or implied. See the License for the
|
||||
-- specific language governing permissions and limitations
|
||||
-- under the License.
|
||||
|
||||
|
||||
@ -60,4 +60,3 @@ CREATE TABLE IF NOT EXISTS `cloud`.`inline_load_balancer_nic_map` (
|
||||
CONSTRAINT `fk_inline_load_balancer_nic_map__load_balancer_id` FOREIGN KEY(`load_balancer_id`) REFERENCES `load_balancing_rules`(`id`) ON DELETE CASCADE,
|
||||
CONSTRAINT `fk_inline_load_balancer_nic_map__nic_id` FOREIGN KEY(`nic_id`) REFERENCES `nics`(`id`) ON DELETE CASCADE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
|
||||
@ -80,4 +80,3 @@ INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-serv
|
||||
INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'vm.destory.forcestop', 'false', 'On destory, force-stop takes this value');
|
||||
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.lock.timeout', '600', 'Lock wait timeout (seconds) while implementing network');
|
||||
INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.disable.rpfilter','true','disable rp_filter on Domain Router VM public interfaces.');
|
||||
|
||||
|
||||
@ -87,4 +87,3 @@ ALTER TABLE `cloud_usage`.`user_statistics` MODIFY `device_type` varchar(32) NOT
|
||||
|
||||
ALTER TABLE `cloud`.`keystore` ADD seq int;
|
||||
ALTER TABLE `cloud`.`keystore` MODIFY `cloud`.`keystore`.`key` text;
|
||||
|
||||
|
||||
@ -65,4 +65,3 @@ DROP TABLE IF EXISTS `cloud`.`network_tags`;
|
||||
DROP TABLE IF EXISTS `cloud_usage`.`event`;
|
||||
|
||||
DELETE from `cloud`.`guest_os` where id=204 or id=205;
|
||||
|
||||
|
||||
@ -17,4 +17,3 @@
|
||||
|
||||
alter table firewall_rules drop column is_static_nat;
|
||||
delete from configuration where name='router.cleanup';
|
||||
|
||||
|
||||
@ -52,5 +52,3 @@ CREATE TABLE IF NOT EXISTS `cloud`.`version` (
|
||||
PRIMARY KEY (`id`),
|
||||
INDEX `i_version__version`(`version`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
|
||||
|
||||
@ -21,4 +21,3 @@
|
||||
ALTER TABLE `cloud_usage`.`usage_vm_instance` ADD COLUMN `hypervisor_type` varchar(255);
|
||||
|
||||
ALTER TABLE `cloud_usage`.`usage_event` ADD COLUMN `resource_type` varchar(32);
|
||||
|
||||
|
||||
@ -193,4 +193,3 @@ UPDATE `cloud`.`nics` SET strategy='Create' where reserver_name='DirectNetworkGu
|
||||
|
||||
UPDATE storage_pool SET cluster_id=(SELECT cluster_id FROM host INNER JOIN storage_pool_host_ref WHERE host.id=storage_pool_host_ref.host_id AND storage_pool_host_ref.pool_id=storage_pool.id) WHERE pool_type='LVM';
|
||||
UPDATE `cloud`.`host` SET resource='com.cloud.hypervisor.xen.resource.XenServer56FP1Resource' WHERE resource='com.cloud.hypervisor.xen.resource.XenServer56FP1PremiumResource';
|
||||
|
||||
|
||||
@ -64,4 +64,3 @@ ALTER TABLE `cloud`.`user_statistics` MODIFY `device_id` bigint(20) unsigned NOT
|
||||
ALTER TABLE `cloud`.`user_statistics` MODIFY `device_type` varchar(32) NOT NULL;
|
||||
|
||||
ALTER TABLE `cloud`.`nics` MODIFY `ip6_address` char(40);
|
||||
|
||||
|
||||
@ -49,4 +49,3 @@ CREATE TABLE IF NOT EXISTS `cloud`.`cmd_exec_log` (
|
||||
INDEX `i_cmd_exec_log__instance_id`(`instance_id`),
|
||||
CONSTRAINT `fk_cmd_exec_log_ref__inst_id` FOREIGN KEY (`instance_id`) REFERENCES `vm_instance`(`id`) ON DELETE CASCADE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
|
||||
@ -34,4 +34,3 @@ drop table `cloud_usage`.`temp_usage`;
|
||||
|
||||
update `cloud_usage`.`cloud_usage` set raw_usage = (raw_usage % 24) where usage_type =6 and raw_usage > 24 and (raw_usage % 24) <> 0;
|
||||
update `cloud_usage`.`cloud_usage` set raw_usage = 24 where usage_type =6 and raw_usage > 24 and (raw_usage % 24) = 0;
|
||||
|
||||
|
||||
@ -164,5 +164,3 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'manag
|
||||
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Console Proxy', 'DEFAULT', 'AgentManager', 'consoleproxy.management.state', 'Auto', 'console proxy service management state');
|
||||
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Console Proxy', 'DEFAULT', 'AgentManager', 'consoleproxy.management.state.last', 'Auto', 'last console proxy service management state');
|
||||
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'cluster.message.timeout.seconds', '300', 'Time (in seconds) to wait before a inter-management server message post times out.');
|
||||
|
||||
|
||||
|
||||
@ -92,5 +92,3 @@ CREATE TABLE `cloud`.`elastic_lb_vm_map` (
|
||||
CONSTRAINT `fk_elastic_lb_vm_map__elb_vm_id` FOREIGN KEY `fk_elastic_lb_vm_map__elb_vm_id` (`elb_vm_id`) REFERENCES `vm_instance` (`id`) ON DELETE CASCADE,
|
||||
CONSTRAINT `fk_elastic_lb_vm_map__lb_id` FOREIGN KEY `fk_elastic_lb_vm_map__lb_id` (`lb_id`) REFERENCES `load_balancing_rules` (`id`) ON DELETE CASCADE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
|
||||
|
||||
@ -124,5 +124,3 @@ ALTER TABLE `cloud`.`security_group` ADD CONSTRAINT `fk_security_group___account
|
||||
|
||||
DROP VIEW `cloud`.`user_ip_address_view`;
|
||||
CREATE VIEW `cloud`.`user_ip_address_view` AS SELECT INET_NTOA(user_ip_address.public_ip_address) as ip_address, user_ip_address.data_center_id, user_ip_address.account_id, user_ip_address.domain_id, user_ip_address.source_nat, user_ip_address.allocated, user_ip_address.vlan_db_id, user_ip_address.one_to_one_nat, user_ip_address.state, user_ip_address.mac_address, user_ip_address.network_id as associated_network_id from user_ip_address;
|
||||
|
||||
|
||||
|
||||
@ -19,4 +19,3 @@
|
||||
|
||||
|
||||
ALTER TABLE `cloud`.`domain_router` DROP COLUMN network_id;
|
||||
|
||||
|
||||
@ -35,9 +35,3 @@ ALTER TABLE `cloud_usage`.`cloud_usage` CHANGE COLUMN `virtual_size1` `virtual_s
|
||||
|
||||
ALTER TABLE `cloud`.`network_offerings` DROP COLUMN `concurrent_connections`;
|
||||
ALTER TABLE `cloud`.`network_offerings` CHANGE COLUMN `concurrent_connections1` `concurrent_connections` int(10) unsigned COMMENT 'Load Balancer(haproxy) maximum number of concurrent connections(global max)';
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -18,4 +18,3 @@
|
||||
--;
|
||||
-- Schema cleanup from 4.0.0 to 4.1.0;
|
||||
--;
|
||||
|
||||
|
||||
@ -1668,4 +1668,3 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'manag
|
||||
|
||||
UPDATE `cloud`.`configuration` set category='Advanced' where category='Advanced ';
|
||||
UPDATE `cloud`.`configuration` set category='Hidden' where category='Hidden ';
|
||||
|
||||
|
||||
@ -24,5 +24,3 @@ ALTER TABLE `cloud`.`remote_access_vpn` DROP foreign key `fk_remote_access_vpn__
|
||||
ALTER TABLE `cloud`.`remote_access_vpn` DROP primary key;
|
||||
ALTER TABLE `cloud`.`remote_access_vpn` ADD primary key (`id`);
|
||||
ALTER TABLE `cloud`.`remote_access_vpn` ADD CONSTRAINT `fk_remote_access_vpn__vpn_server_addr_id` FOREIGN KEY (`vpn_server_addr_id`) REFERENCES `user_ip_address` (`id`);
|
||||
|
||||
|
||||
|
||||
@ -18,4 +18,3 @@
|
||||
--;
|
||||
-- Schema upgrade cleanup from 4.15.0.0 to 4.15.1.0
|
||||
--;
|
||||
|
||||
|
||||
@ -35,4 +35,3 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervis
|
||||
-- Add support for VMware 7.0.1.0
|
||||
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'VMware', '7.0.1.0', 1024, 0, 59, 64, 1, 1);
|
||||
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'VMware', '7.0.1.0', guest_os_name, guest_os_id, utc_timestamp(), 0 FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='VMware' AND hypervisor_version='7.0';
|
||||
|
||||
|
||||
@ -18,4 +18,3 @@
|
||||
--;
|
||||
-- Schema upgrade cleanup from 4.15.1.0 to 4.15.2.0
|
||||
--;
|
||||
|
||||
|
||||
@ -18,4 +18,3 @@
|
||||
--;
|
||||
-- Schema cleanup from 4.2.0 to 4.3.0;
|
||||
--;
|
||||
|
||||
|
||||
@ -18,4 +18,3 @@
|
||||
--;
|
||||
-- Schema upgrade from 4.4.1 to 4.4.2;
|
||||
--;
|
||||
|
||||
|
||||
@ -20,4 +20,3 @@
|
||||
--
|
||||
|
||||
DELETE FROM `cloud`.`configuration` where name='router.reboot.when.outofband.migrated';
|
||||
|
||||
|
||||
@ -419,5 +419,3 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervis
|
||||
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'KVM', 'default', 'CentOS 7', 246, utc_timestamp(), 0);
|
||||
|
||||
UPDATE `cloud`.`hypervisor_capabilities` SET `max_data_volumes_limit` = '32' WHERE `hypervisor_capabilities`.`hypervisor_type` = 'KVM';
|
||||
|
||||
|
||||
|
||||
@ -250,4 +250,3 @@ CREATE VIEW `cloud`.`domain_router_view` AS
|
||||
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities` values (25,UUID(),'VMware','6.0',128,0,13,32,1,1);
|
||||
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'VMware', '5.5', 'rhel7_64Guest', 245, utc_timestamp(), 0);
|
||||
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'VMware', '6.0', guest_os_name, guest_os_id, utc_timestamp(), 0 FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='VMware' AND hypervisor_version='5.5' AND (guest_os_id NOT IN (1,2,3,4,62,63,64,65,156,157,221,222) AND guest_os_id NOT BETWEEN 121 AND 130);
|
||||
|
||||
|
||||
@ -18,4 +18,3 @@
|
||||
--;
|
||||
-- Schema upgrade from 4.8.0 to 4.8.1;
|
||||
--;
|
||||
|
||||
|
||||
@ -268,4 +268,3 @@ CREATE VIEW `cloud`.`user_view` AS
|
||||
`cloud`.`async_job` ON async_job.instance_id = user.id
|
||||
and async_job.instance_type = 'User'
|
||||
and async_job.job_status = 0;
|
||||
|
||||
|
||||
@ -18,4 +18,3 @@
|
||||
--;
|
||||
-- Schema cleanup from 4.9.0 to 4.9.1.0;
|
||||
--;
|
||||
|
||||
|
||||
@ -18,4 +18,3 @@
|
||||
--;
|
||||
-- Schema cleanup from 4.9.1.0 to 4.9.2.0;
|
||||
--;
|
||||
|
||||
|
||||
@ -32,4 +32,3 @@ log4j.category.org.apache=DEBUG, rolling, stdout
|
||||
#log4j.category.com.cloud.utils.db.Transaction=ALL
|
||||
log4j.category.org.apache.cloudstack.network.contrail=ALL
|
||||
log4j.category.com.cloud.network=ALL
|
||||
|
||||
|
||||
@ -14,4 +14,3 @@
|
||||
# KIND, either express or implied. See the License for the
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
|
||||
@ -14,4 +14,3 @@
|
||||
# KIND, either express or implied. See the License for the
|
||||
# specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
|
||||
@ -93,4 +93,3 @@ case "$1" in
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
||||
|
||||
@ -714,4 +714,3 @@ pip3 install --upgrade urllib3
|
||||
|
||||
* Fri Oct 5 2012 Hugo Trippaers <hugo@apache.org> 4.1.0
|
||||
- new style spec file
|
||||
|
||||
|
||||
@ -93,4 +93,3 @@ case "$1" in
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
||||
|
||||
@ -24,4 +24,3 @@
|
||||
<property name="name" value="networker"/>
|
||||
</bean>
|
||||
</beans>
|
||||
|
||||
|
||||
@ -23,4 +23,3 @@
|
||||
|
||||
|
||||
</beans>
|
||||
|
||||
|
||||
@ -23,4 +23,3 @@ AgentShell/bin/*
|
||||
ServerResource*/bin/*
|
||||
*.user
|
||||
!.nuget/
|
||||
|
||||
|
||||
@ -128,4 +128,3 @@ case "$1" in
|
||||
*)
|
||||
errExit "Valid commands: preSetup postSetup"
|
||||
esac
|
||||
|
||||
|
||||
@ -32,4 +32,3 @@ log4j.category.org.apache=INFO, rolling, stdout
|
||||
#log4j.category.com.cloud.utils.db.Transaction=ALL
|
||||
log4j.category.org.apache.cloudstack.network.contrail=ALL
|
||||
log4j.category.com.cloud.network=ALL
|
||||
|
||||
|
||||
@ -27,5 +27,3 @@ mysqladmin -S /tmp/mysql$1/mysqld.sock shutdown -u root
|
||||
rm -rf /tmp/mysql$1
|
||||
|
||||
echo "Deleting db directories"
|
||||
|
||||
|
||||
|
||||
@ -39,4 +39,3 @@
|
||||
<bean id="OpenDaylightControllerMappingDao" class="org.apache.cloudstack.network.opendaylight.dao.OpenDaylightControllerMappingDaoImpl" />
|
||||
|
||||
</beans>
|
||||
|
||||
|
||||
@ -32,4 +32,3 @@ log4j.category.org.apache=INFO, rolling, stdout
|
||||
#log4j.category.com.cloud.utils.db.Transaction=ALL
|
||||
log4j.category.org.apache.cloudstack.network.contrail=ALL
|
||||
log4j.category.com.cloud.network=ALL
|
||||
|
||||
|
||||
@ -308,4 +308,3 @@ givenName: Cammy
|
||||
mail: cpetri@cloudstack.org
|
||||
uid: cpetri
|
||||
userpassword:: cGFzc3dvcmQ=
|
||||
|
||||
|
||||
@ -240,4 +240,3 @@ givenName: demo
|
||||
inetUserStatus: Active
|
||||
mail: d@b.c
|
||||
uid: noadmin
|
||||
|
||||
|
||||
@ -308,4 +308,3 @@ givenName: Cammy
|
||||
mail: cpetri@cloudstack.org
|
||||
uid: cpetri
|
||||
userpassword:: cGFzc3dvcmQ=
|
||||
|
||||
|
||||
@ -93,4 +93,3 @@ case "$1" in
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
||||
|
||||
@ -93,4 +93,3 @@ case "$1" in
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
||||
|
||||
@ -113,4 +113,3 @@ case "$1" in
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
||||
|
||||
@ -93,4 +93,3 @@ case "$1" in
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
||||
|
||||
@ -113,4 +113,3 @@ case "$1" in
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
||||
|
||||
@ -107,4 +107,3 @@ case "$1" in
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
||||
|
||||
@ -189,4 +189,3 @@ elif [ $1 == "xenserver" ]; then
|
||||
else
|
||||
echo "Conversion of template to $1's compatible format not supported "
|
||||
fi
|
||||
|
||||
|
||||
@ -34,5 +34,3 @@ under the License.
|
||||
</configuration>
|
||||
</get-configuration>
|
||||
</rpc>
|
||||
|
||||
|
||||
|
||||
@ -20,4 +20,3 @@ under the License.
|
||||
<get-firewall-information>
|
||||
</get-firewall-information>
|
||||
</rpc>
|
||||
|
||||
|
||||
@ -44,5 +44,3 @@ under the License.
|
||||
</configuration>
|
||||
</load-configuration>
|
||||
</rpc>
|
||||
|
||||
|
||||
|
||||
@ -28,4 +28,3 @@ under the License.
|
||||
</configuration>
|
||||
</get-configuration>
|
||||
</rpc>
|
||||
|
||||
|
||||
@ -34,5 +34,3 @@ under the License.
|
||||
</configuration>
|
||||
</get-configuration>
|
||||
</rpc>
|
||||
|
||||
|
||||
|
||||
@ -45,5 +45,3 @@ under the License.
|
||||
</configuration>
|
||||
</load-configuration>
|
||||
</rpc>
|
||||
|
||||
|
||||
|
||||
@ -28,5 +28,3 @@ under the License.
|
||||
</configuration>
|
||||
</get-configuration>
|
||||
</rpc>
|
||||
|
||||
|
||||
|
||||
@ -34,5 +34,3 @@ under the License.
|
||||
</configuration>
|
||||
</get-configuration>
|
||||
</rpc>
|
||||
|
||||
|
||||
|
||||
@ -31,4 +31,3 @@ under the License.
|
||||
</configuration>
|
||||
</get-configuration>
|
||||
</rpc>
|
||||
|
||||
|
||||
@ -32,4 +32,3 @@ under the License.
|
||||
</configuration>
|
||||
</load-configuration>
|
||||
</rpc>
|
||||
|
||||
|
||||
@ -32,4 +32,3 @@ under the License.
|
||||
</configuration>
|
||||
</get-configuration>
|
||||
</rpc>
|
||||
|
||||
|
||||
@ -176,5 +176,3 @@ else
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
||||
|
||||
|
||||
@ -30,4 +30,3 @@ if [[ $key == "cap" ]]
|
||||
then
|
||||
xe vm-param-set VCPUs-params:cap=$value uuid=$uuid
|
||||
fi
|
||||
|
||||
|
||||
@ -302,4 +302,3 @@ if __name__ == "__main__":
|
||||
"umountNfsSecondaryStorage":umountNfsSecondaryStorage,
|
||||
"makeDirectory":makeDirectory})
|
||||
|
||||
|
||||
|
||||
@ -98,4 +98,3 @@ do
|
||||
echo "Warning : Don't know how to handle VM $vm, it is in $state state"
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
@ -107,4 +107,3 @@ for hostSlave in $hostSlaves; do
|
||||
fi
|
||||
done
|
||||
echo "#check is successful, you can add these hosts to CloudStack."
|
||||
|
||||
|
||||
@ -34,4 +34,3 @@
|
||||
size 1M
|
||||
rotate 2
|
||||
}
|
||||
|
||||
|
||||
@ -78,5 +78,3 @@ case "${power_state}" in
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
@ -55,4 +55,3 @@ then
|
||||
fi
|
||||
|
||||
[ -n "$gflag" ] && echo $gateway && exit 0
|
||||
|
||||
|
||||
@ -50,4 +50,3 @@ then
|
||||
exit 1
|
||||
fi
|
||||
printf "=======> DONE <======\n"
|
||||
|
||||
|
||||
@ -62,4 +62,3 @@ cat /dev/null > /root/.ssh/known_hosts
|
||||
rm -f /opt/xensource/packages/iso/systemvm-premium.iso
|
||||
|
||||
echo "success"
|
||||
|
||||
|
||||
@ -21,4 +21,3 @@ iptables -D RH-Firewall-1-INPUT -p tcp -m tcp --dport 5900:6099 -j ACCEPT 2>&1
|
||||
# remove listening vnc on all interface
|
||||
sed -i 's/0\.0\.0\.0/127\.0\.0\.1/' /opt/xensource/libexec/vncterm-wrapper 2>&1
|
||||
sed -i 's/0\.0\.0\.0/127\.0\.0\.1/' /opt/xensource/libexec/qemu-dm-wrapper 2>&1
|
||||
|
||||
|
||||
@ -621,4 +621,3 @@ def revert_memory_snapshot(session, args):
|
||||
if __name__ == "__main__":
|
||||
XenAPIPlugin.dispatch({"getVhdParent":getVhdParent, "create_secondary_storage_folder":create_secondary_storage_folder, "delete_secondary_storage_folder":delete_secondary_storage_folder, "post_create_private_template":post_create_private_template, "backupSnapshot": backupSnapshot, "deleteSnapshotBackup": deleteSnapshotBackup, "unmountSnapshotsDir": unmountSnapshotsDir, "revert_memory_snapshot":revert_memory_snapshot, "getSnapshotSize":getSnapshotSize})
|
||||
|
||||
|
||||
|
||||
@ -66,4 +66,3 @@ done
|
||||
|
||||
echo "======> DONE <======"
|
||||
exit 0
|
||||
|
||||
|
||||
@ -20,4 +20,3 @@
|
||||
|
||||
ovs-ofctl del-flows xenbr0
|
||||
ovs-ofctl add-flow xenbr0 priority=0,actions=NORMAL
|
||||
|
||||
|
||||
@ -97,4 +97,3 @@ else
|
||||
ovs-ofctl del-flows --strict $br priority=50,dl_vlan=0xffff,dl_src=$vm_mac
|
||||
ovs-ofctl del-flows --strict $br priority=60,dl_vlan=$sec_iso_vlan,dl_src=$vm_mac
|
||||
fi
|
||||
|
||||
|
||||
@ -39,4 +39,3 @@ sc config TermService start=auto
|
||||
rem Start TS service
|
||||
|
||||
net start Termservice
|
||||
|
||||
|
||||
@ -136,4 +136,3 @@ rem PS.
|
||||
rem Don't forget to set Windows profile as active in Network Monitor, so SSL traffic branch will appear under
|
||||
rem svnchost.exe, so you will be able to decrypt it (don't forget to save and reopen captured traffic to file first).
|
||||
rem
|
||||
|
||||
|
||||
@ -498,5 +498,3 @@ if [ "$vpc" == "1" ]
|
||||
then
|
||||
restart_vpcs
|
||||
fi
|
||||
|
||||
|
||||
|
||||
@ -46,5 +46,3 @@ then
|
||||
exit 1
|
||||
fi
|
||||
echo Finished upgrade for database: cloud_usage from 2.2.1 to 2.2.2
|
||||
|
||||
|
||||
|
||||
@ -2475,4 +2475,3 @@ CREATE TABLE `cloud`.`nicira_nvp_nic_map` (
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
SET foreign_key_checks = 1;
|
||||
|
||||
|
||||
@ -57,4 +57,3 @@ ALTER TABLE `cloud`.`vm_instance` ADD INDEX `i_vm_instance__last_host_id`(`last_
|
||||
|
||||
-- drop foreign key constraits temporarily to allow data update in migration process
|
||||
ALTER TABLE `cloud`.`user_vm` DROP FOREIGN KEY `fk_user_vm__service_offering_id`;
|
||||
|
||||
|
||||
@ -17,4 +17,3 @@
|
||||
|
||||
|
||||
ALTER TABLE `cloud`.`user` DROP KEY `i_user__username__removed`;
|
||||
|
||||
|
||||
@ -596,4 +596,3 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest
|
||||
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('KVM', 'DOS', 102);
|
||||
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('KVM', 'Other', 60);
|
||||
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('KVM', 'Other', 103);
|
||||
|
||||
|
||||
@ -1058,6 +1058,3 @@ under the License.
|
||||
|
||||
|
||||
</templatesync>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -27,5 +27,3 @@ fi
|
||||
|
||||
CP=commons-httpclient-3.1.jar${PATHSEP}commons-logging-1.1.1.jar${PATHSEP}commons-codec-1.3.jar${PATHSEP}testclient.jar${PATHSEP}log4j-1.2.15.jar${PATHSEP}utils.jar${PATHSEP}./conf
|
||||
java -cp $CP com.vmops.test.longrun.BuildGuestNetwork $*
|
||||
|
||||
|
||||
|
||||
@ -110,6 +110,3 @@ do
|
||||
echo "Starting cleanup on secondary storage $i";
|
||||
cleanup_storage $i $SECONDARY_STORAGE_DIR
|
||||
done
|
||||
|
||||
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user