diff --git a/releases/v1.5-openstack/master/barclamp-crowbar b/releases/v1.5-openstack/master/barclamp-crowbar new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-crowbar @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-deployer b/releases/v1.5-openstack/master/barclamp-deployer new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-deployer @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-dns b/releases/v1.5-openstack/master/barclamp-dns new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-dns @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-ganglia b/releases/v1.5-openstack/master/barclamp-ganglia new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-ganglia @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-glance b/releases/v1.5-openstack/master/barclamp-glance new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-glance @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-ipmi b/releases/v1.5-openstack/master/barclamp-ipmi new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-ipmi @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-keystone b/releases/v1.5-openstack/master/barclamp-keystone new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-keystone @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-logging b/releases/v1.5-openstack/master/barclamp-logging new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-logging @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-mysql b/releases/v1.5-openstack/master/barclamp-mysql new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-mysql @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-nagios b/releases/v1.5-openstack/master/barclamp-nagios new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-nagios @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-network b/releases/v1.5-openstack/master/barclamp-network new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-network @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-nova b/releases/v1.5-openstack/master/barclamp-nova new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-nova @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-nova_dashboard b/releases/v1.5-openstack/master/barclamp-nova_dashboard new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-nova_dashboard @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-ntp b/releases/v1.5-openstack/master/barclamp-ntp new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-ntp @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-openstack b/releases/v1.5-openstack/master/barclamp-openstack new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-openstack @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-provisioner b/releases/v1.5-openstack/master/barclamp-provisioner new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-provisioner @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-swift b/releases/v1.5-openstack/master/barclamp-swift new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-swift @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-tempest b/releases/v1.5-openstack/master/barclamp-tempest new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-tempest @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/barclamp-test b/releases/v1.5-openstack/master/barclamp-test new file mode 100644 index 00000000000..75e4d88c5e0 --- /dev/null +++ b/releases/v1.5-openstack/master/barclamp-test @@ -0,0 +1 @@ +v1.5-openstack diff --git a/releases/v1.5-openstack/master/change-image b/releases/v1.5-openstack/master/change-image new file mode 120000 index 00000000000..01f826f403c --- /dev/null +++ b/releases/v1.5-openstack/master/change-image @@ -0,0 +1 @@ +../master/change-image \ No newline at end of file diff --git a/releases/v1.5-openstack/master/crowbar.json b/releases/v1.5-openstack/master/crowbar.json new file mode 100644 index 00000000000..635e0ce16e5 --- /dev/null +++ b/releases/v1.5-openstack/master/crowbar.json @@ -0,0 +1,58 @@ +{ + "id": "default", + "description": "Self-referential barclamp enabling other barclamps", + "attributes": { + "crowbar": { + "instances": { + "deployer": [ "default" ], + "ipmi": [ "default" ], + "provisioner": [ "default" ], + "network": [ "default" ], + "ntp": [ "default" ], + "dns": [ "default" ], + "nagios": [ "default" ], + "ganglia": [ "default" ], + "logging": [ "default" ] + }, + "realm": "Crowbar - By selecting OK are agreeing to the License Agreement", + "web_port": 3000, + "users": { + "machine-install": { "password": "machine_password" }, + "crowbar": { "password": "crowbar" } + }, + "bios-settings": { + "Virtualization" : "Virtualization", + "Storage" : "Storage" + }, + "raid-settings": { + "JBOD Only": "JBODOnly", + "Single RAID 10": "SingleRaid10" + }, + "node-usage": { + "Nova": "Nova", + "Swift": "Swift", + "Glance": "Glance" + } + }, + "rails": { + "max_pool_size": 256, + "environment": "production" + } + }, + "deployment": { + "crowbar": { + "crowbar-revision": 0, + "elements": {}, + "element_order": [ + [ "crowbar" ] + ], + "config": { + "environment": "crowbar-config-test", + "mode": "full", + "transitions": false, + "transition_list": [ ] + } + } + } +} + diff --git a/releases/v1.5-openstack/master/extra b/releases/v1.5-openstack/master/extra new file mode 120000 index 00000000000..a34ff7d74b7 --- /dev/null +++ b/releases/v1.5-openstack/master/extra @@ -0,0 +1 @@ +../master/extra \ No newline at end of file diff --git a/releases/v1.5-openstack/master/network-openstack-10g-team.json b/releases/v1.5-openstack/master/network-openstack-10g-team.json new file mode 100644 index 00000000000..f9aa924311a --- /dev/null +++ b/releases/v1.5-openstack/master/network-openstack-10g-team.json @@ -0,0 +1,302 @@ +{ + "id": "bc-template-network", + "description": "Instantiates network interfaces on the crowbar managed systems. Also manages the address pool", + "attributes": { + "network": { + "start_up_delay": 30, + "mode": "team", + "teaming": { + "mode": 5 + }, + "interface_map": [ + { + "pattern": "PowerEdge R610", + "bus_order": [ + "0000:00/0000:00:01", + "0000:00/0000:00:03" + ] + }, + { + "pattern": "PowerEdge R710", + "bus_order": [ + "0000:00/0000:00:01", + "0000:00/0000:00:03" + ] + }, + { + "pattern": "PowerEdge C6145", + "bus_order": [ + "0000:00/0000:00:04", + "0000:00/0000:00:02" + ] + }, + { + "pattern": "PowerEdge C2100", + "bus_order": [ + "0000:00/0000:00:1c", + "0000:00/0000:00:07", + "0000:00/0000:00:09", + "0000:00/0000:00:01" + ] + }, + { + "pattern": "C6100", + "bus_order": [ + "0000:00/0000:00:01", + "0000:00/0000:00:03", + "0000:00/0000:00:07" + ] + }, + { + "pattern": "product", + "bus_order": [ + "0000:00/0000:00:01", + "0000:00/0000:00:02" + ] + } + ], + "conduit_map": [ + { + "pattern": "team/.*/crowbar-config-default", + "conduit_list": { + "intf0": { + "if_list": [ "10g1", "10g2" ], + "team_mode": 5 + }, + "intf1": { + "if_list": [ "10g1", "10g2" ], + "team_mode": 5 + }, + "intf2": { + "if_list": [ "10g1", "10g2" ], + "team_mode": 5 + } + } + }, + { + "pattern": "team/.*/nova-multi-compute", + "conduit_list": { + "intf0": { + "if_list": [ "10g1", "10g2" ], + "team_mode": 5 + }, + "intf1": { + "if_list": [ "10g1", "10g2" ], + "team_mode": 5 + }, + "intf2": { + "if_list": [ "10g1", "10g2" ], + "team_mode": 5 + } + } + }, + { + "pattern": "team/.*/nova.*", + "conduit_list": { + "intf0": { + "if_list": [ "10g1", "10g2" ], + "team_mode": 5 + }, + "intf1": { + "if_list": [ "10g1", "10g2" ], + "team_mode": 5 + }, + "intf2": { + "if_list": [ "10g1", "10g2" ], + "team_mode": 5 + } + } + }, + { + "pattern": "team/.*/.*", + "conduit_list": { + "intf0": { + "if_list": [ "10g1", "10g2" ], + "team_mode": 5 + }, + "intf1": { + "if_list": [ "10g1", "10g2" ], + "team_mode": 5 + }, + "intf2": { + "if_list": [ "10g1", "10g2" ], + "team_mode": 5 + } + } + }, + { + "pattern": "dual/.*/.*", + "conduit_list": { + "intf0": { + "if_list": [ "10g1" ] + }, + "intf1": { + "if_list": [ "10g2" ] + }, + "intf2": { + "if_list": [ "10g1" ] + } + } + }, + { + "pattern": "single/.*/.*", + "conduit_list": { + "intf0": { + "if_list": [ "10g1" ] + }, + "intf1": { + "if_list": [ "10g1" ] + }, + "intf2": { + "if_list": [ "10g1" ] + } + } + }, + { + "pattern": ".*/.*/.*", + "conduit_list": { + "intf0": { + "if_list": [ "10g1" ] + }, + "intf1": { + "if_list": [ "10g1" ] + }, + "intf2": { + "if_list": [ "10g1" ] + } + } + }, + { + "pattern": "mode/1g_adpt_count/role", + "conduit_list": { + "intf0": { + "if_list": [ "10g1" ] + }, + "intf1": { + "if_list": [ "10g1" ] + }, + "intf2": { + "if_list": [ "10g1" ] + } + } + } + ], + "networks": { + "storage": { + "conduit": "intf1", + "vlan": 200, + "use_vlan": true, + "add_bridge": false, + "subnet": "192.168.125.0", + "netmask": "255.255.255.0", + "broadcast": "192.168.125.255", + "ranges": { + "host": { "start": "192.168.125.10", "end": "192.168.125.239" } + } + }, + "public": { + "conduit": "intf1", + "vlan": 300, + "use_vlan": true, + "add_bridge": false, + "subnet": "192.168.122.0", + "netmask": "255.255.255.0", + "broadcast": "192.168.122.255", + "router": "192.168.122.1", + "router_pref" : 5, + "ranges": { + "host": { "start": "192.168.122.2", "end": "192.168.122.49" }, + "dhcp": { "start": "192.168.122.50", "end": "192.168.122.127" } + } + }, + "nova_fixed": { + "conduit": "intf1", + "vlan": 500, + "use_vlan": true, + "add_bridge": true, + "subnet": "192.168.123.0", + "netmask": "255.255.255.0", + "broadcast": "192.168.123.255", + "router": "192.168.123.1", + "router_pref" : 20, + "ranges": { + "router": { "start": "192.168.123.1", "end": "192.168.123.49" }, + "dhcp": { "start": "192.168.123.50", "end": "192.168.123.254" } + } + }, + "nova_floating": { + "conduit": "intf1", + "vlan": 300, + "use_vlan": true, + "add_bridge": false, + "subnet": "192.168.122.128", + "netmask": "255.255.255.192", + "broadcast": "192.168.122.191", + "ranges": { + "host": { "start": "192.168.122.129", "end": "192.168.122.191" } + } + }, + "bmc": { + "conduit": "bmc", + "vlan": 100, + "use_vlan": false, + "add_bridge": false, + "subnet": "192.168.124.0", + "netmask": "255.255.255.0", + "broadcast": "192.168.124.255", + "ranges": { + "host": { "start": "192.168.124.162", "end": "192.168.124.240" } + } + }, + "bmc_vlan": { + "conduit": "intf2", + "vlan": 100, + "use_vlan": true, + "add_bridge": false, + "subnet": "192.168.124.0", + "netmask": "255.255.255.0", + "broadcast": "192.168.124.255", + "ranges": { + "host": { "start": "192.168.124.161", "end": "192.168.124.161" } + } + }, + "admin": { + "conduit": "intf0", + "vlan": 100, + "use_vlan": false, + "add_bridge": false, + "subnet": "192.168.124.0", + "netmask": "255.255.255.0", + "broadcast": "192.168.124.255", + "router": "192.168.124.1", + "router_pref" : 10, + "ranges": { + "admin": { "start": "192.168.124.10", "end": "192.168.124.11" }, + "dhcp": { "start": "192.168.124.21", "end": "192.168.124.80" }, + "host": { "start": "192.168.124.81", "end": "192.168.124.160" }, + "switch": { "start": "192.168.124.241", "end": "192.168.124.250" } + } + } + } + } + }, + "deployment": { + "network": { + "crowbar-revision": 0, + "elements": {}, + "element_states": { + "network": [ "readying", "ready", "applying" ] + }, + "element_order": [ + [ "network" ] + ], + "config": { + "environment": "network-base-config", + "mode": "full", + "transitions": true, + "transition_list": [ "discovered", "reset", "delete" ] + } + } + } +} + diff --git a/releases/v1.5-openstack/master/network-openstack-team.json b/releases/v1.5-openstack/master/network-openstack-team.json new file mode 100644 index 00000000000..4574e7e1dd4 --- /dev/null +++ b/releases/v1.5-openstack/master/network-openstack-team.json @@ -0,0 +1,302 @@ +{ + "id": "bc-template-network", + "description": "Instantiates network interfaces on the crowbar managed systems. Also manages the address pool", + "attributes": { + "network": { + "start_up_delay": 30, + "mode": "team", + "teaming": { + "mode": 5 + }, + "interface_map": [ + { + "pattern": "PowerEdge R610", + "bus_order": [ + "0000:00/0000:00:01", + "0000:00/0000:00:03" + ] + }, + { + "pattern": "PowerEdge R710", + "bus_order": [ + "0000:00/0000:00:01", + "0000:00/0000:00:03" + ] + }, + { + "pattern": "PowerEdge C6145", + "bus_order": [ + "0000:00/0000:00:04", + "0000:00/0000:00:02" + ] + }, + { + "pattern": "PowerEdge C2100", + "bus_order": [ + "0000:00/0000:00:1c", + "0000:00/0000:00:07", + "0000:00/0000:00:09", + "0000:00/0000:00:01" + ] + }, + { + "pattern": "C6100", + "bus_order": [ + "0000:00/0000:00:01", + "0000:00/0000:00:03", + "0000:00/0000:00:07" + ] + }, + { + "pattern": "product", + "bus_order": [ + "0000:00/0000:00:01", + "0000:00/0000:00:02" + ] + } + ], + "conduit_map": [ + { + "pattern": "team/.*/crowbar-config-default", + "conduit_list": { + "intf0": { + "if_list": [ "1g1", "1g2" ], + "team_mode": 6 + }, + "intf1": { + "if_list": [ "1g1", "1g2" ], + "team_mode": 6 + }, + "intf2": { + "if_list": [ "1g1", "1g2" ], + "team_mode": 6 + } + } + }, + { + "pattern": "team/.*/nova-multi-compute", + "conduit_list": { + "intf0": { + "if_list": [ "1g1", "1g2" ], + "team_mode": 5 + }, + "intf1": { + "if_list": [ "1g1", "1g2" ], + "team_mode": 5 + }, + "intf2": { + "if_list": [ "1g1", "1g2" ], + "team_mode": 5 + } + } + }, + { + "pattern": "team/.*/nova.*", + "conduit_list": { + "intf0": { + "if_list": [ "1g1", "1g2" ], + "team_mode": 5 + }, + "intf1": { + "if_list": [ "1g1", "1g2" ], + "team_mode": 5 + }, + "intf2": { + "if_list": [ "1g1", "1g2" ], + "team_mode": 5 + } + } + }, + { + "pattern": "team/.*/.*", + "conduit_list": { + "intf0": { + "if_list": [ "1g1", "1g2" ], + "team_mode": 6 + }, + "intf1": { + "if_list": [ "1g1", "1g2" ], + "team_mode": 6 + }, + "intf2": { + "if_list": [ "1g1", "1g2" ], + "team_mode": 6 + } + } + }, + { + "pattern": "dual/.*/.*", + "conduit_list": { + "intf0": { + "if_list": [ "1g1" ] + }, + "intf1": { + "if_list": [ "1g2" ] + }, + "intf2": { + "if_list": [ "1g1" ] + } + } + }, + { + "pattern": "single/.*/.*", + "conduit_list": { + "intf0": { + "if_list": [ "1g1" ] + }, + "intf1": { + "if_list": [ "1g1" ] + }, + "intf2": { + "if_list": [ "1g1" ] + } + } + }, + { + "pattern": ".*/.*/.*", + "conduit_list": { + "intf0": { + "if_list": [ "1g1" ] + }, + "intf1": { + "if_list": [ "1g1" ] + }, + "intf2": { + "if_list": [ "1g1" ] + } + } + }, + { + "pattern": "mode/1g_adpt_count/role", + "conduit_list": { + "intf0": { + "if_list": [ "1g1" ] + }, + "intf1": { + "if_list": [ "1g1" ] + }, + "intf2": { + "if_list": [ "1g1" ] + } + } + } + ], + "networks": { + "storage": { + "conduit": "intf1", + "vlan": 200, + "use_vlan": true, + "add_bridge": false, + "subnet": "192.168.125.0", + "netmask": "255.255.255.0", + "broadcast": "192.168.125.255", + "ranges": { + "host": { "start": "192.168.125.10", "end": "192.168.125.239" } + } + }, + "public": { + "conduit": "intf1", + "vlan": 300, + "use_vlan": true, + "add_bridge": false, + "subnet": "192.168.122.0", + "netmask": "255.255.255.0", + "broadcast": "192.168.122.255", + "router": "192.168.122.1", + "router_pref" : 5, + "ranges": { + "host": { "start": "192.168.122.2", "end": "192.168.122.49" }, + "dhcp": { "start": "192.168.122.50", "end": "192.168.122.127" } + } + }, + "nova_fixed": { + "conduit": "intf1", + "vlan": 500, + "use_vlan": true, + "add_bridge": true, + "subnet": "192.168.123.0", + "netmask": "255.255.255.0", + "broadcast": "192.168.123.255", + "router": "192.168.123.1", + "router_pref" : 20, + "ranges": { + "router": { "start": "192.168.123.1", "end": "192.168.123.49" }, + "dhcp": { "start": "192.168.123.50", "end": "192.168.123.254" } + } + }, + "nova_floating": { + "conduit": "intf1", + "vlan": 300, + "use_vlan": true, + "add_bridge": false, + "subnet": "192.168.122.128", + "netmask": "255.255.255.192", + "broadcast": "192.168.122.191", + "ranges": { + "host": { "start": "192.168.122.129", "end": "192.168.122.191" } + } + }, + "bmc": { + "conduit": "bmc", + "vlan": 100, + "use_vlan": false, + "add_bridge": false, + "subnet": "192.168.124.0", + "netmask": "255.255.255.0", + "broadcast": "192.168.124.255", + "ranges": { + "host": { "start": "192.168.124.162", "end": "192.168.124.240" } + } + }, + "bmc_vlan": { + "conduit": "intf2", + "vlan": 100, + "use_vlan": true, + "add_bridge": false, + "subnet": "192.168.124.0", + "netmask": "255.255.255.0", + "broadcast": "192.168.124.255", + "ranges": { + "host": { "start": "192.168.124.161", "end": "192.168.124.161" } + } + }, + "admin": { + "conduit": "intf0", + "vlan": 100, + "use_vlan": false, + "add_bridge": false, + "subnet": "192.168.124.0", + "netmask": "255.255.255.0", + "broadcast": "192.168.124.255", + "router": "192.168.124.1", + "router_pref" : 10, + "ranges": { + "admin": { "start": "192.168.124.10", "end": "192.168.124.11" }, + "dhcp": { "start": "192.168.124.21", "end": "192.168.124.80" }, + "host": { "start": "192.168.124.81", "end": "192.168.124.160" }, + "switch": { "start": "192.168.124.241", "end": "192.168.124.250" } + } + } + } + } + }, + "deployment": { + "network": { + "crowbar-revision": 0, + "elements": {}, + "element_states": { + "network": [ "readying", "ready", "applying" ] + }, + "element_order": [ + [ "network" ] + ], + "config": { + "environment": "network-base-config", + "mode": "full", + "transitions": true, + "transition_list": [ "discovered", "reset", "delete" ] + } + } + } +} +