initial

defaults/main.yml

 ---
+<<<<<<< HEAD
 # defaults file for 3rd_party_repos_satellite
 foreman_initial_organization: "{{ lookup('env','FOREMAN_INITIAL_ORGANIZATION') }}"
 foreman_initial_location: "{{ lookup('env','FOREMAN_INITIAL_LOCATION') }}"
+=======
+# defaults file for 3rd_party_repos_satellite
+>>>>>>> 6f1f6d3814dd526258e3540cd121f1c7c6814e24

files/rpm_gpg_key_epel_7

@@ -27,4 +27,7 @@ vCPFU6OsT3lWQ8w7il5ohY95wmujfr6lk89kEzJdOTzcn7DBbUru33CQMGKZ3Evt
 RjsC7FDbL017qxS+ZVA/HGkyfiu4cpgV8VUnbql5eAZ+1Ll6Dw==
 =hdPa
 -----END PGP PUBLIC KEY BLOCK-----
+<<<<<<< HEAD
 
+=======
+>>>>>>> 6f1f6d3814dd526258e3540cd121f1c7c6814e24

files/rpm_gpg_key_gitlab

@@ -51,4 +51,7 @@ hL1rkkv+NMWy8kE7AuUXRv8RPDfrf9dUD0KbwHne7w/ciB9qYEQjGqq8RH/9KgTI
 G5k6Ege9HT3N
 =2KjF
 -----END PGP PUBLIC KEY BLOCK-----
+<<<<<<< HEAD
 
+=======
+>>>>>>> 6f1f6d3814dd526258e3540cd121f1c7c6814e24

tasks/main.yml

 ---
 
+<<<<<<< HEAD
 - name: move gpg keys to server, create custom repos and sync them
   include_tasks: repo_create.yml
 
 - name: add custom repos to activation keys
   include_tasks: custom_content.yml
+=======
+- name: Build Custom Repos
+  import_tasks: repo_create.yml
+
+- name: Add content to activation keys
+  import_tasks: custom_content.yml
+>>>>>>> 6f1f6d3814dd526258e3540cd121f1c7c6814e24

tasks/repo_create.yml

 ---
 
+<<<<<<< HEAD
 - name: Move epel key
   copy:
     src: files/rpm_gpg_key_gitlab
@@ -14,10 +15,13 @@
     owner: root
     group: root
 
+=======
+>>>>>>> 6f1f6d3814dd526258e3540cd121f1c7c6814e24
 - name: Check to see if localhost is running satellite
   shell: command -v hammer >/dev/null 2>&1
   register: is_hammer_exist
 
+<<<<<<< HEAD
 - name: epel key create
   command: hammer gpg create --key "{{ rpm_gpg_key_epel_7 }}" --organization "{{ foreman_initial_organization }}" --name "epel_7_key"
   register: cmd
@@ -38,6 +42,8 @@
   register: cmd
   failed_when: cmd.rc not in [65,0]
 
+=======
+>>>>>>> 6f1f6d3814dd526258e3540cd121f1c7c6814e24
 - name: gitlab key create
   command: hammer gpg create --key "{{ rpm_gpg_key_gitlab }}" --organization "{{ org.name }}" --name "gitlab_key"
   register: cmd
@@ -53,7 +59,22 @@
   register: cmd
   failed_when: cmd.rc not in [65,0]
 
+<<<<<<< HEAD
 - name: sync epel repo
   command: hammer repository synchronize --organization "{{ foreman_initial_organization }}" --product gitlab_product
+=======
+- name: epel key create
+  command: hammer gpg create --key "{{ rpm_gpg_key_epel_7 }}" --organization "{{ foreman_initial_organization }}" --name "epel_7_key"
+  register: cmd
+  failed_when: cmd.rc not in [65,0]
+
+- name: product create EPEL
+  command: hammer product create --gpg-key "epel_7_key" --name "epel_7_product" --description "EPEL 7 Repository" --organization "{{ foreman_initial_organization }}"
+  register: cmd
+  failed_when: cmd.rc not in [65,0]
+
+- name: repo create epel
+  command: hammer repository create --organization "{{ foreman_initial_organization }}" --content-type yum --download-policy "immediate" --gpg-key "epel_7_key" --name "epel_7_repo" --product "epel_7_product" --url "https://dl.fedoraproject.org/pub/epel/7/x86_64/"
+>>>>>>> 6f1f6d3814dd526258e3540cd121f1c7c6814e24
   register: cmd
   failed_when: cmd.rc not in [65,0]