From 7c2b6fd05bd39755ec71ab69cd6cfb6f9d02c7e8 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Thu, 14 Mar 2019 14:29:55 -0400 Subject: [PATCH] Integrate Distributed Cloud with containerized services Remove references to nova and neutron api proxy Remove the puppet patches that are no longer required Story: 2004766 Task: 30020 Change-Id: I38daec333dd0a47376be014b4c108d3c92e0b963 Signed-off-by: Tao Liu --- .../centos/meta_patches/PATCH_ORDER | 2 - ...on-name-option-for-system-controller.patch | 40 ------------------- ...buted-keystone-for-system-controller.patch | 24 ----------- .../scripts/cfg/engtools.conf | 2 +- .../scripts/patch-restart-processes | 6 --- 5 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0002-Add-os-region-name-option-for-system-controller.patch delete mode 100644 config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0003-distributed-keystone-for-system-controller.patch diff --git a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/PATCH_ORDER index e67a9f6b6..e71cfd2d8 100644 --- a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/PATCH_ORDER +++ b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/PATCH_ORDER @@ -1,4 +1,2 @@ 0001-Update-package-versioning-for-TIS-format.patch 0002-Add-TIS-patch.patch -0003-Add-os-region-name-option-for-system-controller.patch -0004-distributed-keystone-in-system-controller.patch diff --git a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0002-Add-os-region-name-option-for-system-controller.patch b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0002-Add-os-region-name-option-for-system-controller.patch deleted file mode 100644 index bd3b5f2fb..000000000 --- a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0002-Add-os-region-name-option-for-system-controller.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 17142ba33ae9cdf10bcc36a1329e97a5dfd7d7d6 Mon Sep 17 00:00:00 2001 -From: Tao Liu -Date: Wed, 21 Feb 2018 13:35:59 -0600 -Subject: [PATCH 1/1] Add os region name option for system controller - ---- - lib/puppet/provider/openstack.rb | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/lib/puppet/provider/openstack.rb b/lib/puppet/provider/openstack.rb -index 8b8e564..53f2366 100644 ---- a/lib/puppet/provider/openstack.rb -+++ b/lib/puppet/provider/openstack.rb -@@ -40,12 +40,23 @@ class Puppet::Provider::Openstack < Puppet::Provider - self.class_variable_get("@@command_timeout") - end - -+ def self.hiera_lookup(key) -+ HieraPuppet.lookup(key, :undef, self, nil, :priority) -+ end -+ -+ def self.systemcontroller? -+ return true if hiera_lookup('platform::params::distributed_cloud_role') == 'systemcontroller' -+ end -+ - # with command_timeout - def self.openstack(*args) - begin - action = args[1] - Timeout.timeout(command_timeout(action)) do - args.unshift('--os-interface', 'internal') -+ if systemcontroller? -+ args.unshift('--os-region-name', 'SystemController') -+ end - openstack_command *args - end - rescue Timeout::Error --- -1.8.3.1 - diff --git a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0003-distributed-keystone-for-system-controller.patch b/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0003-distributed-keystone-for-system-controller.patch deleted file mode 100644 index ee33321e2..000000000 --- a/config/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0003-distributed-keystone-for-system-controller.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2d8bb7de61c91b3adbf7486a3f0ad43f97f49a52 Mon Sep 17 00:00:00 2001 -From: Kam Nasim -Date: Fri, 11 May 2018 11:35:59 -0600 -Subject: [PATCH 1/1] Add Distributed Keystone region name option for system controller - ---- - lib/puppet/provider/openstack.rb | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/puppet/provider/openstack.rb b/lib/puppet/provider/openstack.rb -index 53f2366..232d615 100644 ---- a/lib/puppet/provider/openstack.rb -+++ b/lib/puppet/provider/openstack.rb -@@ -55,6 +55,7 @@ class Puppet::Provider::Openstack < Puppet::Provider - Timeout.timeout(command_timeout(action)) do - args.unshift('--os-interface', 'internal') - if systemcontroller? -+ args.unshift('--os-keystone-region-name', 'RegionOne') - args.unshift('--os-region-name', 'SystemController') - end - openstack_command *args --- -2.7.4 - diff --git a/tools/engtools/hostdata-collectors/scripts/cfg/engtools.conf b/tools/engtools/hostdata-collectors/scripts/cfg/engtools.conf index 4002cba61..225be7163 100644 --- a/tools/engtools/hostdata-collectors/scripts/cfg/engtools.conf +++ b/tools/engtools/hostdata-collectors/scripts/cfg/engtools.conf @@ -63,7 +63,7 @@ FAST_POSTGRES_CONNECTIONS=N AUTO_DELETE_DB=N [ControllerServices] -CONTROLLER_SERVICE_LIST=aodh-api aodh-listener aodh-notifier aodh-evaluator barbican-api barbican-keystone-listener barbican-worker beam.smp ceilometer-api ceilometer-collector ceilometer-agent-notification ceilometer-mem-db ceph-mon ceph-rest-api ceph-alarm-manager cinder-api cinder-volume cinder-scheduler glance-api glance-registry gnocchi-api gnocchi-metricd heat-api heat-engine heat-api-cfn heat-api-cloudwatch hbsAgent ironic-api ironic-conductor magnum-api magnum-conductor neutron-server nova-api nova-api-proxy nova-compute nova-scheduler nova-conductor nova-console-auth nova-novncproxy nova-placement-api panko-api sysinv-api sysinv-conductor postgres fmManager rabbitmq-server gunicorn postgres snmpd patch-alarm-manager lighttpd sw-patch-controller-daemon nfv-vim nfv-vim-api nfv-vim-webserver slapd mtcAgent guestAgent dcmanager-api dcmanager-manager dcorch-engine dcorch-neutron-api-proxy dcorch-nova-api-proxy dcorch-patch-api-proxy dcorch-snmp dcorch-sysinv-api-proxy memcached influxd +CONTROLLER_SERVICE_LIST=aodh-api aodh-listener aodh-notifier aodh-evaluator barbican-api barbican-keystone-listener barbican-worker beam.smp ceilometer-api ceilometer-collector ceilometer-agent-notification ceilometer-mem-db ceph-mon ceph-rest-api ceph-alarm-manager cinder-api cinder-volume cinder-scheduler glance-api glance-registry gnocchi-api gnocchi-metricd heat-api heat-engine heat-api-cfn heat-api-cloudwatch hbsAgent ironic-api ironic-conductor magnum-api magnum-conductor neutron-server nova-api nova-api-proxy nova-compute nova-scheduler nova-conductor nova-console-auth nova-novncproxy nova-placement-api panko-api sysinv-api sysinv-conductor postgres fmManager rabbitmq-server gunicorn postgres snmpd patch-alarm-manager lighttpd sw-patch-controller-daemon nfv-vim nfv-vim-api nfv-vim-webserver slapd mtcAgent guestAgent dcmanager-api dcmanager-manager dcorch-engine dcorch-patch-api-proxy dcorch-snmp dcorch-sysinv-api-proxy memcached influxd [ComputeServices] COMPUTE_SERVICE_LIST=nova-compute neutron-dhcp-agent neutron-metadata-agent neutron-sriov-nic-agent kvm libvirtd guestServer host_agent dmeventd virtlockd diff --git a/utilities/platform-util/scripts/patch-restart-processes b/utilities/platform-util/scripts/patch-restart-processes index 948b4b1c9..713a0c62b 100755 --- a/utilities/platform-util/scripts/patch-restart-processes +++ b/utilities/platform-util/scripts/patch-restart-processes @@ -325,12 +325,6 @@ do "dcorch-sysinv-api-proxy") process_list=(${process_list[@]} "sm:dcorch-sysinv-api-proxy:dcorch-sysinv-api-proxy:controller:/var/run/resource-agents/dcorch-sysinv-api-proxy.pid:0") ;; - "dcorch-nova-api-proxy") - process_list=(${process_list[@]} "sm:dcorch-nova-api-proxy:dcorch-nova-api-proxy:controller:/var/run/resource-agents/dcorch-nova-api-proxy.pid:0") - ;; - "dcorch-neutron-api-proxy") - process_list=(${process_list[@]} "sm:dcorch-neutron-api-proxy:dcorch-neutron-api-proxy:controller:/var/run/resource-agents/dcorch-neutron-api-proxy.pid:0") - ;; "dcorch-patch-api-proxy") process_list=(${process_list[@]} "sm:dcorch-patch-api-proxy:dcorch-patch-api-proxy:controller:/var/run/resource-agents/dcorch-patch-api-proxy.pid:0") ;;