Merge pull request #28 from hemanthnakkina/heat-api-consolidate

Combine heat-api and heat-api-cfn rocks
openstack-snaps · Jul 24, 2023 · 4f66896 · 4f66896
2 parents 01e5cc9 + 87e050c
commit 4f66896
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 273 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -23,7 +23,7 @@ jobs:
         run: |
           components=()
           # trim file name to component name
-          for file in ${{ steps.changed-files.outputs.all_changed_and_modified_files }}; do
+          for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
               component=$(echo $file | sed 's/rocks\/\(\S.*\)\/rockcraft.yaml/\1/')
               [[ ! -z "$component" ]] && components+=($component)
           done

diff --git a/rocks/heat-api-cfn/LICENSE b/rocks/heat-api-cfn/LICENSE
diff --git a/rocks/heat-api-cfn/README.md b/rocks/heat-api-cfn/README.md
diff --git a/rocks/heat-api-cfn/rockcraft.yaml b/rocks/heat-api-cfn/rockcraft.yaml
diff --git a/rocks/heat-api/README.md b/rocks/heat-api/README.md
@@ -1,6 +1,6 @@
 # heat-api ROCK
 
-This is a ROCK OCI image for heat-api.
+This is a ROCK OCI image for heat-api and heat-api-cfn.
 
 More information is coming.
 

diff --git a/rocks/heat-api/rockcraft.yaml b/rocks/heat-api/rockcraft.yaml
@@ -14,11 +14,6 @@ package-repositories:
     cloud: antelope
     priority: always
 
-services:
-  heat-api:
-    override: replace
-    command: /usr/bin/heat-api
-
 parts:
   heat-user:
     plugin: nil
@@ -41,3 +36,4 @@ parts:
     overlay-packages:
       - sudo
       - heat-api
+      - heat-api-cfn