diff --git a/doc/source/command-objects/overcloud.rst b/doc/source/command-objects/overcloud.rst index d635975cf..6c3f3466b 100644 --- a/doc/source/command-objects/overcloud.rst +++ b/doc/source/command-objects/overcloud.rst @@ -12,7 +12,8 @@ Deploy an overcloud stack .. program:: overcloud deploy stack .. code:: bash - openstack overcloud deploy stack + openstack overcloud deploy + --stack [STACK_NAME] --templates [TEMPLATES] [-t ] [--control-scale CONTROL_SCALE] @@ -29,7 +30,6 @@ Deploy an overcloud stack [--neutron-physical-bridge NEUTRON_PHYSICAL_BRIDGE] [--neutron-bridge-mappings NEUTRON_BRIDGE_MAPPINGS] [--neutron-public-interface NEUTRON_PUBLIC_INTERFACE] - [--hypervisor-neutron-public-interface HYPERVISOR_NEUTRON_PUBLIC_INTERFACE] [--neutron-network-type NEUTRON_NETWORK_TYPE] [--neutron-tunnel-types NEUTRON_TUNNEL_TYPES] [--neutron-disable-tunneling] @@ -37,8 +37,6 @@ Deploy an overcloud stack [--neutron-mechanism-drivers NEUTRON_MECHANISM_DRIVERS] [--libvirt-type LIBVIRT_TYPE] [--ntp-server NTP_SERVER] [--cinder-lvm] - [--tripleo-root TRIPLEO_ROOT] - [--nodes-json NODES_JSON] [--no-proxy NO_PROXY] [-O ] [-e ] [--rhel-reg] [--reg-method {satellite,portal}] @@ -46,6 +44,11 @@ Deploy an overcloud stack [--reg-sat-url REG_SAT_URL] [--reg-activation-key REG_ACTIVATION_KEY] +.. option:: --stack + + Optionally rename stack from default of 'overcloud'. Currently, only one + stack is supported. + .. option:: --templates The directory containing the Heat templates to deploy. @@ -96,6 +99,8 @@ Deploy an overcloud stack .. option:: --neutron-flat-networks + Deprecated. + Comma separated list of physical_network names with which flat networks can be created. Use * to allow flat networks with arbitrary physical_network names. (default: 'datacentre') @@ -106,30 +111,36 @@ Deploy an overcloud stack .. option:: --neutron-bridge-mappings + Deprecated. + Comma separated list of bridge mappings. (default: datacentre:br-ex) .. option:: --neutron-public-interface Deprecated. -.. option:: --hypervisor-neutron-public-interface +.. option:: --neutron-network-type Deprecated. -.. option:: --neutron-network-type - The network type for the tenant networks. .. option:: --neutron-tunnel-types + Deprecated. + Network types supported by the agent (gre and/or vxlan). .. option:: --neutron-disable-tunneling + Deprecated. + Disables tunneling. .. option:: --neutron-network-vlan-ranges + Deprecated. + Comma separated list of :: or specifying physical_network names usable for VLAN provider and tenant networks, as well as ranges of VLAN tags on each @@ -137,6 +148,8 @@ Deploy an overcloud stack .. option:: --neutron-mechanism-drivers + Deprecated. + An ordered list of extension driver entrypoints to be loaded from the neutron.ml2.extension_drivers namespace. @@ -148,18 +161,6 @@ Deploy an overcloud stack The NTP for overcloud nodes. -.. option:: --cinder-lvm - - Enables the cinder lvm/iscsi backend. - -.. option:: --tripleo-root - - The root directory for TripleO templates. - -.. option:: --nodes-json - - A file containing node definitions. (default: instackenv.json) - .. option:: --no-proxy A comma separated list of hosts that should not be proxied. diff --git a/tripleoclient/constants.py b/tripleoclient/constants.py index 3539db152..5b0218f0a 100644 --- a/tripleoclient/constants.py +++ b/tripleoclient/constants.py @@ -38,48 +38,21 @@ RHEL_REGISTRATION_EXTRACONFIG_NAME = ( "extraconfig/post_deploy/rhel-registration/") PARAMETERS = { - 'AdminPassword': None, - 'AdminToken': None, - 'CeilometerPassword': None, - 'CeilometerMeteringSecret': None, - 'CinderPassword': None, + 'BlockStorageImage': 'overcloud-full', + 'CephStorageImage': 'overcloud-full', 'CinderISCSIHelper': 'lioadm', 'CloudName': 'overcloud', - 'ExtraConfig': '{}', - 'GlancePassword': None, - 'HeatPassword': None, - 'HeatStackDomainAdminPassword': None, - 'NeutronControlPlaneID': None, - 'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400', - 'NeutronPassword': None, - 'NeutronPublicInterface': 'nic1', - 'NeutronFlatNetworks': 'datacentre', - 'HypervisorNeutronPhysicalBridge': 'br-ex', - 'NeutronBridgeMappings': 'datacentre:br-ex', - 'HypervisorNeutronPublicInterface': 'nic1', - 'NovaPassword': None, - 'SwiftHashSuffix': None, - 'SwiftPassword': None, - 'SnmpdReadonlyUserPassword': None, - 'NtpServer': '', 'controllerImage': 'overcloud-full', + 'NeutronNetworkVLANRanges': 'datacentre:1:1000', 'NovaImage': 'overcloud-full', - 'BlockStorageImage': 'overcloud-full', - 'SwiftStorageImage': 'overcloud-full', - 'CephStorageImage': 'overcloud-full', 'OvercloudControlFlavor': 'baremetal', 'OvercloudComputeFlavor': 'baremetal', 'OvercloudBlockStorageFlavor': 'baremetal', 'OvercloudSwiftStorageFlavor': 'baremetal', 'OvercloudCephStorageFlavor': 'baremetal', - 'NeutronNetworkVLANRanges': 'datacentre:1:1000', + 'SwiftStorageImage': 'overcloud-full', } NEW_STACK_PARAMETERS = { 'NovaComputeLibvirtType': 'kvm', - 'NeutronTunnelIdRanges': ['1:1000'], - 'NeutronVniRanges': ['1:1000'], - 'NeutronEnableTunnelling': 'True', - 'NeutronNetworkType': 'gre', - 'NeutronTunnelTypes': 'gre', } diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index b5d7d3795..c0fd4c6c9 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -82,6 +82,7 @@ class DeployOvercloud(command.Command): def _update_paramaters(self, args, network_client, stack): parameters = constants.PARAMETERS.copy() + if stack is None: parameters.update(constants.NEW_STACK_PARAMETERS) @@ -721,31 +722,37 @@ class DeployOvercloud(command.Command): help=_('Comma separated list of physical_network ' 'names with which flat networks can be ' 'created. Use * to allow flat networks ' - 'with arbitrary physical_network names.')) + 'with arbitrary physical_network names. ' + '(DEPRECATED)')) parser.add_argument('--neutron-physical-bridge', help=_('Deprecated.')) parser.add_argument('--neutron-bridge-mappings', help=_('Comma separated list of bridge mappings. ' - '(default: datacentre:br-ex)')) + '(default: datacentre:br-ex) ' + '(DEPRECATED)')) parser.add_argument('--neutron-public-interface', help=_('Deprecated.')) parser.add_argument('--neutron-network-type', - help=_('The network type for tenant networks.')) + help=_('The network type for tenant networks. ' + '(DEPRECATED)')) parser.add_argument('--neutron-tunnel-types', help=_('Network types supported by the agent ' - '(gre and/or vxlan).')) + '(gre and/or vxlan). ' + '(DEPRECATED)')) parser.add_argument('--neutron-tunnel-id-ranges', default="1:1000", help=_("Ranges of GRE tunnel IDs to make " - "available for tenant network allocation"),) + "available for tenant network allocation " + "(DEPRECATED)"),) parser.add_argument('--neutron-vni-ranges', default="1:1000", help=_("Ranges of VXLAN VNI IDs to make " - "available for tenant network allocation"),) + "available for tenant network allocation " + "(DEPRECATED)"),) parser.add_argument('--neutron-disable-tunneling', dest='neutron_disable_tunneling', action="store_const", const=True, - help=_('Disables tunneling.')), + help=_('Disables tunneling. (DEPRECATED)')), parser.add_argument('--neutron-network-vlan-ranges', help=_('Comma separated list of ' ':: ' @@ -754,17 +761,18 @@ class DeployOvercloud(command.Command): 'provider and tenant networks, as well as ' 'ranges of VLAN tags on each available for ' 'allocation to tenant networks. ' - '(ex: datacentre:1:1000)')) + '(ex: datacentre:1:1000) (DEPRECATED)')) parser.add_argument('--neutron-mechanism-drivers', help=_('An ordered list of extension driver ' 'entrypoints to be loaded from the ' - 'neutron.ml2.extension_drivers namespace.')) + 'neutron.ml2.extension_drivers namespace. ' + '(DEPRECATED)')) parser.add_argument('--libvirt-type', default='kvm', choices=['kvm', 'qemu'], help=_('Libvirt domain type. (default: kvm)')) parser.add_argument('--ntp-server', - help=_('The NTP for overcloud nodes.')) + help=_('The NTP for overcloud nodes. ')) parser.add_argument( '--no-proxy', default=os.environ.get('no_proxy', ''),