diff options
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/cloud/configure_nodes.py | 6 | ||||
| -rw-r--r-- | deploy/common.py | 12 | ||||
| -rw-r--r-- | deploy/config/dea_base.yaml | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | deploy/deploy.py | 2 | ||||
| -rw-r--r-- | deploy/deploy_env.py | 3 | ||||
| -rw-r--r-- | deploy/install_fuel_master.py | 2 | ||||
| -rw-r--r-- | deploy/reap.py | 2 | ||||
| -rw-r--r-- | deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml | 92 | ||||
| -rw-r--r-- | deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml | 92 | ||||
| -rw-r--r-- | deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml | 92 | ||||
| -rw-r--r-- | deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml | 92 |
11 files changed, 299 insertions, 98 deletions
diff --git a/deploy/cloud/configure_nodes.py b/deploy/cloud/configure_nodes.py index 46121df62..b4875cc6a 100644 --- a/deploy/cloud/configure_nodes.py +++ b/deploy/cloud/configure_nodes.py @@ -43,12 +43,18 @@ class ConfigureNodes(object): exec_cmd('fuel node set --node-id %s --role %s --env %s' % (node_id, roles_blade[0], self.env_id)) + # Download the unmodified default deployment configuration, because we + # need it for the network config. self.download_deployment_config() for node_id, roles_blade in self.node_id_roles_dict.iteritems(): self.download_interface_config(node_id) self.modify_node_interface(node_id, roles_blade) self.modify_node_network_schemes(node_id, roles_blade) self.upload_interface_config(node_id) + + # Download our modified deployment configuration, which includes our + # changes to network topology etc. + self.download_deployment_config() self.upload_deployment_config() def modify_node_network_schemes(self, node_id, roles_blade): diff --git a/deploy/common.py b/deploy/common.py index 787a21a1d..41b4e274e 100644 --- a/deploy/common.py +++ b/deploy/common.py @@ -38,20 +38,20 @@ LOG.addHandler(out_handler) os.chmod(LOGFILE, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO) def exec_cmd(cmd, check=True): - nul_f = open(os.devnull, 'w') process = subprocess.Popen(cmd, stdout=subprocess.PIPE, - stderr=nul_f, + stderr=subprocess.PIPE, shell=True) - nul_f.close() - response = process.communicate()[0].strip() + (response, stderr) = process.communicate() return_code = process.returncode + response = response.strip() if check: if return_code > 0: + stderr = stderr.strip() print "Failed command: " + str(cmd) - print "Command returned response: " + str(response) + print "Command returned response: " + str(stderr) print "Command return code: " + str(return_code) - raise Exception(response) + raise Exception(stderr) else: print "Command: " + str(cmd) print str(response) diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml index 1a34d819a..15e3cb9d8 100644 --- a/deploy/config/dea_base.yaml +++ b/deploy/config/dea_base.yaml @@ -19,7 +19,7 @@ fuel: FUEL_ACCESS: password: admin user: admin -wanted_release: Liberty on Ubuntu 14.04 +wanted_release: Mitaka on Ubuntu 14.04 settings: editable: access: diff --git a/deploy/deploy.py b/deploy/deploy.py index 0d406412c..742e76baa 100644..100755 --- a/deploy/deploy.py +++ b/deploy/deploy.py @@ -165,6 +165,8 @@ class AutoDeploy(object): '-x "lost+found:" -V %s -o %s .' % (iso_linux_bin, iso_label, new_iso)) + delete(tmp_new_dir) + def update_fuel_isolinux(self, file): with io.open(file) as f: data = f.read() diff --git a/deploy/deploy_env.py b/deploy/deploy_env.py index aa861e102..5eeaf11e0 100644 --- a/deploy/deploy_env.py +++ b/deploy/deploy_env.py @@ -216,7 +216,8 @@ class CloudDeploy(object): def node_discovery(self, node_list, discovered_macs): for node in node_list: if (node[N['status']] == 'discover' and - node[N['online']] == 'True' and + (node[N['online']] == 'True' or + node[N['online']] == '1') and node[N['mac']] not in discovered_macs): discovered_macs.append(node[N['mac']]) blade = self.find_mac_in_dict(node[N['mac']]) diff --git a/deploy/install_fuel_master.py b/deploy/install_fuel_master.py index 4f6a0527b..631bf99b9 100644 --- a/deploy/install_fuel_master.py +++ b/deploy/install_fuel_master.py @@ -21,7 +21,7 @@ from common import ( ) TRANSPLANT_FUEL_SETTINGS = 'transplant_fuel_settings.py' -BOOTSTRAP_ADMIN = '/usr/local/sbin/bootstrap_admin_node' +BOOTSTRAP_ADMIN = 'bootstrap_admin_node' FUEL_CLIENT_CONFIG = '/etc/fuel/client/config.yaml' PLUGINS_DIR = '~/plugins' LOCAL_PLUGIN_FOLDER = '/opt/opnfv' diff --git a/deploy/reap.py b/deploy/reap.py index 1262d4c71..c642a4243 100644 --- a/deploy/reap.py +++ b/deploy/reap.py @@ -244,7 +244,7 @@ class Reap(object): fuel[key] = data[key] for key in fuel['ADMIN_NETWORK'].keys(): if key not in ['ipaddress', 'netmask', - 'dhcp_pool_start', 'dhcp_pool_end']: + 'dhcp_pool_start', 'dhcp_pool_end', 'ssh_network']: del fuel['ADMIN_NETWORK'][key] self.write_yaml(self.dea_file, {'fuel': fuel}) diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml index 14316df2d..06b04af73 100644 --- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml @@ -22,9 +22,9 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L2 HA deployment - version: 0.0.3 - created: Jan 26 2016 - comment: Rebased to Fuel8 + version: 0.0.4 + created: Jun 02 2016 + comment: Rebased to Fuel9 ############################################################################## # Stack extentions are opnfv added value features in form of a fuel-plugin @@ -84,16 +84,35 @@ dea-override-config: label: OpenDaylight plugin toggleable: true versions: - - enable_gbp: - label: GBP features + - bgpvpn_gateway: + description: Define the default gateway for BGPVPN + label: Default Gateway + regex: + error: Invalid ip number + source: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ + restrictions: + - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN + is enabled. + type: text + value: 0.0.0.0 + weight: 16 + enable_bgpvpn: + description: 'This enables the bgpvpn extension of neutron togethere with + the corresponding sdnvpn features in odl. This feature will disable the + standart ovsdb feature from ODL. + + ' + label: BGPVPN extensions type: checkbox value: false - weight: 14 + weight: 15 enable_l3_odl: label: Use ODL to manage L3 traffic restrictions: - - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation type. - - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign public network to all nodes + - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation + type. + - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign + public network to all nodes type: checkbox value: false weight: 12 @@ -103,8 +122,14 @@ dea-override-config: value: false weight: 13 metadata: - always_editable: false + default_credentials: + password: admin + user: admin + hot_pluggable: false + jetty_port: 8181 odl_features: + cluster: + - odl-jolokia default: - config - standard @@ -113,33 +138,38 @@ dea-override-config: - kar - ssh - management - gbp: - - odl-groupbasedpolicy-base - - odl-groupbasedpolicy-ofoverlay - ovs: - - odl-ovsdb-openstack + gcr: + - odl-groupbasedpolicy-ovssfc + ncr: + - odl-ovsdb-sfc + - odl-ovsdb-sfc-rest + odl-default: - odl-restconf-all - odl-aaa-authn - odl-dlux-all + ovs: + - odl-ovsdb-openstack sfc: - - odl-sfc-core + - odl-sfc-model + - odl-sfc-provider + - odl-sfc-provider-rest - odl-sfc-sb-rest - odl-sfc-ui - odl-sfc-netconf - odl-sfc-ovs - odl-sfcofl2 - - odl-sfc-test-consumer vpn: - - odl-vpnservice-api - - odl-vpnservice-impl - - odl-vpnservice-impl-rest - - odl-vpnservice-impl-ui - - odl-vpnservice-core - odl-vpnservice-openstack # plugin_id: Assigned during installation - plugin_version: 0.8.0 + plugin_version: 0.9.0 restrictions: - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight + odl_v2: + description: V2 version is considered as experimental + label: Use V2 ML2 driver + type: checkbox + value: false + weight: 17 rest_api_port: description: Port on which ODL REST API will be available. label: Port number @@ -149,6 +179,24 @@ dea-override-config: type: text value: '8282' weight: 40 + sfc_class: + description: 'Classifier determines what traffic needs to be chained based + on policy based on yang model. The OpenDayLight actually supports the + OVSDB NetVirt and the GBP classifier in case of SFC. + + ' + label: Classifier used by SFC + restrictions: + - action: hide + condition: settings:opendaylight.enable_sfc.value == false + type: select + value: ncr + values: + - data: ncr + label: NetVirt + - data: gcr + label: GBP + weight: 14 weight: 70 dha-override-config: diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml index 0f09ca478..f8199e6e7 100644 --- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml @@ -22,9 +22,9 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L3 HA deployment - version: 0.0.4 - created: Jan 28 2016 - comment: Rebased to Fuel8 + version: 0.0.5 + created: Jun 02 2016 + comment: Rebased to Fuel9 ############################################################################## # Stack extentions are opnfv added value features in form of a fuel-plugin @@ -87,16 +87,35 @@ dea-override-config: label: OpenDaylight plugin toggleable: true versions: - - enable_gbp: - label: GBP features + - bgpvpn_gateway: + description: Define the default gateway for BGPVPN + label: Default Gateway + regex: + error: Invalid ip number + source: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ + restrictions: + - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN + is enabled. + type: text + value: 0.0.0.0 + weight: 16 + enable_bgpvpn: + description: 'This enables the bgpvpn extension of neutron togethere with + the corresponding sdnvpn features in odl. This feature will disable the + standart ovsdb feature from ODL. + + ' + label: BGPVPN extensions type: checkbox value: false - weight: 14 + weight: 15 enable_l3_odl: label: Use ODL to manage L3 traffic restrictions: - - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation type. - - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign public network to all nodes + - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation + type. + - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign + public network to all nodes type: checkbox value: true weight: 12 @@ -106,8 +125,14 @@ dea-override-config: value: false weight: 13 metadata: - always_editable: false + default_credentials: + password: admin + user: admin + hot_pluggable: false + jetty_port: 8181 odl_features: + cluster: + - odl-jolokia default: - config - standard @@ -116,33 +141,38 @@ dea-override-config: - kar - ssh - management - gbp: - - odl-groupbasedpolicy-base - - odl-groupbasedpolicy-ofoverlay - ovs: - - odl-ovsdb-openstack + gcr: + - odl-groupbasedpolicy-ovssfc + ncr: + - odl-ovsdb-sfc + - odl-ovsdb-sfc-rest + odl-default: - odl-restconf-all - odl-aaa-authn - odl-dlux-all + ovs: + - odl-ovsdb-openstack sfc: - - odl-sfc-core + - odl-sfc-model + - odl-sfc-provider + - odl-sfc-provider-rest - odl-sfc-sb-rest - odl-sfc-ui - odl-sfc-netconf - odl-sfc-ovs - odl-sfcofl2 - - odl-sfc-test-consumer vpn: - - odl-vpnservice-api - - odl-vpnservice-impl - - odl-vpnservice-impl-rest - - odl-vpnservice-impl-ui - - odl-vpnservice-core - odl-vpnservice-openstack # plugin_id: Assigned during installation - plugin_version: 0.8.0 + plugin_version: 0.9.0 restrictions: - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight + odl_v2: + description: V2 version is considered as experimental + label: Use V2 ML2 driver + type: checkbox + value: true + weight: 17 rest_api_port: description: Port on which ODL REST API will be available. label: Port number @@ -152,6 +182,24 @@ dea-override-config: type: text value: '8282' weight: 40 + sfc_class: + description: 'Classifier determines what traffic needs to be chained based + on policy based on yang model. The OpenDayLight actually supports the + OVSDB NetVirt and the GBP classifier in case of SFC. + + ' + label: Classifier used by SFC + restrictions: + - action: hide + condition: settings:opendaylight.enable_sfc.value == false + type: select + value: ncr + values: + - data: ncr + label: NetVirt + - data: gcr + label: GBP + weight: 14 weight: 70 dha-override-config: diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml index 0cc1258b7..02cc907a4 100644 --- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml @@ -22,9 +22,9 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L2 No-HA deployment - version: 0.0.2 - created: Jan 26 2016 - comment: Fuel ODL-L2 No HA with Ceph, Ceilometer and Heat Rebased for Fuel8 + version: 0.0.3 + created: Jun 02 2016 + comment: Rebased to Fuel9 ############################################################################## # Stack extentions are opnfv added value features in form of a fuel-plugin @@ -81,16 +81,35 @@ dea-override-config: label: OpenDaylight plugin toggleable: true versions: - - enable_gbp: - label: GBP features + - bgpvpn_gateway: + description: Define the default gateway for BGPVPN + label: Default Gateway + regex: + error: Invalid ip number + source: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ + restrictions: + - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN + is enabled. + type: text + value: 0.0.0.0 + weight: 16 + enable_bgpvpn: + description: 'This enables the bgpvpn extension of neutron togethere with + the corresponding sdnvpn features in odl. This feature will disable the + standart ovsdb feature from ODL. + + ' + label: BGPVPN extensions type: checkbox value: false - weight: 14 + weight: 15 enable_l3_odl: label: Use ODL to manage L3 traffic restrictions: - - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation type. - - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign public network to all nodes + - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation + type. + - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign + public network to all nodes type: checkbox value: false weight: 12 @@ -100,8 +119,14 @@ dea-override-config: value: false weight: 13 metadata: - always_editable: false + default_credentials: + password: admin + user: admin + hot_pluggable: false + jetty_port: 8181 odl_features: + cluster: + - odl-jolokia default: - config - standard @@ -110,33 +135,38 @@ dea-override-config: - kar - ssh - management - gbp: - - odl-groupbasedpolicy-base - - odl-groupbasedpolicy-ofoverlay - ovs: - - odl-ovsdb-openstack + gcr: + - odl-groupbasedpolicy-ovssfc + ncr: + - odl-ovsdb-sfc + - odl-ovsdb-sfc-rest + odl-default: - odl-restconf-all - odl-aaa-authn - odl-dlux-all + ovs: + - odl-ovsdb-openstack sfc: - - odl-sfc-core + - odl-sfc-model + - odl-sfc-provider + - odl-sfc-provider-rest - odl-sfc-sb-rest - odl-sfc-ui - odl-sfc-netconf - odl-sfc-ovs - odl-sfcofl2 - - odl-sfc-test-consumer vpn: - - odl-vpnservice-api - - odl-vpnservice-impl - - odl-vpnservice-impl-rest - - odl-vpnservice-impl-ui - - odl-vpnservice-core - odl-vpnservice-openstack # plugin_id: Assigned during installation - plugin_version: 0.8.0 + plugin_version: 0.9.0 restrictions: - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight + odl_v2: + description: V2 version is considered as experimental + label: Use V2 ML2 driver + type: checkbox + value: false + weight: 17 rest_api_port: description: Port on which ODL REST API will be available. label: Port number @@ -146,6 +176,24 @@ dea-override-config: type: text value: '8282' weight: 40 + sfc_class: + description: 'Classifier determines what traffic needs to be chained based + on policy based on yang model. The OpenDayLight actually supports the + OVSDB NetVirt and the GBP classifier in case of SFC. + + ' + label: Classifier used by SFC + restrictions: + - action: hide + condition: settings:opendaylight.enable_sfc.value == false + type: select + value: ncr + values: + - data: ncr + label: NetVirt + - data: gcr + label: GBP + weight: 14 weight: 70 dha-override-config: diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml index 2ba2d6d75..911654643 100644 --- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml @@ -22,9 +22,9 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L3 No-HA deployment - version: 0.0.3 - created: Jan 28 2016 - comment: Fuel ODL-L3 No HA with Ceph, Ceilometer and Heat rebased for Fuel8 + version: 0.0.4 + created: Jun 02 2016 + comment: Rebased to Fuel9 ############################################################################## # Stack extentions are opnfv added value features in form of a fuel-plugin @@ -83,16 +83,35 @@ dea-override-config: label: OpenDaylight plugin toggleable: true versions: - - enable_gbp: - label: GBP features + - bgpvpn_gateway: + description: Define the default gateway for BGPVPN + label: Default Gateway + regex: + error: Invalid ip number + source: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ + restrictions: + - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN + is enabled. + type: text + value: 0.0.0.0 + weight: 16 + enable_bgpvpn: + description: 'This enables the bgpvpn extension of neutron togethere with + the corresponding sdnvpn features in odl. This feature will disable the + standart ovsdb feature from ODL. + + ' + label: BGPVPN extensions type: checkbox value: false - weight: 14 + weight: 15 enable_l3_odl: label: Use ODL to manage L3 traffic restrictions: - - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation type. - - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign public network to all nodes + - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation + type. + - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign + public network to all nodes type: checkbox value: true weight: 12 @@ -102,8 +121,14 @@ dea-override-config: value: false weight: 13 metadata: - always_editable: false + default_credentials: + password: admin + user: admin + hot_pluggable: false + jetty_port: 8181 odl_features: + cluster: + - odl-jolokia default: - config - standard @@ -112,33 +137,38 @@ dea-override-config: - kar - ssh - management - gbp: - - odl-groupbasedpolicy-base - - odl-groupbasedpolicy-ofoverlay - ovs: - - odl-ovsdb-openstack + gcr: + - odl-groupbasedpolicy-ovssfc + ncr: + - odl-ovsdb-sfc + - odl-ovsdb-sfc-rest + odl-default: - odl-restconf-all - odl-aaa-authn - odl-dlux-all + ovs: + - odl-ovsdb-openstack sfc: - - odl-sfc-core + - odl-sfc-model + - odl-sfc-provider + - odl-sfc-provider-rest - odl-sfc-sb-rest - odl-sfc-ui - odl-sfc-netconf - odl-sfc-ovs - odl-sfcofl2 - - odl-sfc-test-consumer vpn: - - odl-vpnservice-api - - odl-vpnservice-impl - - odl-vpnservice-impl-rest - - odl-vpnservice-impl-ui - - odl-vpnservice-core - odl-vpnservice-openstack # plugin_id: Assigned during installation - plugin_version: 0.8.0 + plugin_version: 0.9.0 restrictions: - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight + odl_v2: + description: V2 version is considered as experimental + label: Use V2 ML2 driver + type: checkbox + value: true + weight: 17 rest_api_port: description: Port on which ODL REST API will be available. label: Port number @@ -148,6 +178,24 @@ dea-override-config: type: text value: '8282' weight: 40 + sfc_class: + description: 'Classifier determines what traffic needs to be chained based + on policy based on yang model. The OpenDayLight actually supports the + OVSDB NetVirt and the GBP classifier in case of SFC. + + ' + label: Classifier used by SFC + restrictions: + - action: hide + condition: settings:opendaylight.enable_sfc.value == false + type: select + value: ncr + values: + - data: ncr + label: NetVirt + - data: gcr + label: GBP + weight: 14 weight: 70 dha-override-config: |