From 2c3e5963f37e3462ccef6b08c2c0bc7e9dd80041 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Thu, 14 Mar 2019 13:55:08 -0400 Subject: [PATCH] Enable Distributed Cloud configuration The following changes are required to enable system controller and sub cloud configuration in a distributed cloud environment: * Remove references to os-keystone-region-name as the openstack patches that support it, have been removed. * Change the iptables rule for the NAT entry, to only apply, if the selected outgoing interface is the OAM interface. * Configure keystone endpoints, before configuring openrc on subclouds * Remove all openstack services, and users from the region config and update the tox * Disable nova, cinder and neutron api proxy Only tested distributed cloud configuration as multi-region configuration is not supported in the current release. Story: 2004766 Task: 30017 Change-Id: I5c43e2112f34225aa9e23ff777c5333ae77efcdc Signed-off-by: Tao Liu --- .../configutilities/common/utils.py | 20 - .../configutilities/common/validator.py | 224 +--------- .../controllerconfig/configassistant.py | 396 ------------------ .../controllerconfig/regionconfig.py | 144 ------- .../controllerconfig/systemconfig.py | 34 -- .../TiS_region_config.share.keystoneonly | 47 --- ...iS_region_config.share.keystoneonly.result | 37 -- .../tests/files/TiS_region_config.shareall | 42 -- .../files/TiS_region_config.shareall.result | 38 -- .../tests/files/cgcs_config.ceph | 4 - .../tests/files/cgcs_config.default | 4 - .../tests/files/cgcs_config.ipv6 | 4 - .../tests/files/cgcs_config.kubernetes | 4 - .../tests/files/cgcs_config.region | 39 -- .../tests/files/cgcs_config.region_nuage_vrs | 39 -- .../tests/files/region_config.lag.vlan | 41 -- .../tests/files/region_config.lag.vlan.result | 38 -- .../tests/files/region_config.nuage_vrs | 41 -- .../files/region_config.nuage_vrs.result | 50 --- .../tests/files/region_config.security | 41 -- .../tests/files/region_config.security.result | 38 -- .../tests/files/region_config.simple | 39 -- .../tests/files/region_config.simple.can_ips | 40 -- .../tests/files/region_config.simple.result | 38 -- .../tests/test_region_config.py | 37 -- .../modules/openstack/manifests/keystone.pp | 12 +- .../templates/keystone-defaultregion.erb | 2 - .../templates/keystone-systemcontroller.erb | 2 - .../modules/platform/manifests/kubernetes.pp | 4 +- .../src/modules/platform/manifests/sm.pp | 28 -- .../platform/templates/openrc.admin.erb | 1 - .../src/dcorch/manifests/keystone/auth.pp | 38 -- .../sysinv/sysinv/sysinv/conductor/manager.py | 12 +- 33 files changed, 8 insertions(+), 1570 deletions(-) diff --git a/configutilities/configutilities/configutilities/common/utils.py b/configutilities/configutilities/configutilities/common/utils.py index ffe03847f1..319aa53ed7 100644 --- a/configutilities/configutilities/configutilities/common/utils.py +++ b/configutilities/configutilities/configutilities/common/utils.py @@ -19,32 +19,12 @@ from configutilities.common.exceptions import ValidateFail EXPECTED_SERVICE_NAME_AND_TYPE = ( {"KEYSTONE_SERVICE_NAME": "keystone", "KEYSTONE_SERVICE_TYPE": "identity", - "GLANCE_SERVICE_NAME": "glance", - "GLANCE_SERVICE_TYPE": "image", - "NOVA_SERVICE_NAME": "nova", - "NOVA_SERVICE_TYPE": "compute", - "PLACEMENT_SERVICE_NAME": "placement", - "PLACEMENT_SERVICE_TYPE": "placement", - "NEUTRON_SERVICE_NAME": "neutron", - "NEUTRON_SERVICE_TYPE": "network", "SYSINV_SERVICE_NAME": "sysinv", "SYSINV_SERVICE_TYPE": "platform", "PATCHING_SERVICE_NAME": "patching", "PATCHING_SERVICE_TYPE": "patching", - "HEAT_SERVICE_NAME": "heat", - "HEAT_SERVICE_TYPE": "orchestration", - "HEAT_CFN_SERVICE_NAME": "heat-cfn", - "HEAT_CFN_SERVICE_TYPE": "cloudformation", - "CEILOMETER_SERVICE_NAME": "ceilometer", - "CEILOMETER_SERVICE_TYPE": "metering", "NFV_SERVICE_NAME": "vim", "NFV_SERVICE_TYPE": "nfv", - "AODH_SERVICE_NAME": "aodh", - "AODH_SERVICE_TYPE": "alarming", - "PANKO_SERVICE_NAME": "panko", - "PANKO_SERVICE_TYPE": "event", - "GNOCCHI_SERVICE_NAME": "gnocchi", - "GNOCCHI_SERVICE_TYPE": "metric", "FM_SERVICE_NAME": "fm", "FM_SERVICE_TYPE": "faultmanagement", "BARBICAN_SERVICE_NAME": "barbican", diff --git a/configutilities/configutilities/configutilities/common/validator.py b/configutilities/configutilities/configutilities/common/validator.py index c635439a83..b8a2b014ed 100644 --- a/configutilities/configutilities/configutilities/common/validator.py +++ b/configutilities/configutilities/configutilities/common/validator.py @@ -84,7 +84,6 @@ class ConfigValidator(object): self.cluster_network = None self.oam_network = None self.vswitch_type = None - self.glance_region = None self.system_mode = None self.system_type = None self.system_dc_role = None @@ -1086,82 +1085,17 @@ class ConfigValidator(object): if self.conf.has_section('NTP'): raise ConfigFail("NTP Configuration is no longer supported") - def validate_network(self): - if self.conf.has_option('NETWORK', 'VSWITCH_TYPE'): - self.vswitch_type = self.conf.get('NETWORK', - 'VSWITCH_TYPE').upper() - else: - self.vswitch_type = 'OVS-DPDK' - - if self.vswitch_type == 'NUAGE_VRS': - metadata_proxy_shared_secret = self.conf.get( - 'NETWORK', 'METADATA_PROXY_SHARED_SECRET') - - if self.cgcs_conf is not None: - self.cgcs_conf.add_section('cNETWORK') - self.cgcs_conf.set('cNETWORK', 'VSWITCH_TYPE', - self.vswitch_type.lower()) - if self.vswitch_type == 'NUAGE_VRS': - # Set the neutron config appropriately for the nuage_vrs - self.cgcs_conf.set('cNETWORK', 'NEUTRON_L2_AGENT', 'nuage_vrs') - self.cgcs_conf.set('cNETWORK', 'NEUTRON_L3_EXT_BRIDGE', - 'provider') - # These are only used by the ML2 plugin - self.cgcs_conf.set('cNETWORK', 'NEUTRON_L2_PLUGIN', 'NC') - self.cgcs_conf.set('cNETWORK', 'NEUTRON_ML2_MECHANISM_DRIVERS', - 'NC') - self.cgcs_conf.set('cNETWORK', - 'NEUTRON_ML2_SRIOV_AGENT_REQUIRED', 'NC') - self.cgcs_conf.set('cNETWORK', 'NEUTRON_ML2_TYPE_DRIVERS', - 'NC') - # This may be required if we use the openvswitch L2 agent - self.cgcs_conf.set('cNETWORK', - 'NEUTRON_ML2_TENANT_NETWORK_TYPES', - 'vlan,vxlan') - # These are for the neutron-server or neutron-api - self.cgcs_conf.set('cNETWORK', 'NEUTRON_HOST_DRIVER', 'NC') - self.cgcs_conf.set('cNETWORK', 'NEUTRON_FM_DRIVER', 'NC') - self.cgcs_conf.set('cNETWORK', 'NEUTRON_NETWORK_SCHEDULER', - 'NC') - self.cgcs_conf.set('cNETWORK', 'NEUTRON_ROUTER_SCHEDULER', - 'NC') - # Additional network options - self.cgcs_conf.set('cNETWORK', 'METADATA_PROXY_SHARED_SECRET', - metadata_proxy_shared_secret) - def validate_region(self, config_type=REGION_CONFIG): region_1_name = self.conf.get('SHARED_SERVICES', 'REGION_NAME') region_2_name = self.conf.get('REGION_2_SERVICES', 'REGION_NAME') if region_1_name == region_2_name: raise ConfigFail( "The Region Names must be unique.") - # validate VSWITCH_TYPE configuration - if self.vswitch_type == 'OVS-DPDK': - if self.conf.has_option('SHARED_SERVICES', 'NEUTRON_SERVICE_NAME'): - raise ConfigFail( - "When VSWITCH_TYPE is OVS-DPDK, NEUTRON service must " - "only be configured in REGION_2_SERVICES.") - neutron_group = 'REGION_2_SERVICES' - neutron_region_name = region_2_name - - elif self.vswitch_type == 'NUAGE_VRS': - if not self.conf.has_option('SHARED_SERVICES', - 'NEUTRON_SERVICE_NAME'): - raise ConfigFail( - "When VSWITCH_TYPE is NUAGE_VRS, NEUTRON service must " - "only be configured in SHARED_SERVICES.") - neutron_group = 'SHARED_SERVICES' - neutron_region_name = region_1_name - else: - raise ConfigFail("Invalid VSWITCH_TYPE value of %s." % - self.vswitch_type) if not (self.conf.has_option('REGION_2_SERVICES', 'CREATE') and self.conf.get('REGION_2_SERVICES', 'CREATE') == 'Y'): password_fields = [ - 'NOVA', 'CEILOMETER', 'PATCHING', 'SYSINV', 'HEAT', - 'HEAT_ADMIN', 'PLACEMENT', 'AODH', 'PANKO', 'GNOCCHI', - 'BARBICAN' + 'PATCHING', 'SYSINV', 'FM', 'BARBICAN', 'NFV', 'MTCE' ] for pw in password_fields: if not self.conf.has_option('REGION_2_SERVICES', @@ -1202,71 +1136,7 @@ class ConfigValidator(object): 'KEYSTONE_SERVICE_NAME') keystone_service_type = get_service(self.conf, 'SHARED_SERVICES', 'KEYSTONE_SERVICE_TYPE') - glance_user_name = None - glance_password = None - glance_cached = 'False' - if self.conf.has_option('SHARED_SERVICES', 'GLANCE_SERVICE_NAME'): - glance_service_name = get_service(self.conf, 'SHARED_SERVICES', - 'GLANCE_SERVICE_NAME') - glance_service_type = get_service(self.conf, 'SHARED_SERVICES', - 'GLANCE_SERVICE_TYPE') - self.glance_region = region_1_name - glance_cached = get_optional(self.conf, 'SHARED_SERVICES', - 'GLANCE_CACHED') - if glance_cached is None: - glance_cached = 'False' - elif glance_cached.upper() == 'TRUE': - glance_user_name = self.conf.get( - 'REGION_2_SERVICES', - 'GLANCE_USER_NAME') - glance_password = get_optional( - self.conf, 'REGION_2_SERVICES', - 'GLANCE_PASSWORD') - self.glance_region = region_2_name - else: - glance_service_name = get_service(self.conf, 'REGION_2_SERVICES', - 'GLANCE_SERVICE_NAME') - glance_service_type = get_service(self.conf, 'REGION_2_SERVICES', - 'GLANCE_SERVICE_TYPE') - self.glance_region = region_2_name - glance_user_name = self.conf.get('REGION_2_SERVICES', - 'GLANCE_USER_NAME') - glance_password = get_optional(self.conf, 'REGION_2_SERVICES', - 'GLANCE_PASSWORD') - - nova_user_name = self.conf.get('REGION_2_SERVICES', 'NOVA_USER_NAME') - nova_password = get_optional(self.conf, 'REGION_2_SERVICES', - 'NOVA_PASSWORD') - nova_service_name = get_service(self.conf, 'REGION_2_SERVICES', - 'NOVA_SERVICE_NAME') - nova_service_type = get_service(self.conf, 'REGION_2_SERVICES', - 'NOVA_SERVICE_TYPE') - placement_user_name = self.conf.get('REGION_2_SERVICES', - 'PLACEMENT_USER_NAME') - placement_password = get_optional(self.conf, 'REGION_2_SERVICES', - 'PLACEMENT_PASSWORD') - placement_service_name = get_service(self.conf, 'REGION_2_SERVICES', - 'PLACEMENT_SERVICE_NAME') - placement_service_type = get_service(self.conf, 'REGION_2_SERVICES', - 'PLACEMENT_SERVICE_TYPE') - - neutron_user_name = self.conf.get(neutron_group, - 'NEUTRON_USER_NAME') - neutron_password = get_optional(self.conf, neutron_group, - 'NEUTRON_PASSWORD') - neutron_service_name = get_service(self.conf, neutron_group, - 'NEUTRON_SERVICE_NAME') - neutron_service_type = get_service(self.conf, neutron_group, - 'NEUTRON_SERVICE_TYPE') - ceilometer_user_name = self.conf.get('REGION_2_SERVICES', - 'CEILOMETER_USER_NAME') - ceilometer_password = get_optional(self.conf, 'REGION_2_SERVICES', - 'CEILOMETER_PASSWORD') - ceilometer_service_name = get_service(self.conf, 'REGION_2_SERVICES', - 'CEILOMETER_SERVICE_NAME') - ceilometer_service_type = get_service(self.conf, 'REGION_2_SERVICES', - 'CEILOMETER_SERVICE_TYPE') # validate the patch service name and type get_service(self.conf, 'REGION_2_SERVICES', 'PATCHING_SERVICE_NAME') get_service(self.conf, 'REGION_2_SERVICES', 'PATCHING_SERVICE_TYPE') @@ -1283,26 +1153,6 @@ class ConfigValidator(object): sysinv_service_type = get_service(self.conf, 'REGION_2_SERVICES', 'SYSINV_SERVICE_TYPE') - # validate the heat service name and type - get_service(self.conf, 'REGION_2_SERVICES', 'HEAT_SERVICE_NAME') - get_service(self.conf, 'REGION_2_SERVICES', 'HEAT_SERVICE_TYPE') - get_service(self.conf, 'REGION_2_SERVICES', 'HEAT_CFN_SERVICE_NAME') - get_service(self.conf, 'REGION_2_SERVICES', 'HEAT_CFN_SERVICE_TYPE') - heat_user_name = self.conf.get('REGION_2_SERVICES', 'HEAT_USER_NAME') - heat_password = get_optional(self.conf, 'REGION_2_SERVICES', - 'HEAT_PASSWORD') - heat_admin_user_name = self.conf.get('REGION_2_SERVICES', - 'HEAT_ADMIN_USER_NAME') - heat_admin_password = get_optional(self.conf, 'REGION_2_SERVICES', - 'HEAT_ADMIN_PASSWORD') - # validate aodh service name and type - - get_service(self.conf, 'REGION_2_SERVICES', 'AODH_SERVICE_NAME') - get_service(self.conf, 'REGION_2_SERVICES', 'AODH_SERVICE_TYPE') - aodh_user_name = self.conf.get('REGION_2_SERVICES', 'AODH_USER_NAME') - aodh_password = get_optional(self.conf, 'REGION_2_SERVICES', - 'AODH_PASSWORD') - # validate nfv service name and type get_service(self.conf, 'REGION_2_SERVICES', 'NFV_SERVICE_NAME') get_service(self.conf, 'REGION_2_SERVICES', 'NFV_SERVICE_TYPE') @@ -1315,19 +1165,6 @@ class ConfigValidator(object): mtce_password = get_optional(self.conf, 'REGION_2_SERVICES', 'MTCE_PASSWORD') - # validate panko service name and type - get_service(self.conf, 'REGION_2_SERVICES', 'PANKO_SERVICE_NAME') - get_service(self.conf, 'REGION_2_SERVICES', 'PANKO_SERVICE_TYPE') - panko_user_name = self.conf.get('REGION_2_SERVICES', 'PANKO_USER_NAME') - panko_password = get_optional(self.conf, 'REGION_2_SERVICES', - 'PANKO_PASSWORD') - - # validate gnocchi service name and type - gnocchi_user_name = self.conf.get('REGION_2_SERVICES', - 'GNOCCHI_USER_NAME') - gnocchi_password = get_optional(self.conf, 'REGION_2_SERVICES', - 'GNOCCHI_PASSWORD') - # validate fm service name and type get_service(self.conf, 'REGION_2_SERVICES', 'FM_SERVICE_NAME') get_service(self.conf, 'REGION_2_SERVICES', 'FM_SERVICE_TYPE') @@ -1381,50 +1218,6 @@ class ConfigValidator(object): keystone_service_name) self.cgcs_conf.set('cREGION', 'KEYSTONE_SERVICE_TYPE', keystone_service_type) - if glance_user_name is not None: - self.cgcs_conf.set('cREGION', 'GLANCE_USER_NAME', - glance_user_name) - if glance_password is not None: - self.cgcs_conf.set('cREGION', 'GLANCE_PASSWORD', - glance_password) - self.cgcs_conf.set('cREGION', 'GLANCE_SERVICE_NAME', - glance_service_name) - self.cgcs_conf.set('cREGION', 'GLANCE_SERVICE_TYPE', - glance_service_type) - self.cgcs_conf.set('cREGION', 'GLANCE_CACHED', glance_cached) - self.cgcs_conf.set('cREGION', 'GLANCE_REGION', self.glance_region) - self.cgcs_conf.set('cREGION', 'NOVA_USER_NAME', nova_user_name) - self.cgcs_conf.set('cREGION', 'NOVA_PASSWORD', nova_password) - self.cgcs_conf.set('cREGION', 'NOVA_SERVICE_NAME', - nova_service_name) - self.cgcs_conf.set('cREGION', 'NOVA_SERVICE_TYPE', - nova_service_type) - self.cgcs_conf.set('cREGION', 'PLACEMENT_USER_NAME', - placement_user_name) - self.cgcs_conf.set('cREGION', 'PLACEMENT_PASSWORD', - placement_password) - self.cgcs_conf.set('cREGION', 'PLACEMENT_SERVICE_NAME', - placement_service_name) - self.cgcs_conf.set('cREGION', 'PLACEMENT_SERVICE_TYPE', - placement_service_type) - self.cgcs_conf.set('cREGION', 'NEUTRON_USER_NAME', - neutron_user_name) - self.cgcs_conf.set('cREGION', 'NEUTRON_PASSWORD', - neutron_password) - self.cgcs_conf.set('cREGION', 'NEUTRON_REGION_NAME', - neutron_region_name) - self.cgcs_conf.set('cREGION', 'NEUTRON_SERVICE_NAME', - neutron_service_name) - self.cgcs_conf.set('cREGION', 'NEUTRON_SERVICE_TYPE', - neutron_service_type) - self.cgcs_conf.set('cREGION', 'CEILOMETER_USER_NAME', - ceilometer_user_name) - self.cgcs_conf.set('cREGION', 'CEILOMETER_PASSWORD', - ceilometer_password) - self.cgcs_conf.set('cREGION', 'CEILOMETER_SERVICE_NAME', - ceilometer_service_name) - self.cgcs_conf.set('cREGION', 'CEILOMETER_SERVICE_TYPE', - ceilometer_service_type) self.cgcs_conf.set('cREGION', 'PATCHING_USER_NAME', patch_user_name) self.cgcs_conf.set('cREGION', 'PATCHING_PASSWORD', patch_password) @@ -1434,23 +1227,10 @@ class ConfigValidator(object): sysinv_service_name) self.cgcs_conf.set('cREGION', 'SYSINV_SERVICE_TYPE', sysinv_service_type) - self.cgcs_conf.set('cREGION', 'HEAT_USER_NAME', heat_user_name) - self.cgcs_conf.set('cREGION', 'HEAT_PASSWORD', heat_password) - self.cgcs_conf.set('cREGION', 'HEAT_ADMIN_USER_NAME', - heat_admin_user_name) - self.cgcs_conf.set('cREGION', 'HEAT_ADMIN_PASSWORD', - heat_admin_password) - self.cgcs_conf.set('cREGION', 'AODH_USER_NAME', aodh_user_name) - self.cgcs_conf.set('cREGION', 'AODH_PASSWORD', aodh_password) self.cgcs_conf.set('cREGION', 'NFV_USER_NAME', nfv_user_name) self.cgcs_conf.set('cREGION', 'NFV_PASSWORD', nfv_password) self.cgcs_conf.set('cREGION', 'MTCE_USER_NAME', mtce_user_name) self.cgcs_conf.set('cREGION', 'MTCE_PASSWORD', mtce_password) - self.cgcs_conf.set('cREGION', 'PANKO_USER_NAME', panko_user_name) - self.cgcs_conf.set('cREGION', 'PANKO_PASSWORD', panko_password) - self.cgcs_conf.set('cREGION', 'GNOCCHI_USER_NAME', - gnocchi_user_name) - self.cgcs_conf.set('cREGION', 'GNOCCHI_PASSWORD', gnocchi_password) self.cgcs_conf.set('cREGION', 'FM_USER_NAME', fm_user_name) self.cgcs_conf.set('cREGION', 'FM_PASSWORD', fm_password) self.cgcs_conf.set('cREGION', 'BARBICAN_USER_NAME', @@ -1544,8 +1324,6 @@ def validate(system_config, config_type=REGION_CONFIG, cgcs_config=None, validator.validate_docker_registry() # NTP configuration validator.validate_ntp() - # Network configuration - validator.validate_network() # Region configuration if config_type in [REGION_CONFIG, SUBCLOUD_CONFIG]: validator.validate_region(config_type) diff --git a/controllerconfig/controllerconfig/controllerconfig/configassistant.py b/controllerconfig/controllerconfig/controllerconfig/configassistant.py index bcf87d3b5e..79621bea0a 100644 --- a/controllerconfig/controllerconfig/controllerconfig/configassistant.py +++ b/controllerconfig/controllerconfig/controllerconfig/configassistant.py @@ -515,49 +515,12 @@ class ConfigAssistant(): self.keystone_public_uri = "" self.keystone_service_name = "" self.keystone_service_type = "" - self.glance_service_name = "" - self.glance_service_type = "" - self.glance_cached = False - self.glance_region_name = "" - self.glance_ks_user_name = "" - self.glance_ks_password = "" - self.glance_admin_uri = "" - self.glance_internal_uri = "" - self.glance_public_uri = "" - self.nova_ks_user_name = "" - self.nova_ks_password = "" - self.nova_service_name = "" - self.nova_service_type = "" - self.placement_ks_user_name = "" - self.placement_ks_password = "" - self.placement_service_name = "" - self.placement_service_type = "" - self.neutron_ks_user_name = "" - self.neutron_ks_password = "" - self.neutron_region_name = "" - self.neutron_service_name = "" - self.neutron_service_type = "" - self.ceilometer_ks_user_name = "" - self.ceilometer_ks_password = "" - self.ceilometer_service_name = "" - self.ceilometer_service_type = "" self.patching_ks_user_name = "" self.patching_ks_password = "" self.sysinv_ks_user_name = "" self.sysinv_ks_password = "" self.sysinv_service_name = "" self.sysinv_service_type = "" - self.heat_ks_user_name = "" - self.heat_ks_password = "" - self.heat_admin_domain_name = "" - self.heat_admin_ks_user_name = "" - self.heat_admin_ks_password = "" - self.aodh_ks_user_name = "" - self.aodh_ks_password = "" - self.panko_ks_user_name = "" - self.panko_ks_password = "" - self.gnocchi_ks_user_name = "" - self.gnocchi_ks_password = "" self.mtce_ks_user_name = "" self.mtce_ks_password = "" self.nfv_ks_user_name = "" @@ -3476,14 +3439,6 @@ class ConfigAssistant(): raise ConfigFail("The option ENABLE_SDN is no longer " "supported.") - # Network configuration - # If the config file doesn't have the cNETWORK section, just use - # the default values for these options. - if config.has_section('cNETWORK'): - # If any of the network options are missing, use defaults. - if config.has_option('cNETWORK', 'VSWITCH_TYPE'): - self.vswitch_type = config.get('cNETWORK', 'VSWITCH_TYPE') - # Authentication configuration if config.has_section('cAUTHENTICATION'): if config.has_option('cAUTHENTICATION', 'ADMIN_PASSWORD'): @@ -3563,31 +3518,6 @@ class ConfigAssistant(): 'cREGION', 'KEYSTONE_SERVICE_NAME') self.keystone_service_type = config.get( 'cREGION', 'KEYSTONE_SERVICE_TYPE') - self.glance_service_name = config.get( - 'cREGION', 'GLANCE_SERVICE_NAME') - self.glance_service_type = config.get( - 'cREGION', 'GLANCE_SERVICE_TYPE') - self.glance_cached = config.get( - 'cREGION', 'GLANCE_CACHED') - self.glance_region_name = config.get( - 'cREGION', 'GLANCE_REGION') - if config.has_option('cREGION', 'GLANCE_USER_NAME'): - self.glance_ks_user_name = config.get( - 'cREGION', 'GLANCE_USER_NAME') - if config.has_option('cREGION', 'GLANCE_PASSWORD'): - self.glance_ks_password = config.get( - 'cREGION', 'GLANCE_PASSWORD') - self.add_password_for_validation('GLANCE_PASSWORD', - self.glance_ks_password) - if config.has_option('cREGION', 'GLANCE_ADMIN_URI'): - self.glance_admin_uri = config.get( - 'cREGION', 'GLANCE_ADMIN_URI') - if config.has_option('cREGION', 'GLANCE_INTERNAL_URI'): - self.glance_internal_uri = config.get( - 'cREGION', 'GLANCE_INTERNAL_URI') - if config.has_option('cREGION', 'GLANCE_PUBLIC_URI'): - self.glance_public_uri = config.get( - 'cREGION', 'GLANCE_PUBLIC_URI') if config.has_option('cREGION', 'LDAP_REGION_NAME'): self.ldap_region_name = config.get( 'cREGION', 'LDAP_REGION_NAME') @@ -3597,48 +3527,6 @@ class ConfigAssistant(): if config.has_option('cREGION', 'LDAP_SERVICE_URI'): self.ldap_service_uri = config.get( 'cREGION', 'LDAP_SERVICE_URI') - self.nova_ks_user_name = config.get( - 'cREGION', 'NOVA_USER_NAME') - self.nova_ks_password = config.get( - 'cREGION', 'NOVA_PASSWORD') - self.add_password_for_validation('NOVA_PASSWORD', - self.nova_ks_password) - self.nova_service_name = config.get( - 'cREGION', 'NOVA_SERVICE_NAME') - self.nova_service_type = config.get( - 'cREGION', 'NOVA_SERVICE_TYPE') - self.placement_ks_user_name = config.get( - 'cREGION', 'PLACEMENT_USER_NAME') - self.placement_ks_password = config.get( - 'cREGION', 'PLACEMENT_PASSWORD') - self.add_password_for_validation('PLACEMENT_PASSWORD', - self.placement_ks_password) - self.placement_service_name = config.get( - 'cREGION', 'PLACEMENT_SERVICE_NAME') - self.placement_service_type = config.get( - 'cREGION', 'PLACEMENT_SERVICE_TYPE') - self.neutron_ks_user_name = config.get( - 'cREGION', 'NEUTRON_USER_NAME') - self.neutron_ks_password = config.get( - 'cREGION', 'NEUTRON_PASSWORD') - self.add_password_for_validation('NEUTRON_PASSWORD', - self.neutron_ks_password) - self.neutron_region_name = config.get( - 'cREGION', 'NEUTRON_REGION_NAME') - self.neutron_service_name = config.get( - 'cREGION', 'NEUTRON_SERVICE_NAME') - self.neutron_service_type = config.get( - 'cREGION', 'NEUTRON_SERVICE_TYPE') - self.ceilometer_ks_user_name = config.get( - 'cREGION', 'CEILOMETER_USER_NAME') - self.ceilometer_ks_password = config.get( - 'cREGION', 'CEILOMETER_PASSWORD') - self.add_password_for_validation('CEILOMETER_PASSWORD', - self.ceilometer_ks_password) - self.ceilometer_service_name = config.get( - 'cREGION', 'CEILOMETER_SERVICE_NAME') - self.ceilometer_service_type = config.get( - 'cREGION', 'CEILOMETER_SERVICE_TYPE') self.patching_ks_user_name = config.get( 'cREGION', 'PATCHING_USER_NAME') self.patching_ks_password = config.get( @@ -3655,40 +3543,6 @@ class ConfigAssistant(): 'cREGION', 'SYSINV_SERVICE_NAME') self.sysinv_service_type = config.get( 'cREGION', 'SYSINV_SERVICE_TYPE') - self.heat_ks_user_name = config.get( - 'cREGION', 'HEAT_USER_NAME') - self.heat_ks_password = config.get( - 'cREGION', 'HEAT_PASSWORD') - self.add_password_for_validation('HEAT_PASSWORD', - self.heat_ks_password) - self.heat_admin_domain_name = config.get( - 'cREGION', 'HEAT_ADMIN_DOMAIN_NAME') - self.heat_admin_ks_user_name = config.get( - 'cREGION', 'HEAT_ADMIN_USER_NAME') - self.heat_admin_ks_password = config.get( - 'cREGION', 'HEAT_ADMIN_PASSWORD') - self.add_password_for_validation('HEAT_ADMIN_PASSWORD', - self.heat_admin_ks_password) - self.aodh_ks_user_name = config.get( - 'cREGION', 'AODH_USER_NAME') - self.aodh_ks_password = config.get( - 'cREGION', 'AODH_PASSWORD') - self.add_password_for_validation('AODH_PASSWORD', - self.aodh_ks_password) - self.panko_ks_user_name = config.get( - 'cREGION', 'PANKO_USER_NAME') - self.panko_ks_password = config.get( - 'cREGION', 'PANKO_PASSWORD') - self.add_password_for_validation('PANKO_PASSWORD', - self.panko_ks_password) - - self.gnocchi_ks_user_name = config.get( - 'cREGION', 'GNOCCHI_USER_NAME') - self.gnocchi_ks_password = config.get( - 'cREGION', 'GNOCCHI_PASSWORD') - self.add_password_for_validation('GNOCCHI_PASSWORD', - self.gnocchi_ks_password) - self.mtce_ks_user_name = config.get( 'cREGION', 'MTCE_USER_NAME') self.mtce_ks_password = config.get( @@ -3717,11 +3571,6 @@ class ConfigAssistant(): self.barbican_ks_password) self.shared_services.append(self.keystone_service_type) - if self.glance_region_name == self.region_1_name: - self.shared_services.append(self.glance_service_type) - - if self.neutron_region_name == self.region_1_name: - self.shared_services.append(self.neutron_service_type) if self.subcloud_config(): self.system_controller_subnet = IPNetwork(config.get( @@ -3960,36 +3809,13 @@ class ConfigAssistant(): print("Keystone public URI: " + self.keystone_public_uri) print("Keystone service name: " + self.keystone_service_name) print("Keystone service type: " + self.keystone_service_type) - print("Glance user name: " + self.glance_ks_user_name) - print("Glance service name: " + self.glance_service_name) - print("Glance service type: " + self.glance_service_type) - print("Glance cached: " + str(self.glance_cached)) - print("Glance region: " + self.glance_region_name) - print("Glance admin URI: " + self.glance_admin_uri) - print("Glance internal URI: " + self.glance_internal_uri) - print("Glance public URI: " + self.glance_public_uri) print("LDAP service name: " + self.ldap_service_name) print("LDAP region: " + self.ldap_region_name) print("LDAP service URI:" + self.ldap_service_uri) - print("Nova user name: " + self.nova_ks_user_name) - print("Nova service name: " + self.nova_service_name) - print("Nova service type: " + self.nova_service_type) - print("Placement user name: " + self.placement_ks_user_name) - print("Placement service name: " + self.placement_service_name) - print("Placement service type: " + self.placement_service_type) - print("Neutron user name: " + self.neutron_ks_user_name) - print("Neutron region name: " + self.neutron_region_name) - print("Neutron service name: " + self.neutron_service_name) - print("Neutron service type: " + self.neutron_service_type) - print("Ceilometer user name: " + self.ceilometer_ks_user_name) - print("Ceilometer service name: " + self.ceilometer_service_name) - print("Ceilometer service type: " + self.ceilometer_service_type) print("Patching user name: " + self.patching_ks_user_name) print("Sysinv user name: " + self.sysinv_ks_user_name) print("Sysinv service name: " + self.sysinv_service_name) print("Sysinv service type: " + self.sysinv_service_type) - print("Heat user name: " + self.heat_ks_user_name) - print("Heat admin user name: " + self.heat_admin_ks_user_name) if self.subcloud_config(): print("\nSubcloud Configuration") @@ -4278,11 +4104,6 @@ class ConfigAssistant(): "IS_SECURE_REGISTRY=" + str(self.is_secure_registry) + "\n") - # Network configuration - f.write("\n[cNETWORK]") - f.write("\n# Data Network Configuration\n") - f.write("VSWITCH_TYPE=%s\n" % self.vswitch_type) - # Security configuration f.write("\n[cSECURITY]") @@ -4323,26 +4144,6 @@ class ConfigAssistant(): self.keystone_service_name) f.write("KEYSTONE_SERVICE_TYPE=%s\n" % self.keystone_service_type) - f.write("GLANCE_SERVICE_NAME=%s\n" % - self.glance_service_name) - f.write("GLANCE_SERVICE_TYPE=%s\n" % - self.glance_service_type) - f.write("GLANCE_CACHED=%s\n" % - self.glance_cached) - if self.glance_ks_user_name: - f.write("GLANCE_USER_NAME=%s\n" % - self.glance_ks_user_name) - if self.glance_ks_password: - f.write("GLANCE_PASSWORD=%s\n" % - self.glance_ks_password) - f.write("GLANCE_REGION=%s\n" % - self.glance_region_name) - f.write("GLANCE_ADMIN_URI=%s\n" % - self.glance_admin_uri) - f.write("GLANCE_INTERNAL_URI=%s\n" % - self.glance_internal_uri) - f.write("GLANCE_PUBLIC_URI=%s\n" % - self.glance_public_uri) if self.ldap_service_name: f.write("LDAP_SERVICE_NAME=%s\n" % self.ldap_service_name) @@ -4352,40 +4153,6 @@ class ConfigAssistant(): if self.ldap_service_uri: f.write("LDAP_SERVICE_URI=%s\n" % self.ldap_service_uri) - f.write("NOVA_USER_NAME=%s\n" % - self.nova_ks_user_name) - f.write("NOVA_PASSWORD=%s\n" % - self.nova_ks_password) - f.write("NOVA_SERVICE_NAME=%s\n" % - self.nova_service_name) - f.write("NOVA_SERVICE_TYPE=%s\n" % - self.nova_service_type) - f.write("PLACEMENT_USER_NAME=%s\n" % - self.placement_ks_user_name) - f.write("PLACEMENT_PASSWORD=%s\n" % - self.placement_ks_password) - f.write("PLACEMENT_SERVICE_NAME=%s\n" % - self.placement_service_name) - f.write("PLACEMENT_SERVICE_TYPE=%s\n" % - self.placement_service_type) - f.write("NEUTRON_USER_NAME=%s\n" % - self.neutron_ks_user_name) - f.write("NEUTRON_PASSWORD=%s\n" % - self.neutron_ks_password) - f.write("NEUTRON_REGION_NAME=%s\n" % - self.neutron_region_name) - f.write("NEUTRON_SERVICE_NAME=%s\n" % - self.neutron_service_name) - f.write("NEUTRON_SERVICE_TYPE=%s\n" % - self.neutron_service_type) - f.write("CEILOMETER_USER_NAME=%s\n" % - self.ceilometer_ks_user_name) - f.write("CEILOMETER_PASSWORD=%s\n" % - self.ceilometer_ks_password) - f.write("CEILOMETER_SERVICE_NAME=%s\n" % - self.ceilometer_service_name) - f.write("CEILOMETER_SERVICE_TYPE=%s\n" % - self.ceilometer_service_type) f.write("PATCHING_USER_NAME=%s\n" % self.patching_ks_user_name) f.write("PATCHING_PASSWORD=%s\n" % @@ -4398,32 +4165,10 @@ class ConfigAssistant(): self.sysinv_service_name) f.write("SYSINV_SERVICE_TYPE=%s\n" % self.sysinv_service_type) - f.write("HEAT_USER_NAME=%s\n" % - self.heat_ks_user_name) - f.write("HEAT_PASSWORD=%s\n" % - self.heat_ks_password) - f.write("HEAT_ADMIN_DOMAIN_NAME=%s\n" % - self.heat_admin_domain_name) - f.write("HEAT_ADMIN_USER_NAME=%s\n" % - self.heat_admin_ks_user_name) - f.write("HEAT_ADMIN_PASSWORD=%s\n" % - self.heat_admin_ks_password) f.write("NFV_USER_NAME=%s\n" % self.nfv_ks_user_name) f.write("NFV_PASSWORD=%s\n" % self.nfv_ks_password) - f.write("AODH_USER_NAME=%s\n" % - self.aodh_ks_user_name) - f.write("AODH_PASSWORD=%s\n" % - self.aodh_ks_password) - f.write("PANKO_USER_NAME=%s\n" % - self.panko_ks_user_name) - f.write("PANKO_PASSWORD=%s\n" % - self.panko_ks_password) - f.write("GNOCCHI_USER_NAME=%s\n" % - self.gnocchi_ks_user_name) - f.write("GNOCCHI_PASSWORD=%s\n" % - self.gnocchi_ks_password) f.write("MTCE_USER_NAME=%s\n" % self.mtce_ks_user_name) f.write("MTCE_PASSWORD=%s\n" % @@ -4781,32 +4526,6 @@ class ConfigAssistant(): 'capabilities': capabilities} client.sysinv.sm_service.service_create(**values) - # possible shared services (glance) - capabilities = {'service_name': self.glance_service_name, - 'service_type': self.glance_service_type, - 'glance_cached': self.glance_cached} - if self.glance_ks_user_name: - capabilities.update({'user_name': self.glance_ks_user_name}) - - # TODO (aning): Once we eliminate duplicated endpoints of shared - # services for non-primary region(s), we need to re-visit the following - # code that pass over the URLs to sysinv for puppet to create these - # endpoints, to see if we can remove them completely. - if self.glance_admin_uri: - capabilities.update({'admin_uri': - self.glance_admin_uri}) - if self.glance_internal_uri: - capabilities.update({'internal_uri': - self.glance_internal_uri}) - if self.glance_public_uri: - capabilities.update({'public_uri': self.glance_public_uri}) - - values = {'name': 'glance', - 'enabled': True, - 'region_name': self.glance_region_name, - 'capabilities': capabilities} - client.sysinv.sm_service.service_create(**values) - # if ldap is a shared service if self.ldap_service_uri: capabilities = {'service_name': self.ldap_service_name} @@ -4817,16 +4536,6 @@ class ConfigAssistant(): 'capabilities': capabilities} client.sysinv.sm_service.service_create(**values) - # neutron service config - capabilities = {'service_name': self.neutron_service_name, - 'service_type': self.neutron_service_type, - 'user_name': self.neutron_ks_user_name} - values = {'name': self.neutron_service_name, - 'enabled': True, - 'region_name': self.region_2_name, - 'capabilities': capabilities} - client.sysinv.sm_service.service_create(**values) - # sysinv service config capabilities = {'service_name': self.sysinv_service_name, 'service_type': self.sysinv_service_type, @@ -4837,26 +4546,6 @@ class ConfigAssistant(): 'capabilities': capabilities} client.sysinv.sm_service.service_create(**values) - # populate nova service config - capabilities = {'service_name': self.nova_service_name, - 'service_type': self.nova_service_type, - 'user_name': self.nova_ks_user_name} - values = {'name': self.nova_service_name, - 'enabled': True, - 'region_name': self.region_2_name, - 'capabilities': capabilities} - client.sysinv.sm_service.service_create(**values) - - # populate placement service config - capabilities = {'service_name': self.placement_service_name, - 'service_type': self.placement_service_type, - 'user_name': self.placement_ks_user_name} - values = {'name': self.placement_service_name, - 'enabled': True, - 'region_name': self.region_2_name, - 'capabilities': capabilities} - client.sysinv.sm_service.service_create(**values) - # populate patching service config capabilities = {'service_name': 'patching', 'service_type': 'patching', @@ -4867,52 +4556,6 @@ class ConfigAssistant(): 'capabilities': capabilities} client.sysinv.sm_service.service_create(**values) - # heat service config - capabilities = {'service_name': 'heat', - 'service_type': 'orchestration', - 'user_name': self.heat_ks_user_name, - 'admin_user_name': self.heat_admin_ks_user_name, - 'admin_domain_name': self.heat_admin_domain_name} - values = {'name': 'heat', - 'enabled': True, - 'region_name': self.region_2_name, - 'capabilities': capabilities} - client.sysinv.sm_service.service_create(**values) - - # ceilometer service config - capabilities = {'service_name': self.ceilometer_service_name, - 'service_type': self.ceilometer_service_type, - 'user_name': self.ceilometer_ks_user_name} - values = {'name': self.ceilometer_service_name, - 'enabled': True, - 'region_name': self.region_2_name, - 'capabilities': capabilities} - client.sysinv.sm_service.service_create(**values) - - # aodh service config - capabilities = {'user_name': self.aodh_ks_user_name} - values = {'name': "aodh", - 'enabled': True, - 'region_name': self.region_2_name, - 'capabilities': capabilities} - client.sysinv.sm_service.service_create(**values) - - # panko service config - capabilities = {'user_name': self.panko_ks_user_name} - values = {'name': "panko", - 'enabled': True, - 'region_name': self.region_2_name, - 'capabilities': capabilities} - client.sysinv.sm_service.service_create(**values) - - # gnocchi service config - capabilities = {'user_name': self.gnocchi_ks_user_name} - values = {'name': "gnocchi", - 'enabled': True, - 'region_name': self.region_2_name, - 'capabilities': capabilities} - client.sysinv.sm_service.service_create(**values) - # mtc service config capabilities = {'user_name': self.mtce_ks_user_name} values = {'name': "mtce", @@ -4942,53 +4585,14 @@ class ConfigAssistant(): os.environ["XDG_DATA_HOME"] = "/tmp" - # possible shared services (glance) - - if self.glance_ks_password: - keyring.set_password('glance', - constants.DEFAULT_SERVICE_PROJECT_NAME, - self.glance_ks_password) - keyring.set_password(self.sysinv_service_name, constants.DEFAULT_SERVICE_PROJECT_NAME, self.sysinv_ks_password) - keyring.set_password(self.nova_service_name, - constants.DEFAULT_SERVICE_PROJECT_NAME, - self.nova_ks_password) - - keyring.set_password(self.placement_service_name, - constants.DEFAULT_SERVICE_PROJECT_NAME, - self.placement_ks_password) - - keyring.set_password(self.neutron_service_name, - constants.DEFAULT_SERVICE_PROJECT_NAME, - self.neutron_ks_password) - keyring.set_password('patching', constants.DEFAULT_SERVICE_PROJECT_NAME, self.patching_ks_password) - keyring.set_password('heat', constants.DEFAULT_SERVICE_PROJECT_NAME, - self.heat_ks_password) - - keyring.set_password('heat-domain', - constants.DEFAULT_SERVICE_PROJECT_NAME, - self.heat_admin_ks_password) - - keyring.set_password(self.ceilometer_service_name, - constants.DEFAULT_SERVICE_PROJECT_NAME, - self.ceilometer_ks_password) - - keyring.set_password('aodh', constants.DEFAULT_SERVICE_PROJECT_NAME, - self.aodh_ks_password) - - keyring.set_password('panko', constants.DEFAULT_SERVICE_PROJECT_NAME, - self.panko_ks_password) - - keyring.set_password('gnocchi', constants.DEFAULT_SERVICE_PROJECT_NAME, - self.gnocchi_ks_password) - keyring.set_password('mtce', constants.DEFAULT_SERVICE_PROJECT_NAME, self.mtce_ks_password) diff --git a/controllerconfig/controllerconfig/controllerconfig/regionconfig.py b/controllerconfig/controllerconfig/controllerconfig/regionconfig.py index ccee546a73..a3cfa6cb20 100755 --- a/controllerconfig/controllerconfig/controllerconfig/regionconfig.py +++ b/controllerconfig/controllerconfig/controllerconfig/regionconfig.py @@ -48,25 +48,13 @@ USER_KEY = 1 USER_NAME = 2 EXPECTED_USERS = [ - ('REGION_2_SERVICES', 'NOVA', 'nova'), - ('REGION_2_SERVICES', 'PLACEMENT', 'placement'), ('REGION_2_SERVICES', 'SYSINV', 'sysinv'), ('REGION_2_SERVICES', 'PATCHING', 'patching'), - ('REGION_2_SERVICES', 'HEAT', 'heat'), - ('REGION_2_SERVICES', 'CEILOMETER', 'ceilometer'), ('REGION_2_SERVICES', 'NFV', 'vim'), - ('REGION_2_SERVICES', 'AODH', 'aodh'), ('REGION_2_SERVICES', 'MTCE', 'mtce'), - ('REGION_2_SERVICES', 'PANKO', 'panko'), - ('REGION_2_SERVICES', 'GNOCCHI', 'gnocchi'), ('REGION_2_SERVICES', 'FM', 'fm'), ('REGION_2_SERVICES', 'BARBICAN', 'barbican')] -EXPECTED_SHARED_SERVICES_NEUTRON_USER = ('SHARED_SERVICES', 'NEUTRON', - 'neutron') -EXPECTED_REGION_2_NEUTRON_USER = ('REGION_2_SERVICES', 'NEUTRON', 'neutron') -EXPECTED_REGION_2_GLANCE_USER = ('REGION_2_SERVICES', 'GLANCE', 'glance') - # This a description of the region 2 endpoints that we expect to configure or # find configured in keystone. The format is as follows: # SERVICE_NAME = key in region config file for this service's name @@ -84,16 +72,6 @@ ADMIN_URL = 4 DESCRIPTION = 5 EXPECTED_REGION2_ENDPOINTS = [ - ('NOVA_SERVICE_NAME', 'NOVA_SERVICE_TYPE', - 'http://{}:8774/v2.1/%(tenant_id)s', - 'http://{}:8774/v2.1/%(tenant_id)s', - 'http://{}:8774/v2.1/%(tenant_id)s', - 'Openstack Compute Service'), - ('PLACEMENT_SERVICE_NAME', 'PLACEMENT_SERVICE_TYPE', - 'http://{}:8778', - 'http://{}:8778', - 'http://{}:8778', - 'Openstack Placement Service'), ('SYSINV_SERVICE_NAME', 'SYSINV_SERVICE_TYPE', 'http://{}:6385/v1', 'http://{}:6385/v1', @@ -104,36 +82,11 @@ EXPECTED_REGION2_ENDPOINTS = [ 'http://{}:5491', 'http://{}:5491', 'Patching Service'), - ('HEAT_SERVICE_NAME', 'HEAT_SERVICE_TYPE', - 'http://{}:8004/v1/%(tenant_id)s', - 'http://{}:8004/v1/%(tenant_id)s', - 'http://{}:8004/v1/%(tenant_id)s', - 'Openstack Orchestration Service'), - ('HEAT_CFN_SERVICE_NAME', 'HEAT_CFN_SERVICE_TYPE', - 'http://{}:8000/v1/', - 'http://{}:8000/v1/', - 'http://{}:8000/v1/', - 'Openstack Cloudformation Service'), ('NFV_SERVICE_NAME', 'NFV_SERVICE_TYPE', 'http://{}:4545', 'http://{}:4545', 'http://{}:4545', 'Virtual Infrastructure Manager'), - ('AODH_SERVICE_NAME', 'AODH_SERVICE_TYPE', - 'http://{}:8042', - 'http://{}:8042', - 'http://{}:8042', - 'OpenStack Alarming Service'), - ('PANKO_SERVICE_NAME', 'PANKO_SERVICE_TYPE', - 'http://{}:8977', - 'http://{}:8977', - 'http://{}:8977', - 'OpenStack Event Service'), - ('GNOCCHI_SERVICE_NAME', 'GNOCCHI_SERVICE_TYPE', - 'http://{}:8041', - 'http://{}:8041', - 'http://{}:8041', - 'OpenStack Metric Service'), ('FM_SERVICE_NAME', 'FM_SERVICE_TYPE', 'http://{}:18002', 'http://{}:18002', @@ -146,13 +99,6 @@ EXPECTED_REGION2_ENDPOINTS = [ 'OpenStack Key Manager Service'), ] -EXPECTED_NEUTRON_ENDPOINT = ( - 'NEUTRON_SERVICE_NAME', 'NEUTRON_SERVICE_TYPE', - 'http://{}:9696', - 'http://{}:9696', - 'http://{}:9696', - 'Neutron Networking Service') - EXPECTED_KEYSTONE_ENDPOINT = ( 'KEYSTONE_SERVICE_NAME', 'KEYSTONE_SERVICE_TYPE', 'http://{}:8081/keystone/main/v2.0', @@ -160,15 +106,6 @@ EXPECTED_KEYSTONE_ENDPOINT = ( 'http://{}:8081/keystone/admin/v2.0', 'OpenStack Identity') -EXPECTED_GLANCE_ENDPOINT = ( - 'GLANCE_SERVICE_NAME', 'GLANCE_SERVICE_TYPE', - 'http://{}:9292', - 'http://{}:9292', - 'http://{}:9292', - 'OpenStack Image Service') - -DEFAULT_HEAT_ADMIN_DOMAIN = 'heat' -DEFAULT_HEAT_ADMIN_USER_NAME = 'heat_admin' LOG = log.get_logger(__name__) @@ -191,28 +128,6 @@ def validate_region_one_keystone_config(region_config, token, api_url, users, # Keystone is always in region 1 expected_region_1_endpoints = [EXPECTED_KEYSTONE_ENDPOINT] - # Region of neutron user and endpoint depends on vswitch type - if region_config.has_option('NETWORK', 'VSWITCH_TYPE'): - if region_config.get('NETWORK', 'VSWITCH_TYPE').upper() == 'NUAGE_VRS': - expected_users.append(EXPECTED_SHARED_SERVICES_NEUTRON_USER) - else: - expected_users.append(EXPECTED_REGION_2_NEUTRON_USER) - expected_region_2_endpoints.append(EXPECTED_NEUTRON_ENDPOINT) - - # Determine region of glance user and endpoint - if not region_config.has_option('SHARED_SERVICES', - 'GLANCE_SERVICE_NAME'): - expected_users.append(EXPECTED_REGION_2_GLANCE_USER) - expected_region_2_endpoints.append(EXPECTED_GLANCE_ENDPOINT) - elif region_config.has_option( - 'SHARED_SERVICES', 'GLANCE_CACHED'): - if region_config.get('SHARED_SERVICES', - 'GLANCE_CACHED').upper() == 'TRUE': - expected_users.append(EXPECTED_REGION_2_GLANCE_USER) - expected_region_2_endpoints.append(EXPECTED_GLANCE_ENDPOINT) - else: - expected_region_1_endpoints.append(EXPECTED_GLANCE_ENDPOINT) - domains = rutils.get_domains(token, api_url) # Verify service project domain, creating if necessary if region_config.has_option('REGION_2_SERVICES', 'PROJECT_DOMAIN_NAME'): @@ -255,46 +170,6 @@ def validate_region_one_keystone_config(region_config, token, api_url, users, if not role_id and create: raise ConfigFail("Keystone configuration error: No admin role present") - # verify that the heat admin domain is configured, creating if necessary - heat_admin_domain = region_config.get('REGION_2_SERVICES', - 'HEAT_ADMIN_DOMAIN') - domains = rutils.get_domains(token, api_url) - heat_domain_id = domains.get_domain_id(heat_admin_domain) - if not heat_domain_id: - if create and config_type == REGION_CONFIG: - region_config.set('REGION_2_SERVICES', 'HEAT_ADMIN_DOMAIN', - heat_admin_domain) - else: - raise ConfigFail( - "Unable to obtain id for %s domain. Please ensure " - "keystone configuration is correct." % heat_admin_domain) - - # Verify that the heat stack user is configured, creating if necessary - heat_stack_user = region_config.get('REGION_2_SERVICES', - 'HEAT_ADMIN_USER_NAME') - if not users.get_user_id(heat_stack_user): - if create and config_type == REGION_CONFIG: - if not region_config.has_option('REGION_2_SERVICES', - 'HEAT_ADMIN_PASSWORD'): - try: - region_config.set('REGION_2_SERVICES', - 'HEAT_ADMIN_PASSWORD', - uuid.uuid4().hex[:10] + "TiC2*") - except Exception as e: - raise ConfigFail("Failed to generate random user " - "password: %s" % e) - else: - raise ConfigFail( - "Unable to obtain user (%s) from domain (%s). Please ensure " - "keystone configuration is correct." % (heat_stack_user, - heat_admin_domain)) - elif config_type == SUBCLOUD_CONFIG: - # Add the password to the region config so it will be used when - # configuring services. - auth_password = user_config.get_password(heat_stack_user) - region_config.set('REGION_2_SERVICES', 'HEAT_ADMIN_PASSWORD', - auth_password) - # verify that the service user domain is configured, creating if necessary if region_config.has_option('REGION_2_SERVICES', 'USER_DOMAIN_NAME'): user_domain = region_config.get('REGION_2_SERVICES', @@ -514,30 +389,11 @@ def set_subcloud_config_defaults(region_config): region_config.set('SHARED_SERVICES', 'SERVICE_PROJECT_NAME', constants.DEFAULT_SERVICE_PROJECT_NAME) - # We use the default heat admin domain - region_config.set('REGION_2_SERVICES', 'HEAT_ADMIN_DOMAIN', - DEFAULT_HEAT_ADMIN_DOMAIN) - - # We use the heat admin user already created in the system controller - region_config.set('REGION_2_SERVICES', 'HEAT_ADMIN_USER_NAME', - DEFAULT_HEAT_ADMIN_USER_NAME) - # Add the necessary users to the region config, which will allow the # validation code to run and will later result in services being # configured to use the users from the system controller. expected_users = EXPECTED_USERS - expected_users.append(EXPECTED_REGION_2_NEUTRON_USER) - - if not region_config.has_option('SHARED_SERVICES', - 'GLANCE_SERVICE_NAME'): - expected_users.append(EXPECTED_REGION_2_GLANCE_USER) - elif region_config.has_option( - 'SHARED_SERVICES', 'GLANCE_CACHED'): - if region_config.get('SHARED_SERVICES', - 'GLANCE_CACHED').upper() == 'TRUE': - expected_users.append(EXPECTED_REGION_2_GLANCE_USER) - for user in expected_users: # Add the user to the region config so to allow validation. region_config.set(user[REGION_NAME], user[USER_KEY] + '_USER_NAME', diff --git a/controllerconfig/controllerconfig/controllerconfig/systemconfig.py b/controllerconfig/controllerconfig/controllerconfig/systemconfig.py index bc0685bf13..17905f7e78 100644 --- a/controllerconfig/controllerconfig/controllerconfig/systemconfig.py +++ b/controllerconfig/controllerconfig/controllerconfig/systemconfig.py @@ -188,35 +188,6 @@ def create_cgcs_config_file(output_file, system_config, keystone_internal_url) cgcs_config.set('cREGION', 'KEYSTONE_PUBLIC_URI', keystone_public_url) - is_glance_cached = False - if system_config.has_option('SHARED_SERVICES', 'GLANCE_CACHED'): - if (system_config.get('SHARED_SERVICES', - 'GLANCE_CACHED').upper() == 'TRUE'): - is_glance_cached = True - cgcs_config.set('cREGION', 'GLANCE_CACHED', is_glance_cached) - - if (system_config.has_option('SHARED_SERVICES', - 'GLANCE_SERVICE_NAME') and - not is_glance_cached): - glance_service_name = system_config.get('SHARED_SERVICES', - 'GLANCE_SERVICE_NAME') - glance_service_type = system_config.get('SHARED_SERVICES', - 'GLANCE_SERVICE_TYPE') - glance_region_name = region_1_name - glance_service_id = services.get_service_id(glance_service_name, - glance_service_type) - glance_internal_url = endpoints.get_service_url(glance_region_name, - glance_service_id, - "internal") - glance_public_url = endpoints.get_service_url(glance_region_name, - glance_service_id, - "public") - - cgcs_config.set('cREGION', 'GLANCE_ADMIN_URI', glance_internal_url) - cgcs_config.set('cREGION', 'GLANCE_PUBLIC_URI', glance_public_url) - cgcs_config.set('cREGION', 'GLANCE_INTERNAL_URI', - glance_internal_url) - # if ldap is a shared service if (system_config.has_option('SHARED_SERVICES', 'LDAP_SERVICE_URL')): ldap_service_url = system_config.get('SHARED_SERVICES', @@ -225,11 +196,6 @@ def create_cgcs_config_file(output_file, system_config, cgcs_config.set('cREGION', 'LDAP_SERVICE_NAME', 'open-ldap') cgcs_config.set('cREGION', 'LDAP_REGION_NAME', region_1_name) - # The domains are not available in the validation phase - heat_admin_domain = system_config.get('REGION_2_SERVICES', - 'HEAT_ADMIN_DOMAIN') - cgcs_config.set('cREGION', 'HEAT_ADMIN_DOMAIN_NAME', heat_admin_domain) - # If primary region is non-TiC and keystone entries already created, # the flag will tell puppet not to create them. if (system_config.has_option('REGION_2_SERVICES', 'CREATE') and diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.share.keystoneonly b/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.share.keystoneonly index 75c82feaca..f50c6fe198 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.share.keystoneonly +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.share.keystoneonly @@ -64,34 +64,6 @@ REGION_NAME=RegionTwo USER_DOMAIN_NAME=service_domain PROJECT_DOMAIN_NAME=service_domain -CINDER_SERVICE_NAME=cinder -CINDER_SERVICE_TYPE=volume -CINDER_V2_SERVICE_NAME=cinderv2 -CINDER_V2_SERVICE_TYPE=volumev2 -CINDER_V3_SERVICE_NAME=cinderv3 -CINDER_V3_SERVICE_TYPE=volumev3 -CINDER_USER_NAME=cinderTWO -CINDER_PASSWORD=password2WO* - -GLANCE_SERVICE_NAME=glance -GLANCE_SERVICE_TYPE=image -GLANCE_USER_NAME=glanceTWO -GLANCE_PASSWORD=password2WO* - -NOVA_USER_NAME=novaTWO -NOVA_PASSWORD=password2WO* -NOVA_SERVICE_NAME=nova -NOVA_SERVICE_TYPE=compute -PLACEMENT_USER_NAME=placement -PLACEMENT_PASSWORD=password2WO* -PLACEMENT_SERVICE_NAME=placement -PLACEMENT_SERVICE_TYPE=placement -NOVA_V3_SERVICE_NAME=novav3 -NOVA_V3_SERVICE_TYPE=computev3 -NEUTRON_USER_NAME=neutronTWO -NEUTRON_PASSWORD=password2WO* -NEUTRON_SERVICE_NAME=neutron -NEUTRON_SERVICE_TYPE=network SYSINV_USER_NAME=sysinvTWO SYSINV_PASSWORD=password2WO* SYSINV_SERVICE_NAME=sysinv @@ -100,29 +72,10 @@ PATCHING_USER_NAME=patchingTWO PATCHING_PASSWORD=password2WO* PATCHING_SERVICE_NAME=patching PATCHING_SERVICE_TYPE=patching -HEAT_USER_NAME=heatTWO -HEAT_PASSWORD=password2WO* -HEAT_ADMIN_DOMAIN=heat -HEAT_ADMIN_USER_NAME=heat_stack_adminTWO -HEAT_ADMIN_PASSWORD=password2WO* -HEAT_SERVICE_NAME=heat -HEAT_SERVICE_TYPE=orchestration -HEAT_CFN_SERVICE_NAME=heat-cfn -HEAT_CFN_SERVICE_TYPE=cloudformation -CEILOMETER_USER_NAME=ceilometerTWO -CEILOMETER_PASSWORD=password2WO* -CEILOMETER_SERVICE_NAME=ceilometer -CEILOMETER_SERVICE_TYPE=metering NFV_USER_NAME=vimTWO NFV_PASSWORD=password2WO* -AODH_USER_NAME=aodhTWO -AODH_PASSWORD=password2WO* MTCE_USER_NAME=mtceTWO MTCE_PASSWORD=password2WO* -PANKO_USER_NAME=pankoTWO -PANKO_PASSWORD=password2WO* -GNOCCHI_USER_NAME=gnocchiTWO -GNOCCHI_PASSWORD=password2WO* FM_USER_NAME=fmTWO FM_PASSWORD=password2WO* BARBICAN_USER_NAME=barbican diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.share.keystoneonly.result b/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.share.keystoneonly.result index fafd0c61f4..195ebb4318 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.share.keystoneonly.result +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.share.keystoneonly.result @@ -51,9 +51,6 @@ EXTERNAL_OAM_FLOATING_ADDRESS = 10.10.10.2 EXTERNAL_OAM_0_ADDRESS = 10.10.10.3 EXTERNAL_OAM_1_ADDRESS = 10.10.10.4 -[cNETWORK] -VSWITCH_TYPE = ovs-dpdk - [cREGION] REGION_CONFIG = True REGION_1_NAME = RegionOne @@ -65,49 +62,16 @@ ADMIN_PROJECT_DOMAIN = admin_domain SERVICE_PROJECT_NAME = FULL_TEST KEYSTONE_SERVICE_NAME = keystone KEYSTONE_SERVICE_TYPE = identity -GLANCE_USER_NAME = glanceTWO -GLANCE_PASSWORD = password2WO* -GLANCE_SERVICE_NAME = glance -GLANCE_SERVICE_TYPE = image -GLANCE_CACHED = False -GLANCE_REGION = RegionTwo -NOVA_USER_NAME = novaTWO -NOVA_PASSWORD = password2WO* -NOVA_SERVICE_NAME = nova -NOVA_SERVICE_TYPE = compute -PLACEMENT_USER_NAME = placement -PLACEMENT_PASSWORD = password2WO* -PLACEMENT_SERVICE_NAME = placement -PLACEMENT_SERVICE_TYPE = placement -NEUTRON_USER_NAME = neutronTWO -NEUTRON_PASSWORD = password2WO* -NEUTRON_REGION_NAME = RegionTwo -NEUTRON_SERVICE_NAME = neutron -NEUTRON_SERVICE_TYPE = network -CEILOMETER_USER_NAME = ceilometerTWO -CEILOMETER_PASSWORD = password2WO* -CEILOMETER_SERVICE_NAME = ceilometer -CEILOMETER_SERVICE_TYPE = metering PATCHING_USER_NAME = patchingTWO PATCHING_PASSWORD = password2WO* SYSINV_USER_NAME = sysinvTWO SYSINV_PASSWORD = password2WO* SYSINV_SERVICE_NAME = sysinv SYSINV_SERVICE_TYPE = platform -HEAT_USER_NAME = heatTWO -HEAT_PASSWORD = password2WO* -HEAT_ADMIN_USER_NAME = heat_stack_adminTWO -HEAT_ADMIN_PASSWORD = password2WO* -AODH_USER_NAME = aodhTWO -AODH_PASSWORD = password2WO* NFV_USER_NAME = vimTWO NFV_PASSWORD = password2WO* MTCE_USER_NAME = mtceTWO MTCE_PASSWORD = password2WO* -PANKO_USER_NAME = pankoTWO -PANKO_PASSWORD = password2WO* -GNOCCHI_USER_NAME = gnocchiTWO -GNOCCHI_PASSWORD = password2WO* FM_USER_NAME = fmTWO FM_PASSWORD = password2WO* BARBICAN_USER_NAME = barbican @@ -119,7 +83,6 @@ KEYSTONE_IDENTITY_URI = http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_ADMIN_URI = http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_INTERNAL_URI = http://192.168.204.12:8081/keystone/main/v2.0 KEYSTONE_PUBLIC_URI = http://10.10.10.2:8081/keystone/main/v2.0 -HEAT_ADMIN_DOMAIN_NAME = heat [cAUTHENTICATION] ADMIN_PASSWORD = Li69nux* diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.shareall b/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.shareall index edaa4684c0..4dbedf4675 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.shareall +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.shareall @@ -59,33 +59,10 @@ KEYSTONE_SERVICE_NAME=keystone KEYSTONE_SERVICE_TYPE=identity SERVICE_PROJECT_NAME=FULL_TEST -GLANCE_SERVICE_NAME=glance -GLANCE_SERVICE_TYPE=image -CINDER_SERVICE_NAME=cinder -CINDER_SERVICE_TYPE=volume -CINDER_V2_SERVICE_NAME=cinderv2 -CINDER_V2_SERVICE_TYPE=volumev2 -CINDER_V3_SERVICE_NAME=cinderv3 -CINDER_V3_SERVICE_TYPE=volumev3 - LDAP_SERVICE_URL=ldap://192.168.204.12:389 [REGION_2_SERVICES] REGION_NAME=RegionTwo -NOVA_USER_NAME=novaTWO -NOVA_PASSWORD=password2WO* -NOVA_SERVICE_NAME=nova -NOVA_SERVICE_TYPE=compute -PLACEMENT_USER_NAME=placement -PLACEMENT_PASSWORD=password2WO* -PLACEMENT_SERVICE_NAME=placement -PLACEMENT_SERVICE_TYPE=placement -NOVA_V3_SERVICE_NAME=novav3 -NOVA_V3_SERVICE_TYPE=computev3 -NEUTRON_USER_NAME=neutronTWO -NEUTRON_PASSWORD=password2WO* -NEUTRON_SERVICE_NAME=neutron -NEUTRON_SERVICE_TYPE=network SYSINV_USER_NAME=sysinvTWO SYSINV_PASSWORD=password2WO* SYSINV_SERVICE_NAME=sysinv @@ -94,29 +71,10 @@ PATCHING_USER_NAME=patchingTWO PATCHING_PASSWORD=password2WO* PATCHING_SERVICE_NAME=patching PATCHING_SERVICE_TYPE=patching -HEAT_USER_NAME=heatTWO -HEAT_PASSWORD=password2WO* -HEAT_ADMIN_DOMAIN=heat -HEAT_ADMIN_USER_NAME=heat_stack_adminTWO -HEAT_ADMIN_PASSWORD=password2WO* -HEAT_SERVICE_NAME=heat -HEAT_SERVICE_TYPE=orchestration -HEAT_CFN_SERVICE_NAME=heat-cfn -HEAT_CFN_SERVICE_TYPE=cloudformation -CEILOMETER_USER_NAME=ceilometerTWO -CEILOMETER_PASSWORD=password2WO* -CEILOMETER_SERVICE_NAME=ceilometer -CEILOMETER_SERVICE_TYPE=metering NFV_USER_NAME=vimTWO NFV_PASSWORD=password2WO* -AODH_USER_NAME=aodhTWO -AODH_PASSWORD=password2WO* MTCE_USER_NAME=mtceTWO MTCE_PASSWORD=password2WO* -PANKO_USER_NAME=pankoTWO -PANKO_PASSWORD=password2WO* -GNOCCHI_USER_NAME=gnocchiTWO -GNOCCHI_PASSWORD=password2WO* FM_USER_NAME=fmTWO FM_PASSWORD=password2WO* BARBICAN_USER_NAME=barbican diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.shareall.result b/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.shareall.result index 94f16d2aae..a7f1653dcf 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.shareall.result +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.shareall.result @@ -51,9 +51,6 @@ EXTERNAL_OAM_FLOATING_ADDRESS = 10.10.10.2 EXTERNAL_OAM_0_ADDRESS = 10.10.10.3 EXTERNAL_OAM_1_ADDRESS = 10.10.10.4 -[cNETWORK] -VSWITCH_TYPE = ovs-dpdk - [cREGION] REGION_CONFIG = True REGION_1_NAME = RegionOne @@ -65,47 +62,16 @@ ADMIN_PROJECT_DOMAIN = Default SERVICE_PROJECT_NAME = FULL_TEST KEYSTONE_SERVICE_NAME = keystone KEYSTONE_SERVICE_TYPE = identity -GLANCE_SERVICE_NAME = glance -GLANCE_SERVICE_TYPE = image -GLANCE_CACHED = False -GLANCE_REGION = RegionOne -NOVA_USER_NAME = novaTWO -NOVA_PASSWORD = password2WO* -NOVA_SERVICE_NAME = nova -NOVA_SERVICE_TYPE = compute -PLACEMENT_USER_NAME = placement -PLACEMENT_PASSWORD = password2WO* -PLACEMENT_SERVICE_NAME = placement -PLACEMENT_SERVICE_TYPE = placement -NEUTRON_USER_NAME = neutronTWO -NEUTRON_PASSWORD = password2WO* -NEUTRON_REGION_NAME = RegionTwo -NEUTRON_SERVICE_NAME = neutron -NEUTRON_SERVICE_TYPE = network -CEILOMETER_USER_NAME = ceilometerTWO -CEILOMETER_PASSWORD = password2WO* -CEILOMETER_SERVICE_NAME = ceilometer -CEILOMETER_SERVICE_TYPE = metering PATCHING_USER_NAME = patchingTWO PATCHING_PASSWORD = password2WO* SYSINV_USER_NAME = sysinvTWO SYSINV_PASSWORD = password2WO* SYSINV_SERVICE_NAME = sysinv SYSINV_SERVICE_TYPE = platform -HEAT_USER_NAME = heatTWO -HEAT_PASSWORD = password2WO* -HEAT_ADMIN_USER_NAME = heat_stack_adminTWO -HEAT_ADMIN_PASSWORD = password2WO* -AODH_USER_NAME = aodhTWO -AODH_PASSWORD = password2WO* NFV_USER_NAME = vimTWO NFV_PASSWORD = password2WO* MTCE_USER_NAME = mtceTWO MTCE_PASSWORD = password2WO* -PANKO_USER_NAME = pankoTWO -PANKO_PASSWORD = password2WO* -GNOCCHI_USER_NAME = gnocchiTWO -GNOCCHI_PASSWORD = password2WO* FM_USER_NAME = fmTWO FM_PASSWORD = password2WO* BARBICAN_USER_NAME = barbican @@ -117,13 +83,9 @@ KEYSTONE_IDENTITY_URI = http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_ADMIN_URI = http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_INTERNAL_URI = http://192.168.204.12:8081/keystone/main/v2.0 KEYSTONE_PUBLIC_URI = http://10.10.10.2:8081/keystone/main/v2.0 -GLANCE_ADMIN_URI = http://192.168.204.12:9292/v2 -GLANCE_PUBLIC_URI = http://10.10.10.2:9292/v2 -GLANCE_INTERNAL_URI = http://192.168.204.12:9292/v2 LDAP_SERVICE_URI = ldap://192.168.204.12:389 LDAP_SERVICE_NAME = open-ldap LDAP_REGION_NAME = RegionOne -HEAT_ADMIN_DOMAIN_NAME = heat [cAUTHENTICATION] ADMIN_PASSWORD = Li69nux* diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ceph b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ceph index 9759410104..275838e75b 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ceph +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ceph @@ -67,10 +67,6 @@ NAMESERVER_1=8.8.8.8 NAMESERVER_2=8.8.4.4 NAMESERVER_3=NC -[cNETWORK] -# Data Network Configuration -VSWITCH_TYPE=ovs-dpdk - [cSECURITY] [cREGION] # Region Configuration diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.default b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.default index 8b5efab3cd..58ec75705b 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.default +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.default @@ -73,10 +73,6 @@ NAMESERVER_1=8.8.8.8 NAMESERVER_2=8.8.4.4 NAMESERVER_3=NC -[cNETWORK] -# Data Network Configuration -VSWITCH_TYPE=ovs-dpdk - [cSECURITY] [cREGION] # Region Configuration diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ipv6 b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ipv6 index 68401cbd2d..13d0b25be0 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ipv6 +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.ipv6 @@ -73,10 +73,6 @@ NAMESERVER_1=8.8.8.8 NAMESERVER_2=8.8.4.4 NAMESERVER_3=NC -[cNETWORK] -# Data Network Configuration -VSWITCH_TYPE=ovs-dpdk - [cSECURITY] [cREGION] # Region Configuration diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.kubernetes b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.kubernetes index 2f959d5d5e..9fb01d60c1 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.kubernetes +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.kubernetes @@ -87,10 +87,6 @@ DOCKER_QUAY_REGISTRY=1.2.3.4:5000 DOCKER_DOCKER_REGISTRY=[1:2:3:4:a:b:c:d]:5000 IS_SECURE_REGISTRY=False -[cNETWORK] -# Data Network Configuration -VSWITCH_TYPE=ovs-dpdk - [cSECURITY] [cREGION] # Region Configuration diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region index a7d5d57de0..6cc6c2e271 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region @@ -75,10 +75,6 @@ NAMESERVER_1=8.8.8.8 NAMESERVER_2=8.8.4.4 NAMESERVER_3=NC -[cNETWORK] -# Data Network Configuration -VSWITCH_TYPE=ovs-dpdk - [cSECURITY] [cREGION] # Region Configuration @@ -99,49 +95,14 @@ KEYSTONE_INTERNAL_URI=http://192.168.204.12:8081/keystone/main/v2.0 KEYSTONE_PUBLIC_URI=http://10.10.10.2:8081/keystone/main/v2.0 KEYSTONE_SERVICE_NAME=keystone KEYSTONE_SERVICE_TYPE=identity -GLANCE_SERVICE_NAME=glance -GLANCE_SERVICE_TYPE=image -GLANCE_CACHED=False -GLANCE_REGION=RegionOne -GLANCE_ADMIN_URI=http://192.168.204.12:9292/v2 -GLANCE_INTERNAL_URI=http://192.168.204.12:9292/v2 -GLANCE_PUBLIC_URI=http://10.10.10.2:9292/v2 -NOVA_USER_NAME=nova -NOVA_PASSWORD=password2WO* -NOVA_SERVICE_NAME=nova -NOVA_SERVICE_TYPE=compute -PLACEMENT_USER_NAME=placement -PLACEMENT_PASSWORD=password2WO* -PLACEMENT_SERVICE_NAME=placement -PLACEMENT_SERVICE_TYPE=placement -NEUTRON_USER_NAME=neutron -NEUTRON_PASSWORD=password2WO* -NEUTRON_REGION_NAME=RegionTwo -NEUTRON_SERVICE_NAME=neutron -NEUTRON_SERVICE_TYPE=network -CEILOMETER_USER_NAME=ceilometer -CEILOMETER_PASSWORD=password2WO* -CEILOMETER_SERVICE_NAME=ceilometer -CEILOMETER_SERVICE_TYPE=metering PATCHING_USER_NAME=patching PATCHING_PASSWORD=password2WO* SYSINV_USER_NAME=sysinv SYSINV_PASSWORD=password2WO* SYSINV_SERVICE_NAME=sysinv SYSINV_SERVICE_TYPE=platform -HEAT_USER_NAME=heat -HEAT_PASSWORD=password2WO* -HEAT_ADMIN_DOMAIN_NAME=heat -HEAT_ADMIN_USER_NAME=heat_stack_admin -HEAT_ADMIN_PASSWORD=password2WO* NFV_USER_NAME=vim NFV_PASSWORD=password2WO* -AODH_USER_NAME=aodh -AODH_PASSWORD=password2WO* -PANKO_USER_NAME=panko -PANKO_PASSWORD=password2WO* -GNOCCHI_USER_NAME=gnocchi -GNOCCHI_PASSWORD=password2WO* MTCE_USER_NAME=mtce MTCE_PASSWORD=password2WO* FM_USER_NAME=fm diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region_nuage_vrs b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region_nuage_vrs index 86b55b180b..6cc6c2e271 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region_nuage_vrs +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region_nuage_vrs @@ -75,10 +75,6 @@ NAMESERVER_1=8.8.8.8 NAMESERVER_2=8.8.4.4 NAMESERVER_3=NC -[cNETWORK] -# Data Network Configuration -VSWITCH_TYPE=nuage_vrs - [cSECURITY] [cREGION] # Region Configuration @@ -99,49 +95,14 @@ KEYSTONE_INTERNAL_URI=http://192.168.204.12:8081/keystone/main/v2.0 KEYSTONE_PUBLIC_URI=http://10.10.10.2:8081/keystone/main/v2.0 KEYSTONE_SERVICE_NAME=keystone KEYSTONE_SERVICE_TYPE=identity -GLANCE_SERVICE_NAME=glance -GLANCE_SERVICE_TYPE=image -GLANCE_CACHED=False -GLANCE_REGION=RegionOne -GLANCE_ADMIN_URI=http://192.168.204.12:9292/v2 -GLANCE_INTERNAL_URI=http://192.168.204.12:9292/v2 -GLANCE_PUBLIC_URI=http://10.10.10.2:9292/v2 -NOVA_USER_NAME=nova -NOVA_PASSWORD=password2WO* -NOVA_SERVICE_NAME=nova -NOVA_SERVICE_TYPE=compute -PLACEMENT_USER_NAME=placement -PLACEMENT_PASSWORD=password2WO* -PLACEMENT_SERVICE_NAME=placement -PLACEMENT_SERVICE_TYPE=placement -NEUTRON_USER_NAME=neutron -NEUTRON_PASSWORD=password2WO* -NEUTRON_REGION_NAME=RegionOne -NEUTRON_SERVICE_NAME=neutron -NEUTRON_SERVICE_TYPE=network -CEILOMETER_USER_NAME=ceilometer -CEILOMETER_PASSWORD=password2WO* -CEILOMETER_SERVICE_NAME=ceilometer -CEILOMETER_SERVICE_TYPE=metering PATCHING_USER_NAME=patching PATCHING_PASSWORD=password2WO* SYSINV_USER_NAME=sysinv SYSINV_PASSWORD=password2WO* SYSINV_SERVICE_NAME=sysinv SYSINV_SERVICE_TYPE=platform -HEAT_USER_NAME=heat -HEAT_PASSWORD=password2WO* -HEAT_ADMIN_DOMAIN_NAME=heat -HEAT_ADMIN_USER_NAME=heat_stack_admin -HEAT_ADMIN_PASSWORD=password2WO* NFV_USER_NAME=vim NFV_PASSWORD=password2WO* -AODH_USER_NAME=aodh -AODH_PASSWORD=password2WO* -PANKO_USER_NAME=panko -PANKO_PASSWORD=password2WO* -GNOCCHI_USER_NAME=gnocchi -GNOCCHI_PASSWORD=password2WO* MTCE_USER_NAME=mtce MTCE_PASSWORD=password2WO* FM_USER_NAME=fm diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.lag.vlan b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.lag.vlan index 219ebe4de4..de03fc343d 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.lag.vlan +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.lag.vlan @@ -55,31 +55,9 @@ KEYSTONE_ADMINURL=http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_SERVICE_NAME=keystone KEYSTONE_SERVICE_TYPE=identity SERVICE_PROJECT_NAME=service -CINDER_SERVICE_NAME=cinder -CINDER_SERVICE_TYPE=volume -CINDER_V2_SERVICE_NAME=cinderv2 -CINDER_V2_SERVICE_TYPE=volumev2 -CINDER_V3_SERVICE_NAME=cinderv3 -CINDER_V3_SERVICE_TYPE=volumev3 -GLANCE_SERVICE_NAME=glance -GLANCE_SERVICE_TYPE=image [REGION_2_SERVICES] REGION_NAME=RegionTwo -NOVA_USER_NAME=nova -NOVA_PASSWORD=password2WO* -NOVA_SERVICE_NAME=nova -NOVA_SERVICE_TYPE=compute -PLACEMENT_USER_NAME=placement -PLACEMENT_PASSWORD=password2WO* -PLACEMENT_SERVICE_NAME=placement -PLACEMENT_SERVICE_TYPE=placement -NOVA_V3_SERVICE_NAME=novav3 -NOVA_V3_SERVICE_TYPE=computev3 -NEUTRON_USER_NAME=neutron -NEUTRON_PASSWORD=password2WO* -NEUTRON_SERVICE_NAME=neutron -NEUTRON_SERVICE_TYPE=network SYSINV_USER_NAME=sysinv SYSINV_PASSWORD=password2WO* SYSINV_SERVICE_NAME=sysinv @@ -88,29 +66,10 @@ PATCHING_USER_NAME=patching PATCHING_PASSWORD=password2WO* PATCHING_SERVICE_NAME=patching PATCHING_SERVICE_TYPE=patching -HEAT_USER_NAME=heat -HEAT_PASSWORD=password2WO* -HEAT_ADMIN_DOMAIN=heat -HEAT_ADMIN_USER_NAME=heat_stack_admin -HEAT_ADMIN_PASSWORD=password2WO* -HEAT_SERVICE_NAME=heat -HEAT_SERVICE_TYPE=orchestration -HEAT_CFN_SERVICE_NAME=heat-cfn -HEAT_CFN_SERVICE_TYPE=cloudformation -CEILOMETER_USER_NAME=ceilometer -CEILOMETER_PASSWORD=password2WO* -CEILOMETER_SERVICE_NAME=ceilometer -CEILOMETER_SERVICE_TYPE=metering NFV_USER_NAME=vim NFV_PASSWORD=password2WO* -AODH_USER_NAME=aodh -AODH_PASSWORD=password2WO* MTCE_USER_NAME=mtce MTCE_PASSWORD=password2WO* -PANKO_USER_NAME=panko -PANKO_PASSWORD=password2WO* -GNOCCHI_USER_NAME=gnocchi -GNOCCHI_PASSWORD=password2WO* FM_USER_NAME=fm FM_PASSWORD=password2WO* BARBICAN_USER_NAME=barbican diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.lag.vlan.result b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.lag.vlan.result index 1838be6f4d..0ca680b200 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.lag.vlan.result +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.lag.vlan.result @@ -56,9 +56,6 @@ EXTERNAL_OAM_FLOATING_ADDRESS = 10.10.10.2 EXTERNAL_OAM_0_ADDRESS = 10.10.10.3 EXTERNAL_OAM_1_ADDRESS = 10.10.10.4 -[cNETWORK] -VSWITCH_TYPE = ovs-dpdk - [cREGION] REGION_CONFIG = True REGION_1_NAME = RegionOne @@ -70,47 +67,16 @@ ADMIN_PROJECT_DOMAIN = Default SERVICE_PROJECT_NAME = service KEYSTONE_SERVICE_NAME = keystone KEYSTONE_SERVICE_TYPE = identity -GLANCE_SERVICE_NAME = glance -GLANCE_SERVICE_TYPE = image -GLANCE_CACHED = False -GLANCE_REGION = RegionOne -NOVA_USER_NAME = nova -NOVA_PASSWORD = password2WO* -NOVA_SERVICE_NAME = nova -NOVA_SERVICE_TYPE = compute -PLACEMENT_USER_NAME = placement -PLACEMENT_PASSWORD = password2WO* -PLACEMENT_SERVICE_NAME = placement -PLACEMENT_SERVICE_TYPE = placement -NEUTRON_USER_NAME = neutron -NEUTRON_PASSWORD = password2WO* -NEUTRON_REGION_NAME = RegionTwo -NEUTRON_SERVICE_NAME = neutron -NEUTRON_SERVICE_TYPE = network -CEILOMETER_USER_NAME = ceilometer -CEILOMETER_PASSWORD = password2WO* -CEILOMETER_SERVICE_NAME = ceilometer -CEILOMETER_SERVICE_TYPE = metering PATCHING_USER_NAME = patching PATCHING_PASSWORD = password2WO* SYSINV_USER_NAME = sysinv SYSINV_PASSWORD = password2WO* SYSINV_SERVICE_NAME = sysinv SYSINV_SERVICE_TYPE = platform -HEAT_USER_NAME = heat -HEAT_PASSWORD = password2WO* -HEAT_ADMIN_USER_NAME = heat_stack_admin -HEAT_ADMIN_PASSWORD = password2WO* -AODH_USER_NAME = aodh -AODH_PASSWORD = password2WO* NFV_USER_NAME = vim NFV_PASSWORD = password2WO* MTCE_USER_NAME = mtce MTCE_PASSWORD = password2WO* -PANKO_USER_NAME = panko -PANKO_PASSWORD = password2WO* -GNOCCHI_USER_NAME = gnocchi -GNOCCHI_PASSWORD = password2WO* FM_USER_NAME = fm FM_PASSWORD = password2WO* BARBICAN_USER_NAME = barbican @@ -122,10 +88,6 @@ KEYSTONE_IDENTITY_URI = http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_ADMIN_URI = http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_INTERNAL_URI = http://192.168.204.12:8081/keystone/main/v2.0 KEYSTONE_PUBLIC_URI = http://10.10.10.2:8081/keystone/main/v2.0 -GLANCE_ADMIN_URI = http://192.168.204.12:9292/v2 -GLANCE_PUBLIC_URI = http://10.10.10.2:9292/v2 -GLANCE_INTERNAL_URI = http://192.168.204.12:9292/v2 -HEAT_ADMIN_DOMAIN_NAME = heat [cAUTHENTICATION] ADMIN_PASSWORD = Li69nux* diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.nuage_vrs b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.nuage_vrs index 21bc25d4e4..0034594ac1 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.nuage_vrs +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.nuage_vrs @@ -64,31 +64,9 @@ KEYSTONE_ADMINURL=http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_SERVICE_NAME=keystone KEYSTONE_SERVICE_TYPE=identity SERVICE_PROJECT_NAME=service -CINDER_SERVICE_NAME=cinder -CINDER_SERVICE_TYPE=volume -CINDER_V2_SERVICE_NAME=cinderv2 -CINDER_V2_SERVICE_TYPE=volumev2 -CINDER_V3_SERVICE_NAME=cinderv3 -CINDER_V3_SERVICE_TYPE=volumev3 -GLANCE_SERVICE_NAME=glance -GLANCE_SERVICE_TYPE=image -NEUTRON_USER_NAME=neutron -NEUTRON_PASSWORD=password2WO* -NEUTRON_SERVICE_NAME=neutron -NEUTRON_SERVICE_TYPE=network [REGION_2_SERVICES] REGION_NAME=RegionTwo -NOVA_USER_NAME=nova -NOVA_PASSWORD=password2WO* -NOVA_SERVICE_NAME=nova -NOVA_SERVICE_TYPE=compute -PLACEMENT_USER_NAME=placement -PLACEMENT_PASSWORD=password2WO* -PLACEMENT_SERVICE_NAME=placement -PLACEMENT_SERVICE_TYPE=placement -NOVA_V3_SERVICE_NAME=novav3 -NOVA_V3_SERVICE_TYPE=computev3 SYSINV_USER_NAME=sysinv SYSINV_PASSWORD=password2WO* SYSINV_SERVICE_NAME=sysinv @@ -97,29 +75,10 @@ PATCHING_USER_NAME=patching PATCHING_PASSWORD=password2WO* PATCHING_SERVICE_NAME=patching PATCHING_SERVICE_TYPE=patching -HEAT_USER_NAME=heat -HEAT_PASSWORD=password2WO* -HEAT_ADMIN_DOMAIN=heat -HEAT_ADMIN_USER_NAME=heat_stack_admin -HEAT_ADMIN_PASSWORD=password2WO* -HEAT_SERVICE_NAME=heat -HEAT_SERVICE_TYPE=orchestration -HEAT_CFN_SERVICE_NAME=heat-cfn -HEAT_CFN_SERVICE_TYPE=cloudformation -CEILOMETER_USER_NAME=ceilometer -CEILOMETER_PASSWORD=password2WO* -CEILOMETER_SERVICE_NAME=ceilometer -CEILOMETER_SERVICE_TYPE=metering NFV_USER_NAME=vim NFV_PASSWORD=password2WO* -AODH_USER_NAME=aodh -AODH_PASSWORD=password2WO* MTCE_USER_NAME=mtce MTCE_PASSWORD=password2WO* -PANKO_USER_NAME=panko -PANKO_PASSWORD=password2WO* -GNOCCHI_USER_NAME=gnocchi -GNOCCHI_PASSWORD=password2WO* FM_USER_NAME=fm FM_PASSWORD=password2WO* BARBICAN_USER_NAME=barbican diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.nuage_vrs.result b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.nuage_vrs.result index ef81d1900f..4d502b1701 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.nuage_vrs.result +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.nuage_vrs.result @@ -35,21 +35,6 @@ EXTERNAL_OAM_FLOATING_ADDRESS = 10.10.10.2 EXTERNAL_OAM_0_ADDRESS = 10.10.10.3 EXTERNAL_OAM_1_ADDRESS = 10.10.10.4 -[cNETWORK] -VSWITCH_TYPE = nuage_vrs -NEUTRON_L2_AGENT = nuage_vrs -NEUTRON_L3_EXT_BRIDGE = provider -NEUTRON_L2_PLUGIN = NC -NEUTRON_ML2_MECHANISM_DRIVERS = NC -NEUTRON_ML2_SRIOV_AGENT_REQUIRED = NC -NEUTRON_ML2_TYPE_DRIVERS = NC -NEUTRON_ML2_TENANT_NETWORK_TYPES = vlan,vxlan -NEUTRON_HOST_DRIVER = NC -NEUTRON_FM_DRIVER = NC -NEUTRON_NETWORK_SCHEDULER = NC -NEUTRON_ROUTER_SCHEDULER = NC -METADATA_PROXY_SHARED_SECRET = NuageNetworksSharedSecret - [cREGION] REGION_CONFIG = True REGION_1_NAME = RegionOne @@ -61,47 +46,16 @@ ADMIN_PROJECT_DOMAIN = Default SERVICE_PROJECT_NAME = service KEYSTONE_SERVICE_NAME = keystone KEYSTONE_SERVICE_TYPE = identity -GLANCE_SERVICE_NAME = glance -GLANCE_SERVICE_TYPE = image -GLANCE_CACHED = False -GLANCE_REGION = RegionOne -NOVA_USER_NAME = nova -NOVA_PASSWORD = password2WO* -NOVA_SERVICE_NAME = nova -NOVA_SERVICE_TYPE = compute -PLACEMENT_USER_NAME = placement -PLACEMENT_PASSWORD = password2WO* -PLACEMENT_SERVICE_NAME = placement -PLACEMENT_SERVICE_TYPE = placement -NEUTRON_USER_NAME = neutron -NEUTRON_PASSWORD = password2WO* -NEUTRON_REGION_NAME = RegionOne -NEUTRON_SERVICE_NAME = neutron -NEUTRON_SERVICE_TYPE = network -CEILOMETER_USER_NAME = ceilometer -CEILOMETER_PASSWORD = password2WO* -CEILOMETER_SERVICE_NAME = ceilometer -CEILOMETER_SERVICE_TYPE = metering PATCHING_USER_NAME = patching PATCHING_PASSWORD = password2WO* SYSINV_USER_NAME = sysinv SYSINV_PASSWORD = password2WO* SYSINV_SERVICE_NAME = sysinv SYSINV_SERVICE_TYPE = platform -HEAT_USER_NAME = heat -HEAT_PASSWORD = password2WO* -HEAT_ADMIN_USER_NAME = heat_stack_admin -HEAT_ADMIN_PASSWORD = password2WO* -AODH_USER_NAME = aodh -AODH_PASSWORD = password2WO* NFV_USER_NAME = vim NFV_PASSWORD = password2WO* MTCE_USER_NAME = mtce MTCE_PASSWORD = password2WO* -PANKO_USER_NAME = panko -PANKO_PASSWORD = password2WO* -GNOCCHI_USER_NAME = gnocchi -GNOCCHI_PASSWORD = password2WO* FM_USER_NAME = fm FM_PASSWORD = password2WO* BARBICAN_USER_NAME = barbican @@ -113,10 +67,6 @@ KEYSTONE_IDENTITY_URI = http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_ADMIN_URI = http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_INTERNAL_URI = http://192.168.204.12:8081/keystone/main/v2.0 KEYSTONE_PUBLIC_URI = http://10.10.10.2:8081/keystone/main/v2.0 -GLANCE_ADMIN_URI = http://192.168.204.12:9292/v2 -GLANCE_PUBLIC_URI = http://10.10.10.2:9292/v2 -GLANCE_INTERNAL_URI = http://192.168.204.12:9292/v2 -HEAT_ADMIN_DOMAIN_NAME = heat [cAUTHENTICATION] ADMIN_PASSWORD = Li69nux* diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.security b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.security index 84c4ade195..f11673fa58 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.security +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.security @@ -60,31 +60,9 @@ KEYSTONE_ADMINURL=http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_SERVICE_NAME=keystone KEYSTONE_SERVICE_TYPE=identity SERVICE_PROJECT_NAME=service -CINDER_SERVICE_NAME=cinder -CINDER_SERVICE_TYPE=volume -CINDER_V2_SERVICE_NAME=cinderv2 -CINDER_V2_SERVICE_TYPE=volumev2 -CINDER_V3_SERVICE_NAME=cinderv3 -CINDER_V3_SERVICE_TYPE=volumev3 -GLANCE_SERVICE_NAME=glance -GLANCE_SERVICE_TYPE=image [REGION_2_SERVICES] REGION_NAME=RegionTwo -NOVA_USER_NAME=nova -NOVA_PASSWORD=password2WO* -NOVA_SERVICE_NAME=nova -NOVA_SERVICE_TYPE=compute -PLACEMENT_USER_NAME=placement -PLACEMENT_PASSWORD=password2WO* -PLACEMENT_SERVICE_NAME=placement -PLACEMENT_SERVICE_TYPE=placement -NOVA_V3_SERVICE_NAME=novav3 -NOVA_V3_SERVICE_TYPE=computev3 -NEUTRON_USER_NAME=neutron -NEUTRON_PASSWORD=password2WO* -NEUTRON_SERVICE_NAME=neutron -NEUTRON_SERVICE_TYPE=network SYSINV_USER_NAME=sysinv SYSINV_PASSWORD=password2WO* SYSINV_SERVICE_NAME=sysinv @@ -93,29 +71,10 @@ PATCHING_USER_NAME=patching PATCHING_PASSWORD=password2WO* PATCHING_SERVICE_NAME=patching PATCHING_SERVICE_TYPE=patching -HEAT_USER_NAME=heat -HEAT_PASSWORD=password2WO* -HEAT_ADMIN_DOMAIN=heat -HEAT_ADMIN_USER_NAME=heat_stack_admin -HEAT_ADMIN_PASSWORD=password2WO* -HEAT_SERVICE_NAME=heat -HEAT_SERVICE_TYPE=orchestration -HEAT_CFN_SERVICE_NAME=heat-cfn -HEAT_CFN_SERVICE_TYPE=cloudformation -CEILOMETER_USER_NAME=ceilometer -CEILOMETER_PASSWORD=password2WO* -CEILOMETER_SERVICE_NAME=ceilometer -CEILOMETER_SERVICE_TYPE=metering NFV_USER_NAME=vim NFV_PASSWORD=password2WO* -AODH_USER_NAME=aodh -AODH_PASSWORD=password2WO* MTCE_USER_NAME=mtce MTCE_PASSWORD=password2WO* -PANKO_USER_NAME=panko -PANKO_PASSWORD=password2WO* -GNOCCHI_USER_NAME=gnocchi -GNOCCHI_PASSWORD=password2WO* FM_USER_NAME=fm FM_PASSWORD=password2WO* BARBICAN_USER_NAME=barbican diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.security.result b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.security.result index 6ed392d298..4d502b1701 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.security.result +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.security.result @@ -35,9 +35,6 @@ EXTERNAL_OAM_FLOATING_ADDRESS = 10.10.10.2 EXTERNAL_OAM_0_ADDRESS = 10.10.10.3 EXTERNAL_OAM_1_ADDRESS = 10.10.10.4 -[cNETWORK] -VSWITCH_TYPE = ovs-dpdk - [cREGION] REGION_CONFIG = True REGION_1_NAME = RegionOne @@ -49,47 +46,16 @@ ADMIN_PROJECT_DOMAIN = Default SERVICE_PROJECT_NAME = service KEYSTONE_SERVICE_NAME = keystone KEYSTONE_SERVICE_TYPE = identity -GLANCE_SERVICE_NAME = glance -GLANCE_SERVICE_TYPE = image -GLANCE_CACHED = False -GLANCE_REGION = RegionOne -NOVA_USER_NAME = nova -NOVA_PASSWORD = password2WO* -NOVA_SERVICE_NAME = nova -NOVA_SERVICE_TYPE = compute -PLACEMENT_USER_NAME = placement -PLACEMENT_PASSWORD = password2WO* -PLACEMENT_SERVICE_NAME = placement -PLACEMENT_SERVICE_TYPE = placement -NEUTRON_USER_NAME = neutron -NEUTRON_PASSWORD = password2WO* -NEUTRON_REGION_NAME = RegionTwo -NEUTRON_SERVICE_NAME = neutron -NEUTRON_SERVICE_TYPE = network -CEILOMETER_USER_NAME = ceilometer -CEILOMETER_PASSWORD = password2WO* -CEILOMETER_SERVICE_NAME = ceilometer -CEILOMETER_SERVICE_TYPE = metering PATCHING_USER_NAME = patching PATCHING_PASSWORD = password2WO* SYSINV_USER_NAME = sysinv SYSINV_PASSWORD = password2WO* SYSINV_SERVICE_NAME = sysinv SYSINV_SERVICE_TYPE = platform -HEAT_USER_NAME = heat -HEAT_PASSWORD = password2WO* -HEAT_ADMIN_USER_NAME = heat_stack_admin -HEAT_ADMIN_PASSWORD = password2WO* -AODH_USER_NAME = aodh -AODH_PASSWORD = password2WO* NFV_USER_NAME = vim NFV_PASSWORD = password2WO* MTCE_USER_NAME = mtce MTCE_PASSWORD = password2WO* -PANKO_USER_NAME = panko -PANKO_PASSWORD = password2WO* -GNOCCHI_USER_NAME = gnocchi -GNOCCHI_PASSWORD = password2WO* FM_USER_NAME = fm FM_PASSWORD = password2WO* BARBICAN_USER_NAME = barbican @@ -101,10 +67,6 @@ KEYSTONE_IDENTITY_URI = http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_ADMIN_URI = http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_INTERNAL_URI = http://192.168.204.12:8081/keystone/main/v2.0 KEYSTONE_PUBLIC_URI = http://10.10.10.2:8081/keystone/main/v2.0 -GLANCE_ADMIN_URI = http://192.168.204.12:9292/v2 -GLANCE_PUBLIC_URI = http://10.10.10.2:9292/v2 -GLANCE_INTERNAL_URI = http://192.168.204.12:9292/v2 -HEAT_ADMIN_DOMAIN_NAME = heat [cAUTHENTICATION] ADMIN_PASSWORD = Li69nux* diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple index 9785632661..855c69914b 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple @@ -60,31 +60,9 @@ KEYSTONE_ADMINURL=http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_SERVICE_NAME=keystone KEYSTONE_SERVICE_TYPE=identity SERVICE_PROJECT_NAME=service -CINDER_SERVICE_NAME=cinder -CINDER_SERVICE_TYPE=volume -CINDER_V2_SERVICE_NAME=cinderv2 -CINDER_V2_SERVICE_TYPE=volumev2 -CINDER_V3_SERVICE_NAME=cinderv3 -CINDER_V3_SERVICE_TYPE=volumev3 -GLANCE_SERVICE_NAME=glance -GLANCE_SERVICE_TYPE=image [REGION_2_SERVICES] REGION_NAME=RegionTwo -NOVA_USER_NAME=nova -NOVA_PASSWORD=password2WO* -NOVA_SERVICE_NAME=nova -NOVA_SERVICE_TYPE=compute -NOVA_V3_SERVICE_NAME=novav3 -NOVA_V3_SERVICE_TYPE=computev3 -PLACEMENT_USER_NAME=placement -PLACEMENT_PASSWORD=password2WO* -PLACEMENT_SERVICE_NAME=placement -PLACEMENT_SERVICE_TYPE=placement -NEUTRON_USER_NAME=neutron -NEUTRON_PASSWORD=password2WO* -NEUTRON_SERVICE_NAME=neutron -NEUTRON_SERVICE_TYPE=network SYSINV_USER_NAME=sysinv SYSINV_PASSWORD=password2WO* SYSINV_SERVICE_NAME=sysinv @@ -93,29 +71,12 @@ PATCHING_USER_NAME=patching PATCHING_PASSWORD=password2WO* PATCHING_SERVICE_NAME=patching PATCHING_SERVICE_TYPE=patching -HEAT_USER_NAME=heat -HEAT_PASSWORD=password2WO* -HEAT_ADMIN_DOMAIN=heat -HEAT_ADMIN_USER_NAME=heat_stack_admin -HEAT_ADMIN_PASSWORD=password2WO* -HEAT_SERVICE_NAME=heat -HEAT_SERVICE_TYPE=orchestration -HEAT_CFN_SERVICE_NAME=heat-cfn -HEAT_CFN_SERVICE_TYPE=cloudformation -CEILOMETER_USER_NAME=ceilometer -CEILOMETER_PASSWORD=password2WO* -CEILOMETER_SERVICE_NAME=ceilometer -CEILOMETER_SERVICE_TYPE=metering NFV_USER_NAME=vim NFV_PASSWORD=password2WO* AODH_USER_NAME=aodh AODH_PASSWORD=password2WO* MTCE_USER_NAME=mtce MTCE_PASSWORD=password2WO* -PANKO_USER_NAME=panko -PANKO_PASSWORD=password2WO* -GNOCCHI_USER_NAME=gnocchi -GNOCCHI_PASSWORD=password2WO* FM_USER_NAME=fm FM_PASSWORD=password2WO* BARBICAN_USER_NAME=barbican diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple.can_ips b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple.can_ips index 1b34aec082..457936b493 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple.can_ips +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple.can_ips @@ -61,31 +61,9 @@ KEYSTONE_ADMINURL=http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_SERVICE_NAME=keystone KEYSTONE_SERVICE_TYPE=identity SERVICE_PROJECT_NAME=service -CINDER_SERVICE_NAME=cinder -CINDER_SERVICE_TYPE=volume -CINDER_V2_SERVICE_NAME=cinderv2 -CINDER_V2_SERVICE_TYPE=volumev2 -CINDER_V3_SERVICE_NAME=cinderv3 -CINDER_V3_SERVICE_TYPE=volumev3 -GLANCE_SERVICE_NAME=glance -GLANCE_SERVICE_TYPE=image [REGION_2_SERVICES] REGION_NAME=RegionTwo -NOVA_USER_NAME=nova -NOVA_PASSWORD=password2WO* -NOVA_SERVICE_NAME=nova -NOVA_SERVICE_TYPE=compute -PLACEMENT_USER_NAME=placement -PLACEMENT_PASSWORD=password2WO* -PLACEMENT_SERVICE_NAME=placement -PLACEMENT_SERVICE_TYPE=placement -NOVA_V3_SERVICE_NAME=novav3 -NOVA_V3_SERVICE_TYPE=computev3 -NEUTRON_USER_NAME=neutron -NEUTRON_PASSWORD=password2WO* -NEUTRON_SERVICE_NAME=neutron -NEUTRON_SERVICE_TYPE=network SYSINV_USER_NAME=sysinv SYSINV_PASSWORD=password2WO* SYSINV_SERVICE_NAME=sysinv @@ -94,29 +72,11 @@ PATCHING_USER_NAME=patching PATCHING_PASSWORD=password2WO* PATCHING_SERVICE_NAME=patching PATCHING_SERVICE_TYPE=patching -HEAT_USER_NAME=heat -HEAT_PASSWORD=password2WO* -HEAT_ADMIN_DOMAIN=heat -HEAT_ADMIN_USER_NAME=heat_stack_admin -HEAT_ADMIN_PASSWORD=password2WO* -HEAT_SERVICE_NAME=heat -HEAT_SERVICE_TYPE=orchestration -HEAT_CFN_SERVICE_NAME=heat-cfn -HEAT_CFN_SERVICE_TYPE=cloudformation -CEILOMETER_USER_NAME=ceilometer -CEILOMETER_PASSWORD=password2WO* -CEILOMETER_SERVICE_NAME=ceilometer -CEILOMETER_SERVICE_TYPE=metering NFV_USER_NAME=vim NFV_PASSWORD=password2WO* -AODH_USER_NAME=aodh -AODH_PASSWORD=password2WO* MTCE_USER_NAME=mtce MTCE_PASSWORD=password2WO* PANKO_USER_NAME=panko -PANKO_PASSWORD=password2WO* -GNOCCHI_USER_NAME=gnocchi -GNOCCHI_PASSWORD=password2WO* FM_USER_NAME=fm FM_PASSWORD=password2WO* BARBICAN_USER_NAME=barbican diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple.result b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple.result index 6ed392d298..4d502b1701 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple.result +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple.result @@ -35,9 +35,6 @@ EXTERNAL_OAM_FLOATING_ADDRESS = 10.10.10.2 EXTERNAL_OAM_0_ADDRESS = 10.10.10.3 EXTERNAL_OAM_1_ADDRESS = 10.10.10.4 -[cNETWORK] -VSWITCH_TYPE = ovs-dpdk - [cREGION] REGION_CONFIG = True REGION_1_NAME = RegionOne @@ -49,47 +46,16 @@ ADMIN_PROJECT_DOMAIN = Default SERVICE_PROJECT_NAME = service KEYSTONE_SERVICE_NAME = keystone KEYSTONE_SERVICE_TYPE = identity -GLANCE_SERVICE_NAME = glance -GLANCE_SERVICE_TYPE = image -GLANCE_CACHED = False -GLANCE_REGION = RegionOne -NOVA_USER_NAME = nova -NOVA_PASSWORD = password2WO* -NOVA_SERVICE_NAME = nova -NOVA_SERVICE_TYPE = compute -PLACEMENT_USER_NAME = placement -PLACEMENT_PASSWORD = password2WO* -PLACEMENT_SERVICE_NAME = placement -PLACEMENT_SERVICE_TYPE = placement -NEUTRON_USER_NAME = neutron -NEUTRON_PASSWORD = password2WO* -NEUTRON_REGION_NAME = RegionTwo -NEUTRON_SERVICE_NAME = neutron -NEUTRON_SERVICE_TYPE = network -CEILOMETER_USER_NAME = ceilometer -CEILOMETER_PASSWORD = password2WO* -CEILOMETER_SERVICE_NAME = ceilometer -CEILOMETER_SERVICE_TYPE = metering PATCHING_USER_NAME = patching PATCHING_PASSWORD = password2WO* SYSINV_USER_NAME = sysinv SYSINV_PASSWORD = password2WO* SYSINV_SERVICE_NAME = sysinv SYSINV_SERVICE_TYPE = platform -HEAT_USER_NAME = heat -HEAT_PASSWORD = password2WO* -HEAT_ADMIN_USER_NAME = heat_stack_admin -HEAT_ADMIN_PASSWORD = password2WO* -AODH_USER_NAME = aodh -AODH_PASSWORD = password2WO* NFV_USER_NAME = vim NFV_PASSWORD = password2WO* MTCE_USER_NAME = mtce MTCE_PASSWORD = password2WO* -PANKO_USER_NAME = panko -PANKO_PASSWORD = password2WO* -GNOCCHI_USER_NAME = gnocchi -GNOCCHI_PASSWORD = password2WO* FM_USER_NAME = fm FM_PASSWORD = password2WO* BARBICAN_USER_NAME = barbican @@ -101,10 +67,6 @@ KEYSTONE_IDENTITY_URI = http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_ADMIN_URI = http://192.168.204.12:8081/keystone/admin/v2.0 KEYSTONE_INTERNAL_URI = http://192.168.204.12:8081/keystone/main/v2.0 KEYSTONE_PUBLIC_URI = http://10.10.10.2:8081/keystone/main/v2.0 -GLANCE_ADMIN_URI = http://192.168.204.12:9292/v2 -GLANCE_PUBLIC_URI = http://10.10.10.2:9292/v2 -GLANCE_INTERNAL_URI = http://192.168.204.12:9292/v2 -HEAT_ADMIN_DOMAIN_NAME = heat [cAUTHENTICATION] ADMIN_PASSWORD = Li69nux* diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/test_region_config.py b/controllerconfig/controllerconfig/controllerconfig/tests/test_region_config.py index d6c45a370d..5b263c1138 100644 --- a/controllerconfig/controllerconfig/controllerconfig/tests/test_region_config.py +++ b/controllerconfig/controllerconfig/controllerconfig/tests/test_region_config.py @@ -599,9 +599,6 @@ def test_region_config_validation(): os.getcwd(), "controllerconfig/tests/files/", "region_config.simple") lag_vlan_regionfile = os.path.join( os.getcwd(), "controllerconfig/tests/files/", "region_config.lag.vlan") - nuage_vrs_regionfile = os.path.join(os.getcwd(), - "controllerconfig/tests/files/", - "region_config.nuage_vrs") # Test detection of non-required CINDER_* parameters region_config = cr.parse_system_config(simple_regionfile) @@ -818,37 +815,3 @@ def test_region_config_validation(): validate_only=True) with pytest.raises(exceptions.ConfigFail): validate(region_config, REGION_CONFIG, None, False) - - # Test detection of invalid VSWITCH_TYPE - region_config = cr.parse_system_config(nuage_vrs_regionfile) - region_config.set('NETWORK', 'VSWITCH_TYPE', 'invalid') - with pytest.raises(exceptions.ConfigFail): - cr.create_cgcs_config_file(None, region_config, None, None, None, - validate_only=True) - with pytest.raises(exceptions.ConfigFail): - validate(region_config, REGION_CONFIG, None, False) - - # Test detection of neutron in wrong region for VSWITCH_TYPE - region_config = cr.parse_system_config(nuage_vrs_regionfile) - region_config.set('NETWORK', 'VSWITCH_TYPE', 'ovs-dpdk') - with pytest.raises(exceptions.ConfigFail): - cr.create_cgcs_config_file(None, region_config, None, None, None, - validate_only=True) - with pytest.raises(exceptions.ConfigFail): - validate(region_config, REGION_CONFIG, None, False) - - # Test detection of neutron in wrong region for NUAGE_VRS VSWITCH_TYPE - region_config = cr.parse_system_config(nuage_vrs_regionfile) - region_config.remove_option('SHARED_SERVICES', 'NEUTRON_USER_NAME') - region_config.remove_option('SHARED_SERVICES', 'NEUTRON_PASSWORD') - region_config.remove_option('SHARED_SERVICES', 'NEUTRON_SERVICE_NAME') - region_config.remove_option('SHARED_SERVICES', 'NEUTRON_SERVICE_TYPE') - region_config.set('REGION_2_SERVICES', 'NEUTRON_USER_NAME', 'neutron') - region_config.set('REGION_2_SERVICES', 'NEUTRON_PASSWORD', 'password2WO*') - region_config.set('REGION_2_SERVICES', 'NEUTRON_SERVICE_NAME', 'neutron') - region_config.set('REGION_2_SERVICES', 'NEUTRON_SERVICE_TYPE', 'network') - with pytest.raises(exceptions.ConfigFail): - cr.create_cgcs_config_file(None, region_config, None, None, None, - validate_only=True) - with pytest.raises(exceptions.ConfigFail): - validate(region_config, REGION_CONFIG, None, False) diff --git a/puppet-manifests/src/modules/openstack/manifests/keystone.pp b/puppet-manifests/src/modules/openstack/manifests/keystone.pp index 276d4b8c96..922119bf52 100644 --- a/puppet-manifests/src/modules/openstack/manifests/keystone.pp +++ b/puppet-manifests/src/modules/openstack/manifests/keystone.pp @@ -175,16 +175,8 @@ class openstack::keystone::api # the subcloud region. if ($::platform::params::distributed_cloud_role == 'subcloud' and $::platform::params::region_2_name != 'RegionOne') { - Keystone_endpoint["${platform::params::region_2_name}/keystone::identity"] -> Keystone_endpoint['RegionOne/keystone::identity'] - keystone_endpoint { 'RegionOne/keystone::identity': - ensure => 'absent', - name => 'keystone', - type => 'identity', - region => 'RegionOne', - public_url => 'http://127.0.0.1:5000/v3', - admin_url => 'http://127.0.0.1:5000/v3', - internal_url => 'http://127.0.0.1:5000/v3' - } + Keystone_endpoint<||> -> Class['::platform::client'] + # TODO: use exec openstack endpoint delete commands to clean up the bootstrap endpoints } } diff --git a/puppet-manifests/src/modules/openstack/templates/keystone-defaultregion.erb b/puppet-manifests/src/modules/openstack/templates/keystone-defaultregion.erb index 350ce05c23..e025621570 100644 --- a/puppet-manifests/src/modules/openstack/templates/keystone-defaultregion.erb +++ b/puppet-manifests/src/modules/openstack/templates/keystone-defaultregion.erb @@ -5,7 +5,6 @@ keystone-<%=@reference_region %>-filter.conf \ --os-username <%=@os_username %> \ --os-password $PASSWORD \ --os-region-name <%=@identity_region %> \ - --os-keystone-region-name <%=@keystone_region %> \ --os-auth-url <%=@auth_url %> \ --os-identity-api-version <%=@api_version %> \ --os-project-name <%=@os_project_name %> | awk '/id\ \ / { print $4 }' ) @@ -13,7 +12,6 @@ openstack endpoint group add project $ENDPOINTGROUP_ID services \ --os-username <%=@os_username %> \ --os-password $PASSWORD \ --os-region-name <%=@identity_region %> \ - --os-keystone-region-name <%=@keystone_region %> \ --os-auth-url <%=@auth_url %> \ --os-identity-api-version <%=@api_version %> \ --os-project-name <%=@os_project_name %> diff --git a/puppet-manifests/src/modules/openstack/templates/keystone-systemcontroller.erb b/puppet-manifests/src/modules/openstack/templates/keystone-systemcontroller.erb index 3474d44729..3bd7805b0d 100644 --- a/puppet-manifests/src/modules/openstack/templates/keystone-systemcontroller.erb +++ b/puppet-manifests/src/modules/openstack/templates/keystone-systemcontroller.erb @@ -5,7 +5,6 @@ keystone-<%=@system_controller_region %>-filter.conf \ --os-username <%=@os_username %> \ --os-password $PASSWORD \ --os-region-name <%=@identity_region %> \ - --os-keystone-region-name <%=@keystone_region %> \ --os-auth-url <%=@auth_url %> \ --os-identity-api-version <%=@api_version %> \ --os-project-name <%=@os_project_name %> | awk '/id\ \ / { print $4 }' ) @@ -13,7 +12,6 @@ openstack endpoint group add project $ENDPOINTGROUP_ID services \ --os-username <%=@os_username %> \ --os-password $PASSWORD \ --os-region-name <%=@identity_region %> \ - --os-keystone-region-name <%=@keystone_region %> \ --os-auth-url <%=@auth_url %> \ --os-identity-api-version <%=@api_version %> \ --os-project-name <%=@os_project_name %> diff --git a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp index ad8ceb05aa..6c1d0ab533 100644 --- a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp +++ b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp @@ -433,6 +433,7 @@ class platform::kubernetes::firewall $system_mode = $::platform::params::system_mode $oam_float_ip = $::platform::network::oam::params::controller_address + $oam_interface = $::platform::network::oam::params::interface_name $mgmt_subnet = $::platform::network::mgmt::params::subnet_network $mgmt_prefixlen = $::platform::network::mgmt::params::subnet_prefixlen @@ -448,7 +449,8 @@ class platform::kubernetes::firewall dport => $dports, destination => $d_mgmt_subnet, source => $s_mgmt_subnet, - tosource => $oam_float_ip + tosource => $oam_float_ip, + outiface => $oam_interface, } } } diff --git a/puppet-manifests/src/modules/platform/manifests/sm.pp b/puppet-manifests/src/modules/platform/manifests/sm.pp index 4a00982f43..241cea952f 100644 --- a/puppet-manifests/src/modules/platform/manifests/sm.pp +++ b/puppet-manifests/src/modules/platform/manifests/sm.pp @@ -1129,18 +1129,6 @@ class platform::sm -> exec { 'Provision DCOrch-Sysinv-Api-Proxy in SM (service dcorch-sysinv-api-proxy)': command => 'sm-provision service dcorch-sysinv-api-proxy', } - -> exec { 'Provision DCOrch-Nova-Api-Proxy (service-group-member dcorch-nova-api-proxy)': - command => 'sm-provision service-group-member distributed-cloud-services dcorch-nova-api-proxy', - } - -> exec { 'Provision DCOrch-Nova-Api-Proxy in SM (service dcorch-nova-api-proxy)': - command => 'sm-provision service dcorch-nova-api-proxy', - } - -> exec { 'Provision DCOrch-Neutron-Api-Proxy (service-group-member dcorch-neutron-api-proxy)': - command => 'sm-provision service-group-member distributed-cloud-services dcorch-neutron-api-proxy', - } - -> exec { 'Provision DCOrch-Neutron-Api-Proxy in SM (service dcorch-neutron-api-proxy)': - command => 'sm-provision service dcorch-neutron-api-proxy', - } -> exec { 'Provision DCOrch-Patch-Api-Proxy (service-group-member dcorch-patch-api-proxy)': command => 'sm-provision service-group-member distributed-cloud-services dcorch-patch-api-proxy', } @@ -1165,25 +1153,9 @@ class platform::sm -> exec { 'Configure OpenStack - DCOrch-sysinv-api-proxy': command => "sm-configure service_instance dcorch-sysinv-api-proxy dcorch-sysinv-api-proxy \"\"", } - -> exec { 'Configure OpenStack - DCOrch-nova-api-proxy': - command => "sm-configure service_instance dcorch-nova-api-proxy dcorch-nova-api-proxy \"\"", - } - -> exec { 'Configure OpenStack - DCOrch-neutron-api-proxy': - command => "sm-configure service_instance dcorch-neutron-api-proxy dcorch-neutron-api-proxy \"\"", - } -> exec { 'Configure OpenStack - DCOrch-patch-api-proxy': command => "sm-configure service_instance dcorch-patch-api-proxy dcorch-patch-api-proxy \"\"", } - - exec { 'Provision DCOrch-Cinder-Api-Proxy (service-group-member dcorch-cinder-api-proxy)': - command => 'sm-provision service-group-member distributed-cloud-services dcorch-cinder-api-proxy', - } - -> exec { 'Provision DCOrch-Cinder-Api-Proxy in SM (service dcorch-cinder-api-proxy)': - command => 'sm-provision service dcorch-cinder-api-proxy', - } - -> exec { 'Configure OpenStack - DCOrch-cinder-api-proxy': - command => "sm-configure service_instance dcorch-cinder-api-proxy dcorch-cinder-api-proxy \"\"", - } } # lint:endignore:140chars diff --git a/puppet-manifests/src/modules/platform/templates/openrc.admin.erb b/puppet-manifests/src/modules/platform/templates/openrc.admin.erb index 680cfae0a0..caeb83fd1d 100644 --- a/puppet-manifests/src/modules/platform/templates/openrc.admin.erb +++ b/puppet-manifests/src/modules/platform/templates/openrc.admin.erb @@ -13,7 +13,6 @@ export OS_USER_DOMAIN_NAME=<%= @admin_user_domain %> export OS_PROJECT_DOMAIN_NAME=<%= @admin_project_domain %> export OS_IDENTITY_API_VERSION=<%= @identity_api_version %> export OS_REGION_NAME=<%= @identity_region %> -export OS_KEYSTONE_REGION_NAME=<%= @keystone_identity_region %> export OS_INTERFACE=internal if [ ! -z "${OS_PASSWORD}" ]; then diff --git a/puppet-modules-wrs/puppet-dcorch/src/dcorch/manifests/keystone/auth.pp b/puppet-modules-wrs/puppet-dcorch/src/dcorch/manifests/keystone/auth.pp index 3f8f597233..8e74ec7bea 100644 --- a/puppet-modules-wrs/puppet-dcorch/src/dcorch/manifests/keystone/auth.pp +++ b/puppet-modules-wrs/puppet-dcorch/src/dcorch/manifests/keystone/auth.pp @@ -62,15 +62,6 @@ class dcorch::keystone::auth ( internal_url => $internal_url, } - keystone_endpoint { "${region}/nova::compute" : - ensure => 'present', - name => 'nova', - type => 'compute', - region => $region, - public_url => $nova_proxy_public_url, - admin_url => $nova_proxy_internal_url, - internal_url => $nova_proxy_internal_url - } keystone_endpoint { "${region}/sysinv::platform" : ensure => 'present', name => 'sysinv', @@ -80,36 +71,7 @@ class dcorch::keystone::auth ( admin_url => $sysinv_proxy_internal_url, internal_url => $sysinv_proxy_internal_url } - keystone_endpoint { "${region}/neutron::network" : - ensure => 'present', - name => 'neutron', - type => 'network', - region => $region, - public_url => $neutron_proxy_public_url, - admin_url => $neutron_proxy_internal_url, - internal_url => $neutron_proxy_internal_url - } - if $::openstack::cinder::params::service_enabled { - keystone_endpoint { "${region}/cinderv2::volumev2" : - ensure => 'present', - name => 'cinderv2', - type => 'volumev2', - region => $region, - public_url => $cinder_proxy_public_url_v2, - admin_url => $cinder_proxy_internal_url_v2, - internal_url => $cinder_proxy_internal_url_v2 - } - keystone_endpoint { "${region}/cinderv3::volumev3" : - ensure => 'present', - name => 'cinderv3', - type => 'volumev3', - region => $region, - public_url => $cinder_proxy_public_url_v3, - admin_url => $cinder_proxy_internal_url_v3, - internal_url => $cinder_proxy_internal_url_v3 - } - } keystone_endpoint { "${region}/patching::patching" : ensure => 'present', name => 'patching', diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py index 6f837636c3..2927910fc1 100644 --- a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py +++ b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py @@ -6706,17 +6706,9 @@ class ConductorManager(service.PeriodicService): kubernetes_config = system.capabilities.get('kubernetes_enabled', False) LOG.info("Local Region Name: %s" % system.region_name) - # handle region mode case + # TODO: handle region mode case if region_config: - glance_service = self.dbapi.service_get(constants.SERVICE_TYPE_GLANCE) - glance_region_name = glance_service.region_name - LOG.info("Glance Region Name: %s" % glance_region_name) - - if glance_region_name != system.region_name: - # In region mode where the glance region is different - # from this region we do not add glance locally - # so set glance local to False - glance_local = False + glance_local = False disk_size = cutils.get_disk_capacity_mib(rootfs_device) disk_size = int(disk_size / 1024)