diff --git a/software/service-files/software.conf b/software/service-files/software.conf index 0fad950c..bc2da986 100644 --- a/software/service-files/software.conf +++ b/software/service-files/software.conf @@ -8,5 +8,3 @@ agent_port = 5495 # alternate PostgreSQL server port for bringing up # db to run on to-release alt_postgresql_port = 6666 -# todo(cshort): This needs to be configured in puppet. -package_feed="http://controller:8080/updates/debian/rel-24.09/ bullseye updates" diff --git a/software/software/config.py b/software/software/config.py index ff560415..367c7d72 100644 --- a/software/software/config.py +++ b/software/software/config.py @@ -87,8 +87,8 @@ def read_config(): 'agent_port': "5495", 'alt_postgresql_port': "6666", "package_feed": - "http://controller:8080/updates/debian/rel-%s/ bullseye updates" - % constants.STARLINGX_RELEASE, + "http://controller:8080/updates/debian/rel-%s/ %s updates" + % (constants.STARLINGX_RELEASE, constants.DEBIAN_RELEASE), } global controller_mcast_group diff --git a/software/software/software_controller.py b/software/software/software_controller.py index 05626723..fc99964d 100644 --- a/software/software/software_controller.py +++ b/software/software/software_controller.py @@ -3545,6 +3545,17 @@ class PatchControllerMainThread(threading.Thread): def main(): + software_conf = constants.SOFTWARE_CONFIG_FILE_LOCAL + + pkg_feed = ('"http://controller:8080/updates/debian/rel-%s/ %s updates"' + % (constants.STARLINGX_RELEASE, constants.DEBIAN_RELEASE)) + + config = configparser.ConfigParser() + config.read(software_conf) + config.set("runtime", "package_feed",pkg_feed) + with open(software_conf, "w+") as configfile: + config.write(configfile) + # The following call to CONF is to ensure the oslo config # has been called to specify a valid config dir. # Otherwise oslo_policy will fail when it looks for its files.