Merge User Booking API Rev 1 (Try 3)

Signed-off-by: Sawyer Bergeron <[email protected]> Change-Id: Ie1eee0a59929f8da39f16bb6bc17ae3de4f1cba9 Signed-off-by: Sawyer Bergeron <[email protected]>
opnfv · Oct 15, 2021 · 35b9f39 · 35b9f39
1 parent b3ed8eb
commit 35b9f39
Show file tree

Hide file tree

Showing 38 changed files with 1,020 additions and 502 deletions.
diff --git a/config.env.sample b/config.env.sample
@@ -34,13 +34,6 @@ SECRET_KEY=http://www.miniwebtool.com/django-secret-key-generator/
 OAUTH_CONSUMER_KEY=sample_key
 OAUTH_CONSUMER_SECRET=sample_secret
 
-# access information for Jira
-# In addition to this, the rsa keys from your jira admin
-# need to go into src/account
-JIRA_URL=sample_url
-JIRA_USER_NAME=sample_jira_user
-JIRA_USER_PASSWORD=sample_jira_pass
-
 # LFID
 OIDC_CLIENT_ID=sample_id
 OIDC_CLIENT_SECRET=sample_secret
@@ -55,8 +48,8 @@ OIDC_RP_SIGN_ALGO=RS256
 OIDC_OP_JWKS_ENDPOINT=https://sso.linuxfoundation.org/.well-known/jwks.json
 
 # Rabbitmq
-RABBITMQ_DEFAULT_USER=opnfv
-RABBITMQ_DEFAULT_PASS=opnfvopnfv
+DEFAULT_USER=opnfv
+DEFAULT_PASS=opnfvopnfv
 
 # Jenkins Build Server
 JENKINS_URL=https://build.opnfv.org/ci

diff --git a/config/rabbitmq/rabbitmq.conf b/config/rabbitmq/rabbitmq.conf
@@ -0,0 +1,2 @@
+default_user=opnfv
+default_pass=opnfvopnfv
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -50,7 +50,9 @@ services:
         restart: always
         image: rabbitmq
         container_name: rm01
-        env_file: config.env
+          #env_file: config.env
+        volumes:
+          - ./config/rabbitmq:/etc/rabbitmq
         ports:
             - "5672:5672"