openstack
/
murano-deployment
Code Issues Proposed changes

Added prerequisites for Quantum support 

Change-Id: I7d3115cd1930f1dbfbbc0df39ea0f24a2ac02be4
This commit is contained in:
Serg Melikyan 2013-11-18 10:34:15 +04:00
parent 04bfc8f3c9
commit 9eb77342fe
11 changed files with 382 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
quantum_support/conductor/data/templates/cf/IISSecurity.template Normal file
View File

@ -0,0 +1,41 @@
{
"Resources": {
"$port-{instanceName}": {
"Properties": {
"security_groups" : [ {"Ref" : "IISSecurityGroup"} ]
}
},
"IISSecurityGroup": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
"SecurityGroupIngress": [
{
"ToPort": "8172",
"IpProtocol": "tcp",
"FromPort": "8172",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": "80",
"IpProtocol": "tcp",
"FromPort": "80",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": "433",
"IpProtocol": "tcp",
"FromPort": "433",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": "21",
"IpProtocol": "tcp",
"FromPort": "21",
"CidrIp": "0.0.0.0/0"
}
],
"GroupDescription": "Enable access to IIS Management Console, HTTP, HTTPS and FTP protocols"
}
}
}
}

128
quantum_support/conductor/data/templates/cf/Linux.template Normal file
View File

@ -0,0 +1,128 @@
{
"AWSTemplateFormatVersion": "2010-09-09",
"Parameters": {
"KeyName": {
"Description": "Key Pair name for Load Balancer",
"Type": "String",
"Default": "murano-lb-key"
}
},
"Resources": {
"$instanceName": {
"Type": "AWS::EC2::Instance",
"Properties": {
"BootFromVolume": true,
"InstanceType": "$instanceType",
"ImageId": "$imageName",
"AvailabilityZone": "$availabilityZone",
"UserData": "$userData",
"NetworkInterfaces": [ { "Ref": "$port-{instanceName}" } ]
}
},
"$port-{instanceName}": {
"Type": "OS::Quantum::Port",
"Properties": {
"network_id": {
"Ref": "network"
},
"security_groups" : [ { "Ref" : "MuranoDefaultSecurityGroup"}],
"fixed_ips": [
{
"subnet_id": {
"Ref": "subnet"
}
}
]
}
},
"MuranoDefaultSecurityGroup": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
"SecurityGroupIngress": [
{
"ToPort": "22",
"IpProtocol": "tcp",
"FromPort": "22",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": "23",
"IpProtocol": "tcp",
"FromPort": "23",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": "-1",
"IpProtocol": "icmp",
"FromPort": "-1",
"CidrIp": "0.0.0.0/0"
},
{
"IpProtocol": "tcp",
"FromPort" : "1",
"ToPort": "65535",
"CidrIp": "10.0.0.0/24"
},
{
"IpProtocol": "udp",
"FromPort" : "1",
"ToPort": "65535",
"CidrIp": "10.0.0.0/24"
}
],
"GroupDescription": "Default security group for Linux Murano Environments"
}
},
"network": {
"Type": "OS::Quantum::Net",
"Properties": {
"name": "$network-{environmentId}"
}
},
"subnet": {
"Type": "OS::Quantum::Subnet",
"Properties": {
"network_id": {
"Ref": "network"
},
"ip_version": 4,
"cidr": "10.0.0.0/24",
"dns_nameservers": ["8.8.8.8"],
"allocation_pools": [
{
"start": "10.0.0.20",
"end": "10.0.0.250"
}
]
}
},
"router": {
"Type": "OS::Quantum::Router"
},
"router_interface": {
"Type": "OS::Quantum::RouterInterface",
"Properties": {
"router_id": {
"Ref": "router"
},
"subnet_id": {
"Ref": "subnet"
}
}
},
"router_gateway": {
"Type": "OS::Quantum::RouterGateway",
"Properties": {
"router_id": {
"Ref": "router"
},
"network_id": "$externalNetworkId"
}
}
},
"Outputs": {
}
}

41
quantum_support/conductor/data/templates/cf/SQL-security.template Normal file
View File

@ -0,0 +1,41 @@
{
"Resources": {
"$port-{instanceName}": {
"Properties": {
"security_groups" : [ {"Ref" : "MsSqlSecurityGroup"} ]
}
},
"MsSqlSecurityGroup": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
"SecurityGroupIngress": [
{
"ToPort": "4022",
"IpProtocol": "tcp",
"FromPort": "4022",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": "135",
"IpProtocol": "tcp",
"FromPort": "135",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": "1433",
"IpProtocol": "tcp",
"FromPort": "1433",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": "1434",
"IpProtocol": "tcp",
"FromPort": "1434",
"CidrIp": "0.0.0.0/0"
}
],
"GroupDescription": "Enable MS SQL access"
}
}
}
}

44
quantum_support/conductor/data/templates/cf/SQLCluster.template Normal file
View File

@ -0,0 +1,44 @@
{
"Resources": {
"$port-{instanceName}": {
"Properties": {
"allowed_address_pairs": [ {
"ip_address": "$clusterIp"
}],
"security_groups": [ { "Ref": "MsSqlSecurityGroup" } ]
}
},
"MsSqlSecurityGroup": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
"SecurityGroupIngress": [
{
"ToPort": "4022",
"IpProtocol": "tcp",
"FromPort": "4022",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": "135",
"IpProtocol": "tcp",
"FromPort": "135",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": "1433",
"IpProtocol": "tcp",
"FromPort": "1433",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": "1434",
"IpProtocol": "tcp",
"FromPort": "1434",
"CidrIp": "0.0.0.0/0"
}
],
"GroupDescription": "Enable MS SQL access"
}
}
}
}

128
quantum_support/conductor/data/templates/cf/Windows.template Normal file
View File

@ -0,0 +1,128 @@
{
"AWSTemplateFormatVersion": "2010-09-09",
"Parameters": {
"KeyName": {
"Description": "Key Pair name for Load Balancer",
"Type": "String",
"Default": "murano-lb-key"
}
},
"Resources": {
"$instanceName": {
"Type": "AWS::EC2::Instance",
"Properties": {
"BootFromVolume": true,
"InstanceType": "$instanceType",
"ImageId": "$imageName",
"AvailabilityZone": "$availabilityZone",
"UserData": "$userData",
"NetworkInterfaces": [ { "Ref": "$port-{instanceName}" } ]
}
},
"$port-{instanceName}": {
"Type": "OS::Quantum::Port",
"Properties": {
"network_id": {
"Ref": "network"
},
"security_groups" : [ { "Ref" : "MuranoDefaultSecurityGroup"}],
"fixed_ips": [
{
"subnet_id": {
"Ref": "subnet"
}
}
]
}
},
"MuranoDefaultSecurityGroup": {
"Type": "AWS::EC2::SecurityGroup",
"Properties": {
"SecurityGroupIngress": [
{
"ToPort": "3389",
"IpProtocol": "tcp",
"FromPort": "3389",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": "22",
"IpProtocol": "tcp",
"FromPort": "22",
"CidrIp": "0.0.0.0/0"
},
{
"ToPort": "-1",
"IpProtocol": "icmp",
"FromPort": "-1",
"CidrIp": "0.0.0.0/0"
},
{
"IpProtocol": "tcp",
"FromPort" : "1",
"ToPort": "65535",
"CidrIp": "10.0.0.0/24"
},
{
"IpProtocol": "udp",
"FromPort" : "1",
"ToPort": "65535",
"CidrIp": "10.0.0.0/24"
}
],
"GroupDescription": "Default security group for Windows Murano Environments"
}
},
"network": {
"Type": "OS::Quantum::Net",
"Properties": {
"name": "$network-{environmentId}"
}
},
"subnet": {
"Type": "OS::Quantum::Subnet",
"Properties": {
"network_id": {
"Ref": "network"
},
"ip_version": 4,
"cidr": "10.0.0.0/24",
"dns_nameservers": ["8.8.8.8"],
"allocation_pools": [
{
"start": "10.0.0.20",
"end": "10.0.0.250"
}
]
}
},
"router": {
"Type": "OS::Quantum::Router"
},
"router_interface": {
"Type": "OS::Quantum::RouterInterface",
"Properties": {
"router_id": {
"Ref": "router"
},
"subnet_id": {
"Ref": "subnet"
}
}
},
"router_gateway": {
"Type": "OS::Quantum::RouterGateway",
"Properties": {
"router_id": {
"Ref": "router"
},
"network_id": "$externalNetworkId"
}
}
},
"Outputs": {
}
}

0
patches/heat/0001-Added-support-for-Allow-Address-Pairs-feature.patch → quantum_support/patches/heat/0001-Added-support-for-Allow-Address-Pairs-feature.patch
View File

0
patches/heat/0002-Skip-None-values-in-fixed_ips-when-creating-Port.patch → quantum_support/patches/heat/0002-Skip-None-values-in-fixed_ips-when-creating-Port.patch
View File

0
patches/heat/0003-Backported-fix-for-dns_nameservers.patch → quantum_support/patches/heat/0003-Backported-fix-for-dns_nameservers.patch
View File

0
patches/heat/0004-Backported-fix-for-bug-1179481.patch → quantum_support/patches/heat/0004-Backported-fix-for-bug-1179481.patch
View File

0
patches/heat/0005-Adds-ability-to-configure-SSL-params-for-clients-use.patch → quantum_support/patches/heat/0005-Adds-ability-to-configure-SSL-params-for-clients-use.patch
View File

0
patches/quantum/0001-Backport-of-allow-address-pairs-feature.patch → quantum_support/patches/quantum/0001-Backport-of-allow-address-pairs-feature.patch
View File