Skip to content

Commit 34d7344

Browse files
authored
Remove references of attach/remove subscriptions in bats tests. (#1922)
* Also removed references in provision.md and the main.yml of katello_provision
1 parent 156867c commit 34d7344

3 files changed

Lines changed: 3 additions & 25 deletions

File tree

bats/fb-katello-content.bats

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,6 @@ setup() {
247247
--unlimited-hosts | grep -q "Activation key created"
248248
}
249249

250-
@test "disable auto-attach" {
251-
hammer activation-key update --organization="${ORGANIZATION}" \
252-
--name="${ACTIVATION_KEY}" --auto-attach=false
253-
}
254-
255250
@test "promote first content view again" {
256251
hammer content-view version promote --organization="${ORGANIZATION}" \
257252
--content-view="${CONTENT_VIEW}" --to-lifecycle-environment="${LIFECYCLE_ENVIRONMENT}" --from-lifecycle-environment="Library"

docs/provision.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,16 @@ host.
3131
* increase ram to 2048MB (required for CentOS Stream 9)
3232
* change network type to NAT, network name = provision
3333
* Click Submit
34-
4. Configure Activation Key
35-
* Content / Activation Keys
36-
* Assign all available subscriptions to the activation key
37-
5. Configure / Host groups
34+
4. Configure / Host groups
3835
* Edit Forklift CentOS 9
3936
* Set Compute profile to be "2-Medium"
4037
* Assign the `CentOS 9` activation key to the host group
41-
6. You're good to go! Let's provision a box!
38+
5. You're good to go! Let's provision a box!
4239
* Click Hosts / New Host
4340
* Fill in:
4441
* org, location, host group
4542
* deploy on = libvirt
4643
4744
DONE! Click submit :tada:
4845
49-
7. If you want to view the console while it boots, make sure to trust the CA certificate in your browser, it's hosted at [https://centos9-stream-katello-nightly.example.com/pub/katello-server-ca.crt](https://centos9-stream-katello-nightly.example.com/pub/katello-server-ca.crt), and you'll need to make sure you're accessing the katello via it's proper hostname (add an entry to /etc/hosts).
46+
6. If you want to view the console while it boots, make sure to trust the CA certificate in your browser, it's hosted at [https://centos9-stream-katello-nightly.example.com/pub/katello-server-ca.crt](https://centos9-stream-katello-nightly.example.com/pub/katello-server-ca.crt), and you'll need to make sure you're accessing the katello via it's proper hostname (add an entry to /etc/hosts).

roles/katello_provisioning/tasks/main.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -178,20 +178,6 @@
178178
--unlimited-hosts
179179
when: katello_provisioning_activation_key.stderr.find('not found') != -1
180180

181-
- name: 'Get all the subscriptions'
182-
shell: >
183-
{{ katello_provisioning_hammer }} --output json subscription list
184-
--organization '{{ katello_provisioning_organization }}'
185-
register: subscriptions_json
186-
187-
- name: 'Add subscriptions to activation key'
188-
shell: >
189-
{{ katello_provisioning_hammer }} activation-key add-subscription
190-
--organization '{{ katello_provisioning_organization }}'
191-
--name 'CentOS 9'
192-
--subscription-id {{ item.Id }}
193-
with_items: "{{ subscriptions_json.stdout | from_json }}"
194-
195181
# Associate templates
196182
- name: 'find CentOS 9'
197183
shell: >

0 commit comments

Comments
 (0)